<!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>[164275] 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/164275">164275</a></dd>
<dt>Author</dt> <dd>stavila@adobe.com</dd>
<dt>Date</dt> <dd>2014-02-17 23:53:51 -0800 (Mon, 17 Feb 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[CSS Regions] Move specific named flow methods from RenderRegion to RenderNamedFlowFragment
https://bugs.webkit.org/show_bug.cgi?id=128914
Reviewed by Antti Koivisto.
Moved named flow specific methods regionContainer() and regionContainerLayer() from
RenderRegion to RenderNamedFlowFragment and renamed them to fragmentContainer and
fragmentContainerLayer.
No new tests required.
* rendering/RenderLayer.cpp:
(WebCore::RenderLayer::mapLayerClipRectsToFragmentationLayer):
(WebCore::RenderLayer::calculateClipRects):
* rendering/RenderNamedFlowFragment.cpp:
(WebCore::RenderNamedFlowFragment::fragmentContainer):
(WebCore::RenderNamedFlowFragment::fragmentContainerLayer):
* rendering/RenderNamedFlowFragment.h:
* rendering/RenderRegion.cpp:
* rendering/RenderRegion.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderLayercpp">trunk/Source/WebCore/rendering/RenderLayer.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderNamedFlowFragmentcpp">trunk/Source/WebCore/rendering/RenderNamedFlowFragment.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderNamedFlowFragmenth">trunk/Source/WebCore/rendering/RenderNamedFlowFragment.h</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderRegioncpp">trunk/Source/WebCore/rendering/RenderRegion.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderRegionh">trunk/Source/WebCore/rendering/RenderRegion.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (164274 => 164275)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-02-18 07:17:24 UTC (rev 164274)
+++ trunk/Source/WebCore/ChangeLog 2014-02-18 07:53:51 UTC (rev 164275)
</span><span class="lines">@@ -1,3 +1,26 @@
</span><ins>+2014-02-17 Radu Stavila <stavila@adobe.com>
+
+ [CSS Regions] Move specific named flow methods from RenderRegion to RenderNamedFlowFragment
+ https://bugs.webkit.org/show_bug.cgi?id=128914
+
+ Reviewed by Antti Koivisto.
+
+ Moved named flow specific methods regionContainer() and regionContainerLayer() from
+ RenderRegion to RenderNamedFlowFragment and renamed them to fragmentContainer and
+ fragmentContainerLayer.
+
+ No new tests required.
+
+ * rendering/RenderLayer.cpp:
+ (WebCore::RenderLayer::mapLayerClipRectsToFragmentationLayer):
+ (WebCore::RenderLayer::calculateClipRects):
+ * rendering/RenderNamedFlowFragment.cpp:
+ (WebCore::RenderNamedFlowFragment::fragmentContainer):
+ (WebCore::RenderNamedFlowFragment::fragmentContainerLayer):
+ * rendering/RenderNamedFlowFragment.h:
+ * rendering/RenderRegion.cpp:
+ * rendering/RenderRegion.h:
+
</ins><span class="cx"> 2014-02-17 Sangho Kim <thomas.kim@lge.com>
</span><span class="cx">
</span><span class="cx"> Move PublicURLMansger to std::unique_ptr.
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderLayercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderLayer.cpp (164274 => 164275)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderLayer.cpp 2014-02-18 07:17:24 UTC (rev 164274)
+++ trunk/Source/WebCore/rendering/RenderLayer.cpp 2014-02-18 07:53:51 UTC (rev 164275)
</span><span class="lines">@@ -5252,15 +5252,17 @@
</span><span class="cx">
</span><span class="cx"> void RenderLayer::mapLayerClipRectsToFragmentationLayer(RenderRegion* region, ClipRects& clipRects) const
</span><span class="cx"> {
</span><del>- ASSERT(region && region->parent() && region->parent()->isRenderNamedFlowFragmentContainer());
</del><ins>+ ASSERT(region && region->isRenderNamedFlowFragment() && region->parent() && region->parent()->isRenderNamedFlowFragmentContainer());
+
+ RenderNamedFlowFragment* flowFragment = toRenderNamedFlowFragment(region);
</ins><span class="cx">
</span><del>- ClipRectsContext targetClipRectsContext(region->regionContainerLayer(), 0, TemporaryClipRects);
- region->regionContainerLayer()->calculateClipRects(targetClipRectsContext, clipRects);
</del><ins>+ ClipRectsContext targetClipRectsContext(&flowFragment->fragmentContainerLayer(), 0, TemporaryClipRects);
+ flowFragment->fragmentContainerLayer().calculateClipRects(targetClipRectsContext, clipRects);
</ins><span class="cx">
</span><span class="cx"> LayoutRect flowThreadPortionRect = region->flowThreadPortionRect();
</span><span class="cx">
</span><span class="cx"> LayoutPoint portionLocation = flowThreadPortionRect.location();
</span><del>- LayoutRect regionContentBox = region->regionContainer()->contentBoxRect();
</del><ins>+ LayoutRect regionContentBox = flowFragment->fragmentContainer().contentBoxRect();
</ins><span class="cx"> LayoutSize moveOffset = portionLocation - regionContentBox.location();
</span><span class="cx">
</span><span class="cx"> ClipRect newOverflowClipRect = clipRects.overflowClipRect();
</span><span class="lines">@@ -5456,8 +5458,10 @@
</span><span class="cx"> outlineRect = backgroundRect;
</span><span class="cx">
</span><span class="cx"> // If the region does not clip its overflow, inflate the outline rect.
</span><del>- if (!(clipRectsContext.region->parent()->hasOverflowClip() && (clipRectsContext.region->regionContainerLayer() != clipRectsContext.rootLayer || clipRectsContext.respectOverflowClip == RespectOverflowClip)))
- outlineRect.inflate(renderer().maximalOutlineSize(PaintPhaseOutline));
</del><ins>+ if (clipRectsContext.region->isRenderNamedFlowFragment()) {
+ if (!(clipRectsContext.region->parent()->hasOverflowClip() && (&toRenderNamedFlowFragment(clipRectsContext.region)->fragmentContainerLayer() != clipRectsContext.rootLayer || clipRectsContext.respectOverflowClip == RespectOverflowClip)))
+ outlineRect.inflate(renderer().maximalOutlineSize(PaintPhaseOutline));
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Update the clip rects that will be passed to child layers.
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderNamedFlowFragmentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderNamedFlowFragment.cpp (164274 => 164275)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderNamedFlowFragment.cpp 2014-02-18 07:17:24 UTC (rev 164274)
+++ trunk/Source/WebCore/rendering/RenderNamedFlowFragment.cpp 2014-02-18 07:53:51 UTC (rev 164275)
</span><span class="lines">@@ -197,36 +197,50 @@
</span><span class="cx"> // Regions with overflow:hidden will apply clip at the border box, not the content box.
</span><span class="cx">
</span><span class="cx"> LayoutRect clippingRect = flowThreadPortionRect();
</span><del>- if (regionContainer()->style().hasPadding()) {
</del><ins>+ RenderBlockFlow& container = fragmentContainer();
+ if (container.style().hasPadding()) {
</ins><span class="cx"> if (isFirstRegionInRange) {
</span><span class="cx"> if (flowThread()->isHorizontalWritingMode()) {
</span><del>- clippingRect.move(0, -regionContainer()->paddingBefore());
- clippingRect.expand(0, regionContainer()->paddingBefore());
</del><ins>+ clippingRect.move(0, -container.paddingBefore());
+ clippingRect.expand(0, container.paddingBefore());
</ins><span class="cx"> } else {
</span><del>- clippingRect.move(-regionContainer()->paddingBefore(), 0);
- clippingRect.expand(regionContainer()->paddingBefore(), 0);
</del><ins>+ clippingRect.move(-container.paddingBefore(), 0);
+ clippingRect.expand(container.paddingBefore(), 0);
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (isLastRegionInRange) {
</span><span class="cx"> if (flowThread()->isHorizontalWritingMode())
</span><del>- clippingRect.expand(0, regionContainer()->paddingAfter());
</del><ins>+ clippingRect.expand(0, container.paddingAfter());
</ins><span class="cx"> else
</span><del>- clippingRect.expand(regionContainer()->paddingAfter(), 0);
</del><ins>+ clippingRect.expand(container.paddingAfter(), 0);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (flowThread()->isHorizontalWritingMode()) {
</span><del>- clippingRect.move(-regionContainer()->paddingStart(), 0);
- clippingRect.expand(regionContainer()->paddingStart() + regionContainer()->paddingEnd(), 0);
</del><ins>+ clippingRect.move(-container.paddingStart(), 0);
+ clippingRect.expand(container.paddingStart() + container.paddingEnd(), 0);
</ins><span class="cx"> } else {
</span><del>- clippingRect.move(0, -regionContainer()->paddingStart());
- clippingRect.expand(0, regionContainer()->paddingStart() + regionContainer()->paddingEnd());
</del><ins>+ clippingRect.move(0, -container.paddingStart());
+ clippingRect.expand(0, container.paddingStart() + container.paddingEnd());
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> return clippingRect;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+RenderBlockFlow& RenderNamedFlowFragment::fragmentContainer() const
+{
+ ASSERT(parent());
+ ASSERT(parent()->isRenderNamedFlowFragmentContainer());
+ return *toRenderBlockFlow(parent());
+}
+
+RenderLayer& RenderNamedFlowFragment::fragmentContainerLayer() const
+{
+ ASSERT(fragmentContainer().layer());
+ return *fragmentContainer().layer();
+}
+
</ins><span class="cx"> void RenderNamedFlowFragment::layoutBlock(bool relayoutChildren, LayoutUnit)
</span><span class="cx"> {
</span><span class="cx"> StackStats::LayoutCheckPoint layoutCheckPoint;
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderNamedFlowFragmenth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderNamedFlowFragment.h (164274 => 164275)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderNamedFlowFragment.h 2014-02-18 07:17:24 UTC (rev 164274)
+++ trunk/Source/WebCore/rendering/RenderNamedFlowFragment.h 2014-02-18 07:53:51 UTC (rev 164275)
</span><span class="lines">@@ -62,6 +62,9 @@
</span><span class="cx">
</span><span class="cx"> LayoutRect flowThreadPortionRectForClipping(bool isFirstRegionInRange, bool isLastRegionInRange) const;
</span><span class="cx">
</span><ins>+ RenderBlockFlow& fragmentContainer() const;
+ RenderLayer& fragmentContainerLayer() const;
+
</ins><span class="cx"> bool isPseudoElementRegion() const { return parent() && parent()->isPseudoElement(); }
</span><span class="cx">
</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></pre></div>
<a id="trunkSourceWebCorerenderingRenderRegioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderRegion.cpp (164274 => 164275)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderRegion.cpp 2014-02-18 07:17:24 UTC (rev 164274)
+++ trunk/Source/WebCore/rendering/RenderRegion.cpp 2014-02-18 07:53:51 UTC (rev 164275)
</span><span class="lines">@@ -150,17 +150,6 @@
</span><span class="cx"> return portionLocation;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-RenderBlockFlow* RenderRegion::regionContainer() const
-{
- ASSERT(parent() && parent()->isRenderNamedFlowFragmentContainer());
- return toRenderBlockFlow(parent());
-}
-
-RenderLayer* RenderRegion::regionContainerLayer() const
-{
- return regionContainer()->layer();
-}
-
</del><span class="cx"> LayoutRect RenderRegion::overflowRectForFlowThreadPortion(const LayoutRect& flowThreadPortionRect, bool isFirstPortion, bool isLastPortion, OverflowType overflowType)
</span><span class="cx"> {
</span><span class="cx"> ASSERT(isValid());
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderRegionh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderRegion.h (164274 => 164275)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderRegion.h 2014-02-18 07:17:24 UTC (rev 164274)
+++ trunk/Source/WebCore/rendering/RenderRegion.h 2014-02-18 07:53:51 UTC (rev 164275)
</span><span class="lines">@@ -56,9 +56,6 @@
</span><span class="cx"> LayoutRect flowThreadPortionOverflowRect();
</span><span class="cx">
</span><span class="cx"> LayoutPoint flowThreadPortionLocation() const;
</span><del>-
- RenderBlockFlow* regionContainer() const;
- RenderLayer* regionContainerLayer() const;
</del><span class="cx">
</span><span class="cx"> virtual void attachRegion();
</span><span class="cx"> virtual void detachRegion();
</span></span></pre>
</div>
</div>
</body>
</html>