Changeset 237122 in webkit

Timestamp:

Oct 15, 2018 10:25:45 AM (6 years ago)

Author:

Simon Fraser

Message:

Make a helper function to check for reflection layers
​https://bugs.webkit.org/show_bug.cgi?id=190584

Reviewed by Zalan Bujtas.

Add RenderLayer::isReflectionLayer() which returns true if the passed layer
is the layer of this layer's reflection. It's used in z-order list building.

• rendering/RenderLayer.cpp:

(WebCore::RenderLayer::updateNormalFlowList):
(WebCore::RenderLayer::rebuildZOrderLists):
(WebCore::RenderLayer::collectLayers):
(WebCore::expandClipRectForDescendantsAndReflection):
(WebCore::RenderLayer::calculateClipRects const):

• rendering/RenderLayer.h:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• rendering/RenderLayer.cpp (modified) (5 diffs)
• rendering/RenderLayer.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2018-10-15  Simon Fraser  <simon.fraser@apple.com>
+
+        Make a helper function to check for reflection layers
+        https://bugs.webkit.org/show_bug.cgi?id=190584
+
+        Reviewed by Zalan Bujtas.
+
+        Add RenderLayer::isReflectionLayer() which returns true if the passed layer
+        is the layer of this layer's reflection. It's used in z-order list building.
+
+        * rendering/RenderLayer.cpp:
+        (WebCore::RenderLayer::updateNormalFlowList):
+        (WebCore::RenderLayer::rebuildZOrderLists):
+        (WebCore::RenderLayer::collectLayers):
+        (WebCore::expandClipRectForDescendantsAndReflection):
+        (WebCore::RenderLayer::calculateClipRects const):
+        * rendering/RenderLayer.h:
+
 2018-10-15  Simon Fraser  <simon.fraser@apple.com>
 

trunk/Source/WebCore/rendering/RenderLayer.cpp

@@ -644 +644 @@
     for (RenderLayer* child = firstChild(); child; child = child->nextSibling()) {
         // Ignore non-overflow layers and reflections.
-        if (child->isNormalFlowOnly() && (!m_reflection || reflectionLayer() != child)) {
+        if (child->isNormalFlowOnly() && !isReflectionLayer(*child)) {
             if (!m_normalFlowList)
                 m_normalFlowList = std::make_unique<Vector<RenderLayer*>>();
@@ -666 +666 @@
     bool includeHiddenLayers = compositor().inCompositingMode();
     for (RenderLayer* child = firstChild(); child; child = child->nextSibling()) {
-        if (!m_reflection || reflectionLayer() != child)
+        if (!isReflectionLayer(*child))
             child->collectLayers(includeHiddenLayers, posZOrderList, negZOrderList);
     }
@@ -701 +701 @@
         for (RenderLayer* child = firstChild(); child; child = child->nextSibling()) {
             // Ignore reflections.
-            if (!m_reflection || reflectionLayer() != child)
+            if (!isReflectionLayer(*child))
                 child->collectLayers(includeHiddenLayers, positiveZOrderList, negativeZOrderList);
         }
@@ -1851 +1851 @@
         // a stacking container. This means we can just walk the layer tree directly.
         for (RenderLayer* curr = layer.firstChild(); curr; curr = curr->nextSibling()) {
-            if (!layer.reflection() || layer.reflectionLayer() != curr)
+            if (!layer.isReflectionLayer(*curr))
                 clipRect.unite(transparencyClipBox(*curr, rootLayer, transparencyBehavior, DescendantsOfTransparencyClipBox, paintBehavior));
         }
@@ -6423 +6423 @@
 }
 
+bool RenderLayer::isReflectionLayer(const RenderLayer& layer) const
+{
+    return m_reflection ? &layer == m_reflection->layer() : false;
+}
+
 void RenderLayer::createReflection()
 {

trunk/Source/WebCore/rendering/RenderLayer.h

@@ -266 +266 @@
     RenderReplica* reflection() const { return m_reflection.get(); }
     RenderLayer* reflectionLayer() const;
+    bool isReflectionLayer(const RenderLayer&) const;
 
     const LayoutPoint& location() const { return m_topLeft; }