Changeset 186154 in webkit

Timestamp:

Jun 30, 2015, 6:01:13 PM (10 years ago)

Author:

Simon Fraser

Message:

Rename GraphicsLayer's allowsBackingStoreDetachment to isViewportConstrained
​https://bugs.webkit.org/show_bug.cgi?id=146483

Reviewed by Tim Horton.

What GraphicsLayer really needs to know is whether some other thread/process
is moving its platform layers around behind its back, and this is is better
expressed as "isViewportConstrained" rather than "allowsBackingStoreDetachment".

The sense of the flag is flipped, and boolean logic adjusted accordingly.

• platform/graphics/GraphicsLayer.h:

(WebCore::GraphicsLayer::setIsViewportConstrained):
(WebCore::GraphicsLayer::isViewportConstrained):
(WebCore::GraphicsLayer::setAllowsBackingStoreDetachment): Deleted.
(WebCore::GraphicsLayer::allowsBackingStoreDetachment): Deleted.

• platform/graphics/ca/GraphicsLayerCA.cpp:

(WebCore::GraphicsLayerCA::GraphicsLayerCA):
(WebCore::GraphicsLayerCA::setVisibleAndCoverageRects):
(WebCore::GraphicsLayerCA::recursiveCommitChanges):

• platform/graphics/ca/GraphicsLayerCA.h:
• rendering/RenderLayerBacking.cpp:

(WebCore::RenderLayerBacking::setIsScrollCoordinatedWithViewportConstrainedRole):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/GraphicsLayer.h (modified) (1 diff)
• platform/graphics/ca/GraphicsLayerCA.cpp (modified) (6 diffs)
• platform/graphics/ca/GraphicsLayerCA.h (modified) (4 diffs)
• rendering/RenderLayerBacking.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2015-06-30  Simon Fraser  <simon.fraser@apple.com>
+
+        Rename GraphicsLayer's allowsBackingStoreDetachment to isViewportConstrained
+        https://bugs.webkit.org/show_bug.cgi?id=146483
+
+        Reviewed by Tim Horton.
+
+        What GraphicsLayer really needs to know is whether some other thread/process
+        is moving its platform layers around behind its back, and this is is better
+        expressed as "isViewportConstrained" rather than "allowsBackingStoreDetachment".
+        
+        The sense of the flag is flipped, and boolean logic adjusted accordingly.
+
+        * platform/graphics/GraphicsLayer.h:
+        (WebCore::GraphicsLayer::setIsViewportConstrained):
+        (WebCore::GraphicsLayer::isViewportConstrained):
+        (WebCore::GraphicsLayer::setAllowsBackingStoreDetachment): Deleted.
+        (WebCore::GraphicsLayer::allowsBackingStoreDetachment): Deleted.
+        * platform/graphics/ca/GraphicsLayerCA.cpp:
+        (WebCore::GraphicsLayerCA::GraphicsLayerCA):
+        (WebCore::GraphicsLayerCA::setVisibleAndCoverageRects):
+        (WebCore::GraphicsLayerCA::recursiveCommitChanges):
+        * platform/graphics/ca/GraphicsLayerCA.h:
+        * rendering/RenderLayerBacking.cpp:
+        (WebCore::RenderLayerBacking::setIsScrollCoordinatedWithViewportConstrainedRole):
+
 2015-06-30  Dean Jackson  <dino@apple.com>
 

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

@@ -495 +495 @@
     float deviceScaleFactor() const { return m_client.deviceScaleFactor(); }
     
-    // Whether this layer (and descendants) can detach backing store when outside the coverage area.
-    virtual void setAllowsBackingStoreDetachment(bool) { }
-    virtual bool allowsBackingStoreDetachment() const { return true; }
+    // Whether this layer is viewport constrained, implying that it's moved around externally from GraphicsLayer (e.g. by the scrolling tree).
+    virtual void setIsViewportConstrained(bool) { }
+    virtual bool isViewportConstrained() const { return false; }
 
     virtual void deviceOrPageScaleFactorChanged() { }

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

@@ -358 +358 @@
     , m_needsFullRepaint(false)
     , m_usingBackdropLayerType(false)
-    , m_allowsBackingStoreDetachment(true)
+    , m_isViewportConstrained(false)
     , m_intersectsCoverageRect(false)
 {
@@ -1273 +1273 @@
 }
 
-void GraphicsLayerCA::setVisibleAndCoverageRects(const VisibleAndCoverageRects& rects, bool allowBackingStoreDetachment)
+void GraphicsLayerCA::setVisibleAndCoverageRects(const VisibleAndCoverageRects& rects, bool isViewportConstrained)
 {
     bool visibleRectChanged = rects.visibleRect != m_visibleRect;
@@ -1281 +1281 @@
 
     // FIXME: we need to take reflections into account when determining whether this layer intersects the coverage rect.
-    bool intersectsCoverageRect = !allowBackingStoreDetachment || rects.coverageRect.intersects(FloatRect(m_boundsOrigin, size()));
+    bool intersectsCoverageRect = isViewportConstrained || rects.coverageRect.intersects(FloatRect(m_boundsOrigin, size()));
     if (intersectsCoverageRect != m_intersectsCoverageRect) {
         m_uncommittedChanges |= CoverageRectChanged;
@@ -1330 +1330 @@
         }
     }
-    setVisibleAndCoverageRects(rects, m_allowsBackingStoreDetachment && commitState.ancestorsAllowBackingStoreDetachment);
+    setVisibleAndCoverageRects(rects, m_isViewportConstrained || commitState.ancestorIsViewportConstrained);
 
 #ifdef VISIBLE_TILE_WASH
@@ -1374 +1374 @@
     }
     
-    childCommitState.ancestorsAllowBackingStoreDetachment &= m_allowsBackingStoreDetachment;
+    childCommitState.ancestorIsViewportConstrained |= m_isViewportConstrained;
 
     if (GraphicsLayerCA* maskLayer = downcast<GraphicsLayerCA>(m_maskLayer))
@@ -3674 +3674 @@
 }
 
-void GraphicsLayerCA::setAllowsBackingStoreDetachment(bool allowDetachment)
-{
-    if (allowDetachment == m_allowsBackingStoreDetachment)
-        return;
-
-    m_allowsBackingStoreDetachment = allowDetachment;
+void GraphicsLayerCA::setIsViewportConstrained(bool isViewportConstrained)
+{
+    if (isViewportConstrained == m_isViewportConstrained)
+        return;
+
+    m_isViewportConstrained = isViewportConstrained;
     noteLayerPropertyChanged(CoverageRectChanged);
 }

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

@@ -152 +152 @@
         int treeDepth { 0 };
         bool ancestorHasTransformAnimation { false };
-        bool ancestorsAllowBackingStoreDetachment { true };
+        bool ancestorIsViewportConstrained { false };
     };
     void recursiveCommitChanges(const CommitState&, const TransformState&, float pageScaleFactor = 1, const FloatPoint& positionRelativeToBase = FloatPoint(), bool affectedByPageScale = false);
@@ -196 +196 @@
     virtual bool isCommittingChanges() const override { return m_isCommittingChanges; }
 
-    WEBCORE_EXPORT virtual void setAllowsBackingStoreDetachment(bool) override;
-    virtual bool allowsBackingStoreDetachment() const override { return m_allowsBackingStoreDetachment; }
+    WEBCORE_EXPORT virtual void setIsViewportConstrained(bool) override;
+    virtual bool isViewportConstrained() const override { return m_isViewportConstrained; }
 
     WEBCORE_EXPORT virtual double backingStoreMemoryEstimate() const override;
@@ -295 +295 @@
     const FloatRect& coverageRect() const { return m_coverageRect; }
 
-    void setVisibleAndCoverageRects(const VisibleAndCoverageRects&, bool allowBackingStoreDetachment);
+    void setVisibleAndCoverageRects(const VisibleAndCoverageRects&, bool isViewportConstrained);
     
     static FloatRect adjustTiledLayerVisibleRect(TiledBacking*, const FloatRect& oldVisibleRect, const FloatRect& newVisibleRect, const FloatSize& oldSize, const FloatSize& newSize);
@@ -514 +514 @@
     bool m_needsFullRepaint : 1;
     bool m_usingBackdropLayerType : 1;
-    bool m_allowsBackingStoreDetachment : 1;
+    bool m_isViewportConstrained : 1;
     bool m_intersectsCoverageRect : 1;
 

trunk/Source/WebCore/rendering/RenderLayerBacking.cpp

@@ -1609 +1609 @@
 void RenderLayerBacking::setIsScrollCoordinatedWithViewportConstrainedRole(bool viewportCoordinated)
 {
-    m_graphicsLayer->setAllowsBackingStoreDetachment(!viewportCoordinated);
+    m_graphicsLayer->setIsViewportConstrained(viewportCoordinated);
 }