Changeset 162523 in webkit

Timestamp:

Jan 22, 2014 9:30:13 AM (10 years ago)

Author:

commit-queue@webkit.org

Message:

[CSS Regions] layerOwner in RenderNamedFlowFragment cannot return null
​https://bugs.webkit.org/show_bug.cgi?id=127343

Patch by Mihai Maerean <Mihai Maerean> on 2014-01-22
Reviewed by Sam Weinig.

RenderNamedFlowFragment::layerOwner cannot return null because regions create stacking
contexts which create layers.

No new tests, no functional change.

• rendering/RenderFlowThread.cpp:

(WebCore::RenderFlowThread::hasCompositingRegionDescendant):

• rendering/RenderLayer.cpp:

(WebCore::RenderLayer::calculateClipRects):

• rendering/RenderLayerBacking.cpp:

(WebCore::RenderLayerBacking::adjustAncestorCompositingBoundsForFlowThread):

• rendering/RenderLayerCompositor.cpp:

(WebCore::RenderLayerCompositor::computeRegionCompositingRequirements):

• rendering/RenderNamedFlowFragment.h:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• rendering/RenderFlowThread.cpp (modified) (1 diff)
• rendering/RenderLayer.cpp (modified) (1 diff)
• rendering/RenderLayerBacking.cpp (modified) (1 diff)
• rendering/RenderLayerCompositor.cpp (modified) (1 diff)
• rendering/RenderNamedFlowFragment.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2014-01-22  Mihai Maerean  <mmaerean@adobe.com>
+
+        [CSS Regions] layerOwner in RenderNamedFlowFragment cannot return null
+        https://bugs.webkit.org/show_bug.cgi?id=127343
+
+        Reviewed by Sam Weinig.
+
+        RenderNamedFlowFragment::layerOwner cannot return null because regions create stacking
+        contexts which create layers.
+
+        No new tests, no functional change.
+
+        * rendering/RenderFlowThread.cpp:
+        (WebCore::RenderFlowThread::hasCompositingRegionDescendant):
+        * rendering/RenderLayer.cpp:
+        (WebCore::RenderLayer::calculateClipRects):
+        * rendering/RenderLayerBacking.cpp:
+        (WebCore::RenderLayerBacking::adjustAncestorCompositingBoundsForFlowThread):
+        * rendering/RenderLayerCompositor.cpp:
+        (WebCore::RenderLayerCompositor::computeRegionCompositingRequirements):
+        * rendering/RenderNamedFlowFragment.h:
+
 2014-01-22  Antti Koivisto  <antti@apple.com>
 

trunk/Source/WebCore/rendering/RenderFlowThread.cpp

@@ -252 +252 @@
 bool RenderFlowThread::hasCompositingRegionDescendant() const
 {
-    for (auto iter = m_regionList.begin(), end = m_regionList.end(); iter != end; ++iter)
-        if (RenderLayerModelObject* layerOwner = toRenderNamedFlowFragment(*iter)->layerOwner())
-            if (layerOwner->hasLayer() && layerOwner->layer()->hasCompositingDescendant())
-                return true;
+    for (auto& region : m_regionList)
+        if (toRenderNamedFlowFragment(region)->layerOwner().layer()->hasCompositingDescendant())
+            return true;
 
     return false;

trunk/Source/WebCore/rendering/RenderLayer.cpp

@@ -6938 +6938 @@
 void RenderLayer::paintNamedFlowThreadInsideRegion(GraphicsContext* context, RenderNamedFlowFragment* region, LayoutRect paintDirtyRect, LayoutPoint paintOffset, PaintBehavior paintBehavior, PaintLayerFlags paintFlags)
 {
-    LayoutRect regionContentBox = toRenderBox(region->layerOwner())->contentBoxRect();
+    LayoutRect regionContentBox = toRenderBox(region->layerOwner()).contentBoxRect();
     LayoutSize moveOffset = region->flowThreadPortionLocation() - (paintOffset + regionContentBox.location());
     IntPoint adjustedPaintOffset = roundedIntPoint(-moveOffset);

trunk/Source/WebCore/rendering/RenderLayerBacking.cpp

@@ -1002 +1002 @@
             m_owningLayer.convertToPixelSnappedLayerCoords(flowThreadLayer, flowDelta);
             parentRegion->adjustRegionBoundsFromFlowThreadPortionRect(flowDelta, ancestorCompositingBounds);
-            RenderBoxModelObject* layerOwner = toRenderBoxModelObject(parentRegion->layerOwner());
-            if (layerOwner->hasLayer() && layerOwner->layer()->backing()) {
+            RenderBoxModelObject& layerOwner = toRenderBoxModelObject(parentRegion->layerOwner());
+            if (layerOwner.layer()->backing()) {
                 // Make sure that the region propagates its borders, paddings, outlines or box-shadows to layers inside it.
                 // Note that the composited bounds of the RenderRegion are already calculated
                 // because RenderLayerCompositor::rebuildCompositingLayerTree will only
                 // iterate on the content of the region after the region itself is computed.
-                ancestorCompositingBounds.moveBy(roundedIntPoint(layerOwner->layer()->backing()->compositedBounds().location()));
-                ancestorCompositingBounds.move(-layerOwner->borderAndPaddingStart(), -layerOwner->borderAndPaddingBefore());
+                ancestorCompositingBounds.moveBy(roundedIntPoint(layerOwner.layer()->backing()->compositedBounds().location()));
+                ancestorCompositingBounds.move(-layerOwner.borderAndPaddingStart(), -layerOwner.borderAndPaddingBefore());
             }
         }

trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp

@@ -1289 +1289 @@
 
     if (overlapMap)
-        overlapMap->geometryMap().popMappingsToAncestor(region->layerOwner());
+        overlapMap->geometryMap().popMappingsToAncestor(&region->layerOwner());
 }
 

trunk/Source/WebCore/rendering/RenderNamedFlowFragment.h

@@ -66 +66 @@
     // parent renderer instead.
     // This method returns that renderer holding the layer.
-    // The return value may be null.
-    RenderLayerModelObject* layerOwner() const { return parent() && parent()->isRenderLayerModelObject() ? toRenderLayerModelObject(parent())
-        : nullptr; }
+    // The return value cannot be null because CSS Regions create Stacking Contexts (which means they create layers).
+    RenderLayerModelObject& layerOwner() const { return *toRenderLayerModelObject(parent()); }
 
     bool hasCustomRegionStyle() const { return m_hasCustomRegionStyle; }