Revert "split renderSync and transition nudging to allow client view …

include/mbgl/map/map.hpp

@@ -67,10 +67,7 @@ class Map : private util::noncopyable {
     void renderStill(StillImageCallback callback);
 
     // Triggers a synchronous or asynchronous render.
-    bool renderSync();
-
-    // Nudges transitions one step, possibly notifying of the need for a rerender.
-    void nudgeTransitions(bool forceRerender);
+    void renderSync();
 
     // Notifies the Map thread that the state has changed and an update might be necessary.
     void update(Update update = Update::Nothing);

platform/ios/MGLMapView.mm

@@ -703,11 +703,9 @@ - (void)glkView:(__unused GLKView *)view drawInRect:(__unused CGRect)rect
 
         _mbglMap->setSourceTileCacheSize(cacheSize);
 
-        bool needsRerender = _mbglMap->renderSync();
+        _mbglMap->renderSync();
 
         [self updateUserLocationAnnotationView];
-
-        _mbglMap->nudgeTransitions(needsRerender);
     }
 }
 

src/mbgl/map/map.cpp

@@ -48,7 +48,7 @@ void Map::renderStill(StillImageCallback callback) {
                     FrameData{ view.getFramebufferSize() }, callback);
 }
 
-bool Map::renderSync() {
+void Map::renderSync() {
     if (renderState == RenderState::never) {
         view.notifyMapChange(MapChangeWillStartRenderingMap);
     }
@@ -69,13 +69,9 @@ bool Map::renderSync() {
         view.notifyMapChange(MapChangeDidFinishRenderingMapFullyRendered);
     }
 
-    return result.needsRerender;
-}
-
-void Map::nudgeTransitions(bool forceRerender) {
     if (transform->needsTransition()) {
         update(Update(transform->updateTransitions(Clock::now())));
-    } else if (forceRerender) {
+    } else if (result.needsRerender) {
         update();
     }
 }