Changeset 216688 in webkit

Timestamp:

May 11, 2017 11:49:30 AM (7 years ago)

Author:

commit-queue@webkit.org

Message:

Unify hasTouchScrollableOverflow/needsCompositedScrolling concepts
​https://bugs.webkit.org/show_bug.cgi?id=171974

Patch by Frederic Wang <​fwang@igalia.com> on 2017-05-11
Reviewed by Simon Fraser.

This commit moves the following pattern in a single RenderLayer::usesAcceleratedScrolling function:
#if PLATFORM(IOS)
...hasTouchScrollableOverflow()...
#else
...needsCompositedScrolling()...
#endif

No new tests, behavior unchanged.

• rendering/RenderLayer.cpp:

(WebCore::RenderLayer::usesAcceleratedScrolling): Introduce helper function.

• rendering/RenderLayer.h: Declare the function.
• rendering/RenderLayerBacking.cpp:

(WebCore::layerOrAncestorIsTransformedOrUsingCompositedScrolling): Use the new function.
(WebCore::RenderLayerBacking::updateConfiguration): Ditto.

• rendering/RenderLayerCompositor.cpp:

(WebCore::useCoordinatedScrollingForLayer): Ditto.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• rendering/RenderLayer.cpp (modified) (1 diff)
• rendering/RenderLayer.h (modified) (1 diff)
• rendering/RenderLayerBacking.cpp (modified) (2 diffs)
• rendering/RenderLayerCompositor.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2017-05-11  Frederic Wang  <fwang@igalia.com>
+
+        Unify hasTouchScrollableOverflow/needsCompositedScrolling concepts
+        https://bugs.webkit.org/show_bug.cgi?id=171974
+
+        Reviewed by Simon Fraser.
+
+        This commit moves the following pattern in a single RenderLayer::usesAcceleratedScrolling function:
+        #if PLATFORM(IOS)
+        ...hasTouchScrollableOverflow()...
+        #else
+        ...needsCompositedScrolling()...
+        #endif
+
+        No new tests, behavior unchanged.
+
+        * rendering/RenderLayer.cpp:
+        (WebCore::RenderLayer::usesAcceleratedScrolling): Introduce helper function.
+        * rendering/RenderLayer.h: Declare the function.
+        * rendering/RenderLayerBacking.cpp:
+        (WebCore::layerOrAncestorIsTransformedOrUsingCompositedScrolling): Use the new function.
+        (WebCore::RenderLayerBacking::updateConfiguration): Ditto.
+        * rendering/RenderLayerCompositor.cpp:
+        (WebCore::useCoordinatedScrollingForLayer): Ditto.
+
 2017-05-11  Romain Bellessort  <romain.bellessort@crf.canon.fr>
 

trunk/Source/WebCore/rendering/RenderLayer.cpp

@@ -2189 +2189 @@
 #endif // PLATFORM(IOS)
 
+bool RenderLayer::usesAcceleratedScrolling() const
+{
+#if PLATFORM(IOS)
+    return hasTouchScrollableOverflow();
+#else
+    return needsCompositedScrolling();
+#endif
+}
+
 #if ENABLE(IOS_TOUCH_EVENTS)
 void RenderLayer::registerAsTouchEventListenerForScrolling()

trunk/Source/WebCore/rendering/RenderLayer.h

@@ -266 +266 @@
     bool hasTouchScrollableOverflow() const { return false; }
 #endif
+    bool usesAcceleratedScrolling() const;
 
     int verticalScrollbarWidth(OverlayScrollbarSizeRelevancy = IgnoreOverlayScrollbarSize) const;

trunk/Source/WebCore/rendering/RenderLayerBacking.cpp

@@ -547 +547 @@
 }
 
-// FIXME: the hasAcceleratedTouchScrolling()/needsCompositedScrolling() concepts need to be merged.
 static bool layerOrAncestorIsTransformedOrUsingCompositedScrolling(RenderLayer& layer)
 {
     for (RenderLayer* curr = &layer; curr; curr = curr->parent()) {
-        if (curr->hasTransform()
-#if PLATFORM(IOS)
-            || curr->hasTouchScrollableOverflow()
-#else
-            || curr->needsCompositedScrolling()
-#endif
-            )
+        if (curr->hasTransform() || curr->usesAcceleratedScrolling())
             return true;
     }
@@ -683 +676 @@
 
     if (!renderer().view().needsLayout()) {
-        bool usesCompositedScrolling;
-#if PLATFORM(IOS)
-        usesCompositedScrolling = m_owningLayer.hasTouchScrollableOverflow();
-#else
-        usesCompositedScrolling = m_owningLayer.needsCompositedScrolling();
-#endif
+        bool usesCompositedScrolling = m_owningLayer.usesAcceleratedScrolling();
+
         // Our scrolling layer will clip.
         if (usesCompositedScrolling)

trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp

@@ -2724 +2724 @@
         return true;
 
-#if PLATFORM(IOS)
-    return layer.hasTouchScrollableOverflow();
-#else
-    return layer.needsCompositedScrolling();
-#endif
+    return layer.usesAcceleratedScrolling();
 }