Changeset 163176 in webkit

Timestamp:

Jan 31, 2014, 10:25:34 AM (11 years ago)

Author:

Simon Fraser

Message:

Make iOS fixed layer registration more like OS X
​https://bugs.webkit.org/show_bug.cgi?id=127983

Reviewed by Antti Koivisto.

Remove some #if PLATFORM(IOS) in the code related to registering
viewport-constrained layers. The code behaves correctly now in WK1
and WK2 based on the presence of a ScrollingCoordinator.

• rendering/RenderLayerCompositor.cpp:

(WebCore::RenderLayerCompositor::flushPendingLayerChanges):
(WebCore::nearestScrollingCoordinatorAncestor):
(WebCore::RenderLayerCompositor::registerOrUpdateViewportConstrainedLayer):
(WebCore::RenderLayerCompositor::unregisterViewportConstrainedLayer):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• rendering/RenderLayerCompositor.cpp (modified) (5 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2014-01-30  Simon Fraser  <simon.fraser@apple.com>
+
+        Make iOS fixed layer registration more like OS X
+        https://bugs.webkit.org/show_bug.cgi?id=127983
+
+        Reviewed by Antti Koivisto.
+
+        Remove some #if PLATFORM(IOS) in the code related to registering
+        viewport-constrained layers. The code behaves correctly now in WK1
+        and WK2 based on the presence of a ScrollingCoordinator.
+
+        * rendering/RenderLayerCompositor.cpp:
+        (WebCore::RenderLayerCompositor::flushPendingLayerChanges):
+        (WebCore::nearestScrollingCoordinatorAncestor):
+        (WebCore::RenderLayerCompositor::registerOrUpdateViewportConstrainedLayer):
+        (WebCore::RenderLayerCompositor::unregisterViewportConstrainedLayer):
+
 2014-01-31  Commit Queue  <commit-queue@webkit.org>
 

trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp

@@ -438 +438 @@
     if (client && isFlushRoot)
         client->didFlushCompositingLayers();
-#else
+#endif
+
     for (auto it = m_viewportConstrainedLayersNeedingUpdate.begin(), end = m_viewportConstrainedLayersNeedingUpdate.end(); it != end; ++it)
         registerOrUpdateViewportConstrainedLayer(**it);
+
     m_viewportConstrainedLayersNeedingUpdate.clear();
-#endif
     startLayerFlushTimerIfNeeded();
 }
@@ -3429 +3430 @@
 }
 
-#if !PLATFORM(IOS)
 static RenderLayerBacking* nearestScrollingCoordinatorAncestor(RenderLayer& layer)
 {
@@ -3443 +3443 @@
     return nullptr;
 }
-#endif
 
 void RenderLayerCompositor::registerOrUpdateViewportConstrainedLayer(RenderLayer& layer)
 {
-#if PLATFORM(IOS)
-    UNUSED_PARAM(layer);
-    // On iOS, we batch-update viewport-constrained layers in updateCustomLayersAfterFlush().
-#else
     // FIXME: We should support sticky position here! And we should eventuall support fixed/sticky elements
     // that are inside non-main frames once we get non-main frames scrolling with the ScrollingCoordinator.
@@ -3484 +3479 @@
     else
         scrollingCoordinator->updateViewportConstrainedNode(nodeID, computeFixedViewportConstraints(layer), backing->graphicsLayer());
-#endif
 }
 
@@ -3490 +3484 @@
 {
     ASSERT(m_viewportConstrainedLayers.contains(&layer));
-#if PLATFORM(IOS)
-    UNUSED_PARAM(layer);
-    // On iOS, we batch-update viewport-constrained layers in updateCustomLayersAfterFlush().
-#else
+
     if (RenderLayerBacking* backing = layer.backing())
         backing->detachFromScrollingCoordinator();
-#endif
 }