<!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>[164837] 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/164837">164837</a></dd>
<dt>Author</dt> <dd>stavila@adobe.com</dd>
<dt>Date</dt> <dd>2014-02-27 15:52:23 -0800 (Thu, 27 Feb 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[CSS Regions] Move named-flow specific method decorationsClipRectForBoxInRegion to RenderNamedFlowThread
https://bugs.webkit.org/show_bug.cgi?id=129428
Reviewed by Andreas Kling.
Since the decorationsClipRectForBoxInRegion method is a named flow specific method, it makes
sense to be in the named flow specific class, RenderNamedFlowThread, instead of the more
generic RenderFlowThread.
No new tests required. No new functionality.
* rendering/RenderBlock.cpp:
(WebCore::RenderBlock::paintObject):
* rendering/RenderFlowThread.cpp:
* rendering/RenderFlowThread.h:
* rendering/RenderNamedFlowThread.cpp:
(WebCore::RenderNamedFlowThread::decorationsClipRectForBoxInNamedFlowFragment):
* rendering/RenderNamedFlowThread.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderBlockcpp">trunk/Source/WebCore/rendering/RenderBlock.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderFlowThreadcpp">trunk/Source/WebCore/rendering/RenderFlowThread.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderFlowThreadh">trunk/Source/WebCore/rendering/RenderFlowThread.h</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderNamedFlowThreadcpp">trunk/Source/WebCore/rendering/RenderNamedFlowThread.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderNamedFlowThreadh">trunk/Source/WebCore/rendering/RenderNamedFlowThread.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (164836 => 164837)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-02-27 23:36:23 UTC (rev 164836)
+++ trunk/Source/WebCore/ChangeLog 2014-02-27 23:52:23 UTC (rev 164837)
</span><span class="lines">@@ -1,3 +1,24 @@
</span><ins>+2014-02-27 Radu Stavila <stavila@adobe.com>
+
+ [CSS Regions] Move named-flow specific method decorationsClipRectForBoxInRegion to RenderNamedFlowThread
+ https://bugs.webkit.org/show_bug.cgi?id=129428
+
+ Reviewed by Andreas Kling.
+
+ Since the decorationsClipRectForBoxInRegion method is a named flow specific method, it makes
+ sense to be in the named flow specific class, RenderNamedFlowThread, instead of the more
+ generic RenderFlowThread.
+
+ No new tests required. No new functionality.
+
+ * rendering/RenderBlock.cpp:
+ (WebCore::RenderBlock::paintObject):
+ * rendering/RenderFlowThread.cpp:
+ * rendering/RenderFlowThread.h:
+ * rendering/RenderNamedFlowThread.cpp:
+ (WebCore::RenderNamedFlowThread::decorationsClipRectForBoxInNamedFlowFragment):
+ * rendering/RenderNamedFlowThread.h:
+
</ins><span class="cx"> 2014-02-27 Zoltan Horvath <zoltan@webkit.org>
</span><span class="cx">
</span><span class="cx"> Avoid calling logicalLeftOffsetForLine 2 times in LineWidth::fitBelowFloats
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderBlockcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderBlock.cpp (164836 => 164837)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderBlock.cpp 2014-02-27 23:36:23 UTC (rev 164836)
+++ trunk/Source/WebCore/rendering/RenderBlock.cpp 2014-02-27 23:52:23 UTC (rev 164837)
</span><span class="lines">@@ -2301,7 +2301,7 @@
</span><span class="cx"> if (hasBoxDecorations()) {
</span><span class="cx"> bool didClipToRegion = false;
</span><span class="cx">
</span><del>- if (paintInfo.paintContainer && paintInfo.renderNamedFlowFragment && paintInfo.paintContainer->isRenderFlowThread()) {
</del><ins>+ if (paintInfo.paintContainer && paintInfo.renderNamedFlowFragment && paintInfo.paintContainer->isRenderNamedFlowThread()) {
</ins><span class="cx"> // If this box goes beyond the current region, then make sure not to overflow the region.
</span><span class="cx"> // This (overflowing region X altough also fragmented to region X+1) could happen when one of this box's children
</span><span class="cx"> // overflows region X and is an unsplittable element (like an image).
</span><span class="lines">@@ -2310,7 +2310,7 @@
</span><span class="cx"> paintInfo.context->save();
</span><span class="cx"> didClipToRegion = true;
</span><span class="cx">
</span><del>- paintInfo.context->clip(toRenderFlowThread(paintInfo.paintContainer)->decorationsClipRectForBoxInRegion(*this, *paintInfo.renderNamedFlowFragment));
</del><ins>+ paintInfo.context->clip(toRenderNamedFlowThread(paintInfo.paintContainer)->decorationsClipRectForBoxInNamedFlowFragment(*this, *paintInfo.renderNamedFlowFragment));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> paintBoxDecorations(paintInfo, paintOffset);
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderFlowThreadcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderFlowThread.cpp (164836 => 164837)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderFlowThread.cpp 2014-02-27 23:36:23 UTC (rev 164836)
+++ trunk/Source/WebCore/rendering/RenderFlowThread.cpp 2014-02-27 23:52:23 UTC (rev 164837)
</span><span class="lines">@@ -1262,76 +1262,6 @@
</span><span class="cx"> return localRect;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-LayoutRect RenderFlowThread::decorationsClipRectForBoxInRegion(const RenderBox& box, RenderRegion& region) const
-{
- LayoutRect visualOverflowRect = region.visualOverflowRectForBox(&box);
- LayoutUnit initialLogicalX = style().isHorizontalWritingMode() ? visualOverflowRect.x() : visualOverflowRect.y();
-
- // The visual overflow rect returned by visualOverflowRectForBox is already flipped but the
- // RenderRegion::rectFlowPortionForBox method expects it unflipped.
- flipForWritingModeLocalCoordinates(visualOverflowRect);
- visualOverflowRect = region.rectFlowPortionForBox(&box, visualOverflowRect);
-
- // Now flip it again.
- flipForWritingModeLocalCoordinates(visualOverflowRect);
-
- // Layers are in physical coordinates so the origin must be moved to the physical top-left of the flowthread.
- if (style().isFlippedBlocksWritingMode()) {
- if (style().isHorizontalWritingMode())
- visualOverflowRect.moveBy(LayoutPoint(0, height()));
- else
- visualOverflowRect.moveBy(LayoutPoint(width(), 0));
- }
-
- const RenderBox* iterBox = &box;
- while (iterBox && iterBox != this) {
- RenderBlock* containerBlock = iterBox->containingBlock();
-
- // FIXME: This doesn't work properly with flipped writing modes.
- // https://bugs.webkit.org/show_bug.cgi?id=125149
- if (iterBox->isPositioned()) {
- // For positioned elements, just use the layer's absolute bounding box.
- visualOverflowRect.moveBy(iterBox->layer()->absoluteBoundingBox().location());
- break;
- }
-
- LayoutRect currentBoxRect = iterBox->frameRect();
- if (iterBox->style().isFlippedBlocksWritingMode()) {
- if (iterBox->style().isHorizontalWritingMode())
- currentBoxRect.setY(currentBoxRect.height() - currentBoxRect.maxY());
- else
- currentBoxRect.setX(currentBoxRect.width() - currentBoxRect.maxX());
- }
-
- if (containerBlock->style().writingMode() != iterBox->style().writingMode())
- iterBox->flipForWritingMode(currentBoxRect);
-
- visualOverflowRect.moveBy(currentBoxRect.location());
- iterBox = containerBlock;
- }
-
- // Since the purpose of this method is to make sure the borders of a fragmented
- // element don't overflow the region in the fragmentation direction, there's no
- // point in restricting the clipping rect on the logical X axis.
- // This also saves us the trouble of handling percent-based widths and margins
- // since the absolute bounding box of a positioned element would not contain
- // the correct coordinates relative to the region we're interested in, but rather
- // relative to the actual flow thread.
- if (style().isHorizontalWritingMode()) {
- if (initialLogicalX < visualOverflowRect.x())
- visualOverflowRect.shiftXEdgeTo(initialLogicalX);
- if (visualOverflowRect.width() < frameRect().width())
- visualOverflowRect.setWidth(frameRect().width());
- } else {
- if (initialLogicalX < visualOverflowRect.y())
- visualOverflowRect.shiftYEdgeTo(initialLogicalX);
- if (visualOverflowRect.height() < frameRect().height())
- visualOverflowRect.setHeight(frameRect().height());
- }
-
- return visualOverflowRect;
-}
-
</del><span class="cx"> void RenderFlowThread::flipForWritingModeLocalCoordinates(LayoutRect& rect) const
</span><span class="cx"> {
</span><span class="cx"> if (!style().isFlippedBlocksWritingMode())
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderFlowThreadh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderFlowThread.h (164836 => 164837)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderFlowThread.h 2014-02-27 23:36:23 UTC (rev 164836)
+++ trunk/Source/WebCore/rendering/RenderFlowThread.h 2014-02-27 23:52:23 UTC (rev 164837)
</span><span class="lines">@@ -199,9 +199,7 @@
</span><span class="cx">
</span><span class="cx"> LayoutRect mapFromFlowThreadToLocal(const RenderBox*, const LayoutRect&) const;
</span><span class="cx"> LayoutRect mapFromLocalToFlowThread(const RenderBox*, const LayoutRect&) const;
</span><del>-
- LayoutRect decorationsClipRectForBoxInRegion(const RenderBox&, RenderRegion&) const;
-
</del><ins>+
</ins><span class="cx"> void flipForWritingModeLocalCoordinates(LayoutRect&) const;
</span><span class="cx">
</span><span class="cx"> // Used to estimate the maximum height of the flow thread.
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderNamedFlowThreadcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderNamedFlowThread.cpp (164836 => 164837)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderNamedFlowThread.cpp 2014-02-27 23:36:23 UTC (rev 164836)
+++ trunk/Source/WebCore/rendering/RenderNamedFlowThread.cpp 2014-02-27 23:52:23 UTC (rev 164837)
</span><span class="lines">@@ -35,6 +35,7 @@
</span><span class="cx"> #include "Position.h"
</span><span class="cx"> #include "Range.h"
</span><span class="cx"> #include "RenderInline.h"
</span><ins>+#include "RenderLayer.h"
</ins><span class="cx"> #include "RenderNamedFlowFragment.h"
</span><span class="cx"> #include "RenderText.h"
</span><span class="cx"> #include "RenderView.h"
</span><span class="lines">@@ -283,6 +284,76 @@
</span><span class="cx"> updateWritingMode();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+LayoutRect RenderNamedFlowThread::decorationsClipRectForBoxInNamedFlowFragment(const RenderBox& box, RenderNamedFlowFragment& fragment) const
+{
+ LayoutRect visualOverflowRect = fragment.visualOverflowRectForBox(&box);
+ LayoutUnit initialLogicalX = style().isHorizontalWritingMode() ? visualOverflowRect.x() : visualOverflowRect.y();
+
+ // The visual overflow rect returned by visualOverflowRectForBox is already flipped but the
+ // RenderRegion::rectFlowPortionForBox method expects it unflipped.
+ flipForWritingModeLocalCoordinates(visualOverflowRect);
+ visualOverflowRect = fragment.rectFlowPortionForBox(&box, visualOverflowRect);
+
+ // Now flip it again.
+ flipForWritingModeLocalCoordinates(visualOverflowRect);
+
+ // Layers are in physical coordinates so the origin must be moved to the physical top-left of the flowthread.
+ if (style().isFlippedBlocksWritingMode()) {
+ if (style().isHorizontalWritingMode())
+ visualOverflowRect.moveBy(LayoutPoint(0, height()));
+ else
+ visualOverflowRect.moveBy(LayoutPoint(width(), 0));
+ }
+
+ const RenderBox* iterBox = &box;
+ while (iterBox && iterBox != this) {
+ RenderBlock* containerBlock = iterBox->containingBlock();
+
+ // FIXME: This doesn't work properly with flipped writing modes.
+ // https://bugs.webkit.org/show_bug.cgi?id=125149
+ if (iterBox->isPositioned()) {
+ // For positioned elements, just use the layer's absolute bounding box.
+ visualOverflowRect.moveBy(iterBox->layer()->absoluteBoundingBox().location());
+ break;
+ }
+
+ LayoutRect currentBoxRect = iterBox->frameRect();
+ if (iterBox->style().isFlippedBlocksWritingMode()) {
+ if (iterBox->style().isHorizontalWritingMode())
+ currentBoxRect.setY(currentBoxRect.height() - currentBoxRect.maxY());
+ else
+ currentBoxRect.setX(currentBoxRect.width() - currentBoxRect.maxX());
+ }
+
+ if (containerBlock->style().writingMode() != iterBox->style().writingMode())
+ iterBox->flipForWritingMode(currentBoxRect);
+
+ visualOverflowRect.moveBy(currentBoxRect.location());
+ iterBox = containerBlock;
+ }
+
+ // Since the purpose of this method is to make sure the borders of a fragmented
+ // element don't overflow the region in the fragmentation direction, there's no
+ // point in restricting the clipping rect on the logical X axis.
+ // This also saves us the trouble of handling percent-based widths and margins
+ // since the absolute bounding box of a positioned element would not contain
+ // the correct coordinates relative to the region we're interested in, but rather
+ // relative to the actual flow thread.
+ if (style().isHorizontalWritingMode()) {
+ if (initialLogicalX < visualOverflowRect.x())
+ visualOverflowRect.shiftXEdgeTo(initialLogicalX);
+ if (visualOverflowRect.width() < frameRect().width())
+ visualOverflowRect.setWidth(frameRect().width());
+ } else {
+ if (initialLogicalX < visualOverflowRect.y())
+ visualOverflowRect.shiftYEdgeTo(initialLogicalX);
+ if (visualOverflowRect.height() < frameRect().height())
+ visualOverflowRect.setHeight(frameRect().height());
+ }
+
+ return visualOverflowRect;
+}
+
</ins><span class="cx"> void RenderNamedFlowThread::computeOversetStateForRegions(LayoutUnit oldClientAfterEdge)
</span><span class="cx"> {
</span><span class="cx"> LayoutUnit height = oldClientAfterEdge;
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderNamedFlowThreadh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderNamedFlowThread.h (164836 => 164837)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderNamedFlowThread.h 2014-02-27 23:36:23 UTC (rev 164836)
+++ trunk/Source/WebCore/rendering/RenderNamedFlowThread.h 2014-02-27 23:52:23 UTC (rev 164837)
</span><span class="lines">@@ -68,6 +68,8 @@
</span><span class="cx">
</span><span class="cx"> virtual void regionChangedWritingMode(RenderRegion*) override;
</span><span class="cx">
</span><ins>+ LayoutRect decorationsClipRectForBoxInNamedFlowFragment(const RenderBox&, RenderNamedFlowFragment&) const;
+
</ins><span class="cx"> bool overset() const { return m_overset; }
</span><span class="cx"> void computeOversetStateForRegions(LayoutUnit oldClientAfterEdge);
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>