Changeset 183196 in webkit

Timestamp:

Apr 23, 2015 10:59:58 AM (9 years ago)

Author:

Simon Fraser

Message:

Remove m_isPageTiledBackingLayer data member from GraphicsLayerCA, just use the layer type instead
​https://bugs.webkit.org/show_bug.cgi?id=144108

Reviewed by Dean Jackson.

No need for the m_isPageTiledBackingLayer data member. We can just check the layer
type instead.

• platform/graphics/ca/GraphicsLayerCA.cpp:

(WebCore::GraphicsLayerCA::GraphicsLayerCA):
(WebCore::GraphicsLayerCA::initialize):
(WebCore::GraphicsLayerCA::platformCALayerShowRepaintCounter):
(WebCore::GraphicsLayerCA::updateContentsScale):
(WebCore::GraphicsLayerCA::getDebugBorderInfo):
(WebCore::GraphicsLayerCA::requiresTiledLayer):

• platform/graphics/ca/GraphicsLayerCA.h:

(WebCore::GraphicsLayerCA::isPageTiledBackingLayer):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/ca/GraphicsLayerCA.cpp (modified) (7 diffs)
• platform/graphics/ca/GraphicsLayerCA.h (modified) (3 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2015-04-23  Simon Fraser  <simon.fraser@apple.com>
+
+        Remove m_isPageTiledBackingLayer data member from GraphicsLayerCA, just use the layer type instead
+        https://bugs.webkit.org/show_bug.cgi?id=144108
+
+        Reviewed by Dean Jackson.
+
+        No need for the m_isPageTiledBackingLayer data member. We can just check the layer
+        type instead.
+
+        * platform/graphics/ca/GraphicsLayerCA.cpp:
+        (WebCore::GraphicsLayerCA::GraphicsLayerCA):
+        (WebCore::GraphicsLayerCA::initialize):
+        (WebCore::GraphicsLayerCA::platformCALayerShowRepaintCounter):
+        (WebCore::GraphicsLayerCA::updateContentsScale):
+        (WebCore::GraphicsLayerCA::getDebugBorderInfo):
+        (WebCore::GraphicsLayerCA::requiresTiledLayer):
+        * platform/graphics/ca/GraphicsLayerCA.h:
+        (WebCore::GraphicsLayerCA::isPageTiledBackingLayer):
+
 2015-04-23  Brady Eidson  <beidson@apple.com>
 

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

@@ -353 +353 @@
     : GraphicsLayer(layerType, client)
     , m_contentsLayerPurpose(NoContentsLayer)
-    , m_isPageTiledBackingLayer(false)
     , m_needsFullRepaint(false)
     , m_usingBackdropLayerType(false)
@@ -363 +362 @@
 void GraphicsLayerCA::initialize(Type layerType)
 {
-    if (layerType == Type::PageTiledBacking)
-        m_isPageTiledBackingLayer = true;
-
     PlatformCALayer::LayerType platformLayerType;
     switch (layerType) {
@@ -1313 +1309 @@
     // The repaint counters are painted into the TileController tiles (which have no corresponding platform layer),
     // so we don't want to overpaint the repaint counter when called with the TileController's own layer.
-    if (m_isPageTiledBackingLayer && platformLayer)
+    if (isPageTiledBackingLayer() && platformLayer)
         return false;
 
@@ -3070 +3066 @@
     float contentsScale = pageScaleFactor * deviceScaleFactor();
 
-    if (m_isPageTiledBackingLayer && tiledBacking()) {
+    if (isPageTiledBackingLayer() && tiledBacking()) {
         float zoomedOutScale = m_client.zoomedOutPageScaleFactor() * deviceScaleFactor();
         tiledBacking()->setZoomedOutContentsScale(zoomedOutScale);
@@ -3085 +3081 @@
     if (tiledBacking()) {
         // Scale change may swap in a different set of tiles changing the custom child layers.
-        if (m_isPageTiledBackingLayer)
+        if (isPageTiledBackingLayer())
             m_uncommittedChanges |= ChildrenChanged;
         // Tiled backing repaints automatically on scale change.
@@ -3128 +3124 @@
 void GraphicsLayerCA::getDebugBorderInfo(Color& color, float& width) const
 {
-    if (m_isPageTiledBackingLayer) {
+    if (isPageTiledBackingLayer()) {
         color = Color(0, 0, 128, 128); // tile cache layer: dark blue
         width = 0.5;
@@ -3206 +3202 @@
 bool GraphicsLayerCA::requiresTiledLayer(float pageScaleFactor) const
 {
-    if (!m_drawsContent || m_isPageTiledBackingLayer)
+    if (!m_drawsContent || isPageTiledBackingLayer())
         return false;
 

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

@@ -268 +268 @@
     WEBCORE_EXPORT virtual void setReplicatedByLayer(GraphicsLayer*) override;
 
+    WEBCORE_EXPORT virtual bool canThrottleLayerFlush() const override;
+
     WEBCORE_EXPORT virtual void getDebugBorderInfo(Color&, float& width) const override;
     WEBCORE_EXPORT virtual void dumpAdditionalProperties(TextStream&, int indent, LayerTreeAsTextBehavior) const override;
@@ -284 +286 @@
 
     bool recursiveVisibleRectChangeRequiresFlush(const TransformState&) const;
-
-    WEBCORE_EXPORT virtual bool canThrottleLayerFlush() const override;
+    
+    bool isPageTiledBackingLayer() const { return type() == Type::PageTiledBacking; }
 
     // Used to track the path down the tree for replica layers.
@@ -492 +494 @@
     
     ContentsLayerPurpose m_contentsLayerPurpose;
-    bool m_isPageTiledBackingLayer : 1;
     bool m_needsFullRepaint : 1;
     bool m_usingBackdropLayerType : 1;