<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[162523] trunk/Source/WebCore</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/162523">162523</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2014-01-22 09:30:13 -0800 (Wed, 22 Jan 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[CSS Regions] layerOwner in RenderNamedFlowFragment cannot return null
https://bugs.webkit.org/show_bug.cgi?id=127343
Patch by Mihai Maerean <mmaerean@adobe.com> 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:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderFlowThreadcpp">trunk/Source/WebCore/rendering/RenderFlowThread.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderLayercpp">trunk/Source/WebCore/rendering/RenderLayer.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderLayerBackingcpp">trunk/Source/WebCore/rendering/RenderLayerBacking.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderLayerCompositorcpp">trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderNamedFlowFragmenth">trunk/Source/WebCore/rendering/RenderNamedFlowFragment.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (162522 => 162523)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-01-22 17:25:52 UTC (rev 162522)
+++ trunk/Source/WebCore/ChangeLog 2014-01-22 17:30:13 UTC (rev 162523)
</span><span class="lines">@@ -1,3 +1,25 @@
</span><ins>+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:
+
</ins><span class="cx"> 2014-01-22 Antti Koivisto <antti@apple.com>
</span><span class="cx">
</span><span class="cx"> Avoid unthrottled layer flushes triggered by RenderLayerCompositor::ensureRootLayer
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderFlowThreadcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderFlowThread.cpp (162522 => 162523)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderFlowThread.cpp 2014-01-22 17:25:52 UTC (rev 162522)
+++ trunk/Source/WebCore/rendering/RenderFlowThread.cpp 2014-01-22 17:30:13 UTC (rev 162523)
</span><span class="lines">@@ -251,10 +251,9 @@
</span><span class="cx"> #if USE(ACCELERATED_COMPOSITING)
</span><span class="cx"> bool RenderFlowThread::hasCompositingRegionDescendant() const
</span><span class="cx"> {
</span><del>- 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;
</del><ins>+ for (auto& region : m_regionList)
+ if (toRenderNamedFlowFragment(region)->layerOwner().layer()->hasCompositingDescendant())
+ return true;
</ins><span class="cx">
</span><span class="cx"> return false;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderLayercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderLayer.cpp (162522 => 162523)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderLayer.cpp 2014-01-22 17:25:52 UTC (rev 162522)
+++ trunk/Source/WebCore/rendering/RenderLayer.cpp 2014-01-22 17:30:13 UTC (rev 162523)
</span><span class="lines">@@ -6937,7 +6937,7 @@
</span><span class="cx">
</span><span class="cx"> void RenderLayer::paintNamedFlowThreadInsideRegion(GraphicsContext* context, RenderNamedFlowFragment* region, LayoutRect paintDirtyRect, LayoutPoint paintOffset, PaintBehavior paintBehavior, PaintLayerFlags paintFlags)
</span><span class="cx"> {
</span><del>- LayoutRect regionContentBox = toRenderBox(region->layerOwner())->contentBoxRect();
</del><ins>+ LayoutRect regionContentBox = toRenderBox(region->layerOwner()).contentBoxRect();
</ins><span class="cx"> LayoutSize moveOffset = region->flowThreadPortionLocation() - (paintOffset + regionContentBox.location());
</span><span class="cx"> IntPoint adjustedPaintOffset = roundedIntPoint(-moveOffset);
</span><span class="cx"> paintDirtyRect.move(moveOffset);
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderLayerBackingcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderLayerBacking.cpp (162522 => 162523)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderLayerBacking.cpp 2014-01-22 17:25:52 UTC (rev 162522)
+++ trunk/Source/WebCore/rendering/RenderLayerBacking.cpp 2014-01-22 17:30:13 UTC (rev 162523)
</span><span class="lines">@@ -1001,14 +1001,14 @@
</span><span class="cx"> IntPoint flowDelta;
</span><span class="cx"> m_owningLayer.convertToPixelSnappedLayerCoords(flowThreadLayer, flowDelta);
</span><span class="cx"> parentRegion->adjustRegionBoundsFromFlowThreadPortionRect(flowDelta, ancestorCompositingBounds);
</span><del>- RenderBoxModelObject* layerOwner = toRenderBoxModelObject(parentRegion->layerOwner());
- if (layerOwner->hasLayer() && layerOwner->layer()->backing()) {
</del><ins>+ RenderBoxModelObject& layerOwner = toRenderBoxModelObject(parentRegion->layerOwner());
+ if (layerOwner.layer()->backing()) {
</ins><span class="cx"> // Make sure that the region propagates its borders, paddings, outlines or box-shadows to layers inside it.
</span><span class="cx"> // Note that the composited bounds of the RenderRegion are already calculated
</span><span class="cx"> // because RenderLayerCompositor::rebuildCompositingLayerTree will only
</span><span class="cx"> // iterate on the content of the region after the region itself is computed.
</span><del>- ancestorCompositingBounds.moveBy(roundedIntPoint(layerOwner->layer()->backing()->compositedBounds().location()));
- ancestorCompositingBounds.move(-layerOwner->borderAndPaddingStart(), -layerOwner->borderAndPaddingBefore());
</del><ins>+ ancestorCompositingBounds.moveBy(roundedIntPoint(layerOwner.layer()->backing()->compositedBounds().location()));
+ ancestorCompositingBounds.move(-layerOwner.borderAndPaddingStart(), -layerOwner.borderAndPaddingBefore());
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderLayerCompositorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp (162522 => 162523)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp 2014-01-22 17:25:52 UTC (rev 162522)
+++ trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp 2014-01-22 17:30:13 UTC (rev 162523)
</span><span class="lines">@@ -1288,7 +1288,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (overlapMap)
</span><del>- overlapMap->geometryMap().popMappingsToAncestor(region->layerOwner());
</del><ins>+ overlapMap->geometryMap().popMappingsToAncestor(&region->layerOwner());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void RenderLayerCompositor::setCompositingParent(RenderLayer& childLayer, RenderLayer* parentLayer)
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderNamedFlowFragmenth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderNamedFlowFragment.h (162522 => 162523)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderNamedFlowFragment.h 2014-01-22 17:25:52 UTC (rev 162522)
+++ trunk/Source/WebCore/rendering/RenderNamedFlowFragment.h 2014-01-22 17:30:13 UTC (rev 162523)
</span><span class="lines">@@ -65,9 +65,8 @@
</span><span class="cx"> // When the content inside the region requires the region to have a layer, the layer will be created on the region's
</span><span class="cx"> // parent renderer instead.
</span><span class="cx"> // This method returns that renderer holding the layer.
</span><del>- // The return value may be null.
- RenderLayerModelObject* layerOwner() const { return parent() && parent()->isRenderLayerModelObject() ? toRenderLayerModelObject(parent())
- : nullptr; }
</del><ins>+ // The return value cannot be null because CSS Regions create Stacking Contexts (which means they create layers).
+ RenderLayerModelObject& layerOwner() const { return *toRenderLayerModelObject(parent()); }
</ins><span class="cx">
</span><span class="cx"> bool hasCustomRegionStyle() const { return m_hasCustomRegionStyle; }
</span><span class="cx"> void setHasCustomRegionStyle(bool hasCustomRegionStyle) { m_hasCustomRegionStyle = hasCustomRegionStyle; }
</span></span></pre>
</div>
</div>
</body>
</html>