Changeset 166308 in webkit

Timestamp:

Mar 26, 2014 12:36:49 PM (10 years ago)

Author:

Simon Fraser

Message:

Add a custom behavior flag to GraphicsLayer, piped down to PlatformCALayer, for scrolling layers
​https://bugs.webkit.org/show_bug.cgi?id=130778

Reviewed by Tim Horton.

Make it possible to put a "custom behavior" flag on a layer so that,
with UI-side compositing, we know to create a specific type of
layer or view for that GraphicsLayer.

Source/WebCore:

• WebCore.exp.in:
• platform/graphics/GraphicsLayer.cpp:

(WebCore::GraphicsLayer::GraphicsLayer):

• platform/graphics/GraphicsLayer.h:

(WebCore::GraphicsLayer::setCustomBehavior):
(WebCore::GraphicsLayer::customBehavior):

• platform/graphics/ca/GraphicsLayerCA.cpp:

(WebCore::GraphicsLayerCA::commitLayerChangesBeforeSublayers):
(WebCore::GraphicsLayerCA::updateCustomBehavior):
(WebCore::GraphicsLayerCA::setCustomBehavior):

• platform/graphics/ca/GraphicsLayerCA.h:
• platform/graphics/ca/PlatformCALayer.h:
• platform/graphics/ca/mac/PlatformCALayerMac.h:
• platform/graphics/ca/mac/PlatformCALayerMac.mm:

(PlatformCALayerMac::PlatformCALayerMac):

• rendering/RenderLayerBacking.cpp:

(WebCore::RenderLayerBacking::updateScrollingLayers):

Source/WebKit2:

• Shared/mac/RemoteLayerTreeTransaction.h:
• Shared/mac/RemoteLayerTreeTransaction.mm:

(WebKit::RemoteLayerTreeTransaction::LayerProperties::LayerProperties):
(WebKit::RemoteLayerTreeTransaction::LayerProperties::encode):
(WebKit::RemoteLayerTreeTransaction::LayerProperties::decode):
(WebKit::dumpChangedLayers):

• WebProcess/WebPage/mac/PlatformCALayerRemote.cpp:

(PlatformCALayerRemote::customBehavior):
(PlatformCALayerRemote::updateCustomBehavior):

• WebProcess/WebPage/mac/PlatformCALayerRemote.h:

Location:

trunk/Source

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/WebCore.exp.in (modified) (1 diff)
• WebCore/platform/graphics/GraphicsLayer.cpp (modified) (1 diff)
• WebCore/platform/graphics/GraphicsLayer.h (modified) (2 diffs)
• WebCore/platform/graphics/ca/GraphicsLayerCA.cpp (modified) (3 diffs)
• WebCore/platform/graphics/ca/GraphicsLayerCA.h (modified) (3 diffs)
• WebCore/platform/graphics/ca/PlatformCALayer.h (modified) (1 diff)
• WebCore/platform/graphics/ca/mac/PlatformCALayerMac.h (modified) (2 diffs)
• WebCore/platform/graphics/ca/mac/PlatformCALayerMac.mm (modified) (2 diffs)
• WebCore/rendering/RenderLayerBacking.cpp (modified) (1 diff)
• WebKit2/ChangeLog (modified) (1 diff)
• WebKit2/Shared/mac/RemoteLayerTreeTransaction.h (modified) (2 diffs)
• WebKit2/Shared/mac/RemoteLayerTreeTransaction.mm (modified) (5 diffs)
• WebKit2/WebProcess/WebPage/mac/PlatformCALayerRemote.cpp (modified) (1 diff)
• WebKit2/WebProcess/WebPage/mac/PlatformCALayerRemote.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2014-03-26  Simon Fraser  <simon.fraser@apple.com>
+
+        Add a custom behavior flag to GraphicsLayer, piped down to PlatformCALayer, for scrolling layers
+        https://bugs.webkit.org/show_bug.cgi?id=130778
+
+        Reviewed by Tim Horton.
+
+        Make it possible to put a "custom behavior" flag on a layer so that,
+        with UI-side compositing, we know to create a specific type of
+        layer or view for that GraphicsLayer.
+
+        * WebCore.exp.in:
+        * platform/graphics/GraphicsLayer.cpp:
+        (WebCore::GraphicsLayer::GraphicsLayer):
+        * platform/graphics/GraphicsLayer.h:
+        (WebCore::GraphicsLayer::setCustomBehavior):
+        (WebCore::GraphicsLayer::customBehavior):
+        * platform/graphics/ca/GraphicsLayerCA.cpp:
+        (WebCore::GraphicsLayerCA::commitLayerChangesBeforeSublayers):
+        (WebCore::GraphicsLayerCA::updateCustomBehavior):
+        (WebCore::GraphicsLayerCA::setCustomBehavior):
+        * platform/graphics/ca/GraphicsLayerCA.h:
+        * platform/graphics/ca/PlatformCALayer.h:
+        * platform/graphics/ca/mac/PlatformCALayerMac.h:
+        * platform/graphics/ca/mac/PlatformCALayerMac.mm:
+        (PlatformCALayerMac::PlatformCALayerMac):
+        * rendering/RenderLayerBacking.cpp:
+        (WebCore::RenderLayerBacking::updateScrollingLayers):
+
 2014-03-26  Brent Fulgham  <bfulgham@apple.com>
 

trunk/Source/WebCore/WebCore.exp.in

@@ -546 +546 @@
 __ZN7WebCore15GraphicsLayerCA16setMasksToBoundsEb
 __ZN7WebCore15GraphicsLayerCA17setContentsOpaqueEb
+__ZN7WebCore15GraphicsLayerCA17setCustomBehaviorENS_13GraphicsLayer14CustomBehaviorE
 __ZN7WebCore15GraphicsLayerCA17suspendAnimationsEd
 __ZN7WebCore15GraphicsLayerCA18setAllowTiledLayerEb

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

@@ -100 +100 @@
     , m_repaintCount(0)
     , m_customAppearance(NoCustomAppearance)
+    , m_customBehavior(NoCustomBehavior)
 {
 #ifndef NDEBUG

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

@@ -444 +444 @@
     CustomAppearance customAppearance() const { return m_customAppearance; }
 
+    enum CustomBehavior { NoCustomBehavior, CustomScrollingBehavior };
+    virtual void setCustomBehavior(CustomBehavior customBehavior) { m_customBehavior = customBehavior; }
+    CustomBehavior customBehavior() const { return m_customBehavior; }
+
     // z-position is the z-equivalent of position(). It's only used for debugging purposes.
     virtual float zPosition() const { return m_zPosition; }
@@ -612 +616 @@
     int m_repaintCount;
     CustomAppearance m_customAppearance;
+    CustomBehavior m_customBehavior;
 };
 

trunk/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp

@@ -1410 +1410 @@
         updateCustomAppearance();
 
+    if (m_uncommittedChanges & CustomBehaviorChanged)
+        updateCustomBehavior();
+
     if (m_uncommittedChanges & ChildrenChanged) {
         updateSublayerList();
@@ -2953 +2956 @@
 }
 
+void GraphicsLayerCA::updateCustomBehavior()
+{
+    m_layer->updateCustomBehavior(m_customBehavior);
+}
+
 void GraphicsLayerCA::setShowDebugBorder(bool showBorder)
 {
@@ -3052 +3060 @@
     GraphicsLayer::setCustomAppearance(customAppearance);
     noteLayerPropertyChanged(CustomAppearanceChanged);
+}
+
+void GraphicsLayerCA::setCustomBehavior(CustomBehavior customBehavior)
+{
+    if (customBehavior == m_customBehavior)
+        return;
+
+    GraphicsLayer::setCustomBehavior(customBehavior);
+    noteLayerPropertyChanged(CustomBehaviorChanged);
 }
 

trunk/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.h

@@ -139 +139 @@
 
     virtual void setCustomAppearance(CustomAppearance);
+    virtual void setCustomBehavior(CustomBehavior);
 
     virtual void layerDidDisplay(PlatformLayer*);
@@ -390 +391 @@
     void updateContentsScale(float pageScaleFactor);
     void updateCustomAppearance();
-    
+    void updateCustomBehavior();
+
     enum StructuralLayerPurpose {
         NoStructuralLayer = 0,
@@ -448 +450 @@
         DebugIndicatorsChanged = 1 << 30,
         CustomAppearanceChanged = 1 << 31,
-        BlendModeChanged        = 1 << 32
-    };
-    typedef unsigned LayerChangeFlags;
+        CustomBehaviorChanged = 1 << 32,
+        BlendModeChanged = 1 << 33
+    };
+    typedef uint64_t LayerChangeFlags;
     enum ScheduleFlushOrNot { ScheduleFlush, DontScheduleFlush };
     void noteLayerPropertyChanged(LayerChangeFlags, ScheduleFlushOrNot = ScheduleFlush);

trunk/Source/WebCore/platform/graphics/ca/PlatformCALayer.h

@@ -198 +198 @@
     virtual void updateCustomAppearance(GraphicsLayer::CustomAppearance) = 0;
 
+    virtual GraphicsLayer::CustomBehavior customBehavior() const = 0;
+    virtual void updateCustomBehavior(GraphicsLayer::CustomBehavior) = 0;
+
     virtual TiledBacking* tiledBacking() = 0;
 

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

@@ -137 +137 @@
     virtual void updateCustomAppearance(GraphicsLayer::CustomAppearance) override;
 
+    virtual GraphicsLayer::CustomBehavior customBehavior() const override { return m_customBehavior; }
+    virtual void updateCustomBehavior(GraphicsLayer::CustomBehavior) override { }
+
     virtual TiledBacking* tiledBacking() override;
 
@@ -158 +161 @@
     OwnPtr<PlatformCALayerList> m_customSublayers;
     GraphicsLayer::CustomAppearance m_customAppearance;
+    GraphicsLayer::CustomBehavior m_customBehavior;
 };
 

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

@@ -166 +166 @@
     : PlatformCALayer(layerType, owner)
     , m_customAppearance(GraphicsLayer::NoCustomAppearance)
+    , m_customBehavior(GraphicsLayer::NoCustomBehavior)
 {
     Class layerClass = Nil;
@@ -206 +207 @@
     : PlatformCALayer([layer isKindOfClass:getAVPlayerLayerClass()] ? LayerTypeAVPlayerLayer : LayerTypeCustom, owner)
     , m_customAppearance(GraphicsLayer::NoCustomAppearance)
+    , m_customBehavior(GraphicsLayer::NoCustomBehavior)
 {
     m_layer = layer;

trunk/Source/WebCore/rendering/RenderLayerBacking.cpp

@@ -1432 +1432 @@
         m_scrollingLayer->setDrawsContent(false);
         m_scrollingLayer->setMasksToBounds(true);
-
+#if PLATFORM(IOS)
+        m_scrollingLayer->setCustomBehavior(GraphicsLayer::CustomScrollingBehavior);
+#endif
         // Inner layer which renders the content that scrolls.
         m_scrollingContentsLayer = createGraphicsLayer("Scrolled Contents");

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2014-03-26  Simon Fraser  <simon.fraser@apple.com>
+
+        Add a custom behavior flag to GraphicsLayer, piped down to PlatformCALayer, for scrolling layers
+        https://bugs.webkit.org/show_bug.cgi?id=130778
+
+        Reviewed by Tim Horton.
+
+        Make it possible to put a "custom behavior" flag on a layer so that,
+        with UI-side compositing, we know to create a specific type of
+        layer or view for that GraphicsLayer.
+
+        * Shared/mac/RemoteLayerTreeTransaction.h:
+        * Shared/mac/RemoteLayerTreeTransaction.mm:
+        (WebKit::RemoteLayerTreeTransaction::LayerProperties::LayerProperties):
+        (WebKit::RemoteLayerTreeTransaction::LayerProperties::encode):
+        (WebKit::RemoteLayerTreeTransaction::LayerProperties::decode):
+        (WebKit::dumpChangedLayers):
+        * WebProcess/WebPage/mac/PlatformCALayerRemote.cpp:
+        (PlatformCALayerRemote::customBehavior):
+        (PlatformCALayerRemote::updateCustomBehavior):
+        * WebProcess/WebPage/mac/PlatformCALayerRemote.h:
+
 2014-03-26  Zoltan Horvath  <zoltan@webkit.org>
 

trunk/Source/WebKit2/Shared/mac/RemoteLayerTreeTransaction.h

@@ -76 +76 @@
         FiltersChanged = 1 << 25,
         EdgeAntialiasingMaskChanged = 1 << 26,
-        CustomAppearanceChanged = 1 << 27
+        CustomAppearanceChanged = 1 << 27,
+        CustomBehaviorChanged = 1 << 28
     };
     typedef unsigned LayerChange;
@@ -128 +129 @@
         unsigned edgeAntialiasingMask;
         WebCore::GraphicsLayer::CustomAppearance customAppearance;
+        WebCore::GraphicsLayer::CustomBehavior customBehavior;
         WebCore::PlatformCALayer::FilterType minificationFilter;
         WebCore::PlatformCALayer::FilterType magnificationFilter;

trunk/Source/WebKit2/Shared/mac/RemoteLayerTreeTransaction.mm

@@ -88 +88 @@
     , edgeAntialiasingMask(kCALayerLeftEdge | kCALayerRightEdge | kCALayerBottomEdge | kCALayerTopEdge)
     , customAppearance(GraphicsLayer::NoCustomAppearance)
+    , customBehavior(GraphicsLayer::NoCustomBehavior)
     , minificationFilter(PlatformCALayer::FilterType::Linear)
     , magnificationFilter(PlatformCALayer::FilterType::Linear)
@@ -117 +118 @@
     , edgeAntialiasingMask(other.edgeAntialiasingMask)
     , customAppearance(other.customAppearance)
+    , customBehavior(other.customBehavior)
     , minificationFilter(other.minificationFilter)
     , magnificationFilter(other.magnificationFilter)
@@ -225 +227 @@
     if (changedProperties & CustomAppearanceChanged)
         encoder.encodeEnum(customAppearance);
+
+    if (changedProperties & CustomBehaviorChanged)
+        encoder.encodeEnum(customBehavior);
 }
 
@@ -385 +390 @@
     if (result.changedProperties & CustomAppearanceChanged) {
         if (!decoder.decodeEnum(result.customAppearance))
+            return false;
+    }
+
+    if (result.changedProperties & CustomBehaviorChanged) {
+        if (!decoder.decodeEnum(result.customBehavior))
             return false;
     }
@@ -805 +815 @@
         if (layerProperties.changedProperties & RemoteLayerTreeTransaction::CustomAppearanceChanged)
             dumpProperty<GraphicsLayer::CustomAppearance>(ts, "customAppearance", layerProperties.customAppearance);
+
+        if (layerProperties.changedProperties & RemoteLayerTreeTransaction::CustomBehaviorChanged)
+            dumpProperty<GraphicsLayer::CustomBehavior>(ts, "customBehavior", layerProperties.customBehavior);
 
         ts << ")";

trunk/Source/WebKit2/WebProcess/WebPage/mac/PlatformCALayerRemote.cpp

@@ -564 +564 @@
 }
 
+GraphicsLayer::CustomBehavior PlatformCALayerRemote::customBehavior() const
+{
+    return m_properties.customBehavior;
+}
+
+void PlatformCALayerRemote::updateCustomBehavior(GraphicsLayer::CustomBehavior customBehavior)
+{
+    m_properties.customBehavior = customBehavior;
+    m_properties.notePropertiesChanged(RemoteLayerTreeTransaction::CustomBehaviorChanged);
+}
+
 PassRefPtr<PlatformCALayer> PlatformCALayerRemote::createCompatibleLayer(PlatformCALayer::LayerType layerType, PlatformCALayerClient* client) const
 {

trunk/Source/WebKit2/WebProcess/WebPage/mac/PlatformCALayerRemote.h

@@ -139 +139 @@
     virtual void updateCustomAppearance(WebCore::GraphicsLayer::CustomAppearance) override;
 
+    virtual WebCore::GraphicsLayer::CustomBehavior customBehavior() const override;
+    virtual void updateCustomBehavior(WebCore::GraphicsLayer::CustomBehavior) override;
+
     virtual WebCore::TiledBacking* tiledBacking() override { return nullptr; }