Changeset 168440 in webkit

Timestamp:

May 7, 2014, 2:49:10 PM (11 years ago)

Author:

Simon Fraser

Message:

[iOS] Acclerated overflow-scrolling broken in WK1
​https://bugs.webkit.org/show_bug.cgi?id=132665
<rdar://problem/16842909>

Reviewed by Tim Horton.

r168301 added a CALayer delegate to disable implicit animations,
but for some layers we wrap them in UIViews (which are themselves
layer delegates), so bad things happened.

Fix by falling back to setting the null actions dictionary for
layers with custom scrolling behavior.

• platform/graphics/GraphicsLayer.h:
• platform/graphics/ca/mac/PlatformCALayerMac.h:
• platform/graphics/ca/mac/PlatformCALayerMac.mm:

(PlatformCALayerMac::updateCustomBehavior):

• rendering/RenderLayerBacking.cpp:

(WebCore::RenderLayerBacking::updateScrollingLayers):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/GraphicsLayer.h (modified) (1 diff)
• platform/graphics/ca/mac/PlatformCALayerMac.h (modified) (1 diff)
• platform/graphics/ca/mac/PlatformCALayerMac.mm (modified) (1 diff)
• rendering/RenderLayerBacking.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2014-05-07  Simon Fraser  <simon.fraser@apple.com>
+
+        [iOS] Acclerated overflow-scrolling broken in WK1
+        https://bugs.webkit.org/show_bug.cgi?id=132665
+        <rdar://problem/16842909>
+
+        Reviewed by Tim Horton.
+
+        r168301 added a CALayer delegate to disable implicit animations,
+        but for some layers we wrap them in UIViews (which are themselves
+        layer delegates), so bad things happened.
+        
+        Fix by falling back to setting the null actions dictionary for
+        layers with custom scrolling behavior.
+
+        * platform/graphics/GraphicsLayer.h:
+        * platform/graphics/ca/mac/PlatformCALayerMac.h:
+        * platform/graphics/ca/mac/PlatformCALayerMac.mm:
+        (PlatformCALayerMac::updateCustomBehavior):
+        * rendering/RenderLayerBacking.cpp:
+        (WebCore::RenderLayerBacking::updateScrollingLayers):
+
 2014-05-07  Jeremy Jones  <jeremyj@apple.com>
 

trunk/Source/WebCore/platform/graphics/GraphicsLayer.h

@@ -447 +447 @@
     CustomAppearance customAppearance() const { return m_customAppearance; }
 
-    enum CustomBehavior { NoCustomBehavior, CustomScrollingBehavior };
+    enum CustomBehavior { NoCustomBehavior, CustomScrollingBehavior, CustomScrolledContentsBehavior };
     virtual void setCustomBehavior(CustomBehavior customBehavior) { m_customBehavior = customBehavior; }
     CustomBehavior customBehavior() const { return m_customBehavior; }

trunk/Source/WebCore/platform/graphics/ca/mac/PlatformCALayerMac.h

@@ -142 +142 @@
 
     virtual GraphicsLayer::CustomBehavior customBehavior() const override { return m_customBehavior; }
-    virtual void updateCustomBehavior(GraphicsLayer::CustomBehavior customBehavior) override { m_customBehavior = customBehavior; }
+    virtual void updateCustomBehavior(GraphicsLayer::CustomBehavior) override;
 
     virtual TiledBacking* tiledBacking() override;

trunk/Source/WebCore/platform/graphics/ca/mac/PlatformCALayerMac.mm

@@ -765 +765 @@
 }
 
+void PlatformCALayerMac::updateCustomBehavior(GraphicsLayer::CustomBehavior customBehavior)
+{
+    m_customBehavior = customBehavior;
+
+    // Custom layers can get wrapped in UIViews (which clobbers the layer delegate),
+    // so fall back to the slower way of disabling implicit animations.
+    if (m_customBehavior != GraphicsLayer::NoCustomBehavior) {
+        if ([[m_layer delegate] isKindOfClass:[WebActionDisablingCALayerDelegate class]])
+            [m_layer setDelegate:nil];
+        [m_layer web_disableAllActions];
+    }
+}
+
 TiledBacking* PlatformCALayerMac::tiledBacking()
 {

trunk/Source/WebCore/rendering/RenderLayerBacking.cpp

@@ -1428 +1428 @@
         m_scrollingContentsLayer = createGraphicsLayer("Scrolled Contents");
         m_scrollingContentsLayer->setDrawsContent(true);
+#if PLATFORM(IOS)
+        m_scrollingContentsLayer->setCustomBehavior(GraphicsLayer::CustomScrolledContentsBehavior);
+#endif
         GraphicsLayerPaintingPhase paintPhase = GraphicsLayerPaintOverflowContents | GraphicsLayerPaintCompositedScroll;
         if (!m_foregroundLayer)