<!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>[167810] 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/167810">167810</a></dd>
<dt>Author</dt> <dd>stavila@adobe.com</dd>
<dt>Date</dt> <dd>2014-04-25 10:58:19 -0700 (Fri, 25 Apr 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[CSS Regions] Rename objectShouldPaintInFlowRegion to something more clear
https://bugs.webkit.org/show_bug.cgi?id=132050
Reviewed by Andreas Kling.
The objectShouldPaintInFlowRegion is no longer used only by the painting process
but also for hit-testing, so it was renamed to something more generic (objectShouldFragmentInFlowRegion).
No new tests required, it's just a method rename.
* rendering/RenderBlock.cpp:
(WebCore::RenderBlock::paint):
(WebCore::RenderBlock::selectionGaps):
(WebCore::RenderBlock::nodeAtPoint):
* rendering/RenderBox.cpp:
(WebCore::RenderBox::positionForPoint):
* rendering/RenderFlowThread.cpp:
(WebCore::RenderFlowThread::objectShouldFragmentInFlowRegion):
(WebCore::RenderFlowThread::objectShouldPaintInFlowRegion): Deleted.
* rendering/RenderFlowThread.h:
* rendering/RenderLayer.cpp:
(WebCore::RenderLayer::paintLayer):
(WebCore::RenderLayer::hitTestLayer):
* rendering/RenderRegion.cpp:
(WebCore::RenderRegion::ensureOverflowForBox):
* rendering/RenderReplaced.cpp:
(WebCore::RenderReplaced::shouldPaint):</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="#trunkSourceWebCorerenderingRenderBoxcpp">trunk/Source/WebCore/rendering/RenderBox.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="#trunkSourceWebCorerenderingRenderLayercpp">trunk/Source/WebCore/rendering/RenderLayer.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderRegioncpp">trunk/Source/WebCore/rendering/RenderRegion.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderReplacedcpp">trunk/Source/WebCore/rendering/RenderReplaced.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (167809 => 167810)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-04-25 17:53:32 UTC (rev 167809)
+++ trunk/Source/WebCore/ChangeLog 2014-04-25 17:58:19 UTC (rev 167810)
</span><span class="lines">@@ -1,3 +1,33 @@
</span><ins>+2014-04-25 Radu Stavila <stavila@adobe.com>
+
+ [CSS Regions] Rename objectShouldPaintInFlowRegion to something more clear
+ https://bugs.webkit.org/show_bug.cgi?id=132050
+
+ Reviewed by Andreas Kling.
+
+ The objectShouldPaintInFlowRegion is no longer used only by the painting process
+ but also for hit-testing, so it was renamed to something more generic (objectShouldFragmentInFlowRegion).
+
+ No new tests required, it's just a method rename.
+
+ * rendering/RenderBlock.cpp:
+ (WebCore::RenderBlock::paint):
+ (WebCore::RenderBlock::selectionGaps):
+ (WebCore::RenderBlock::nodeAtPoint):
+ * rendering/RenderBox.cpp:
+ (WebCore::RenderBox::positionForPoint):
+ * rendering/RenderFlowThread.cpp:
+ (WebCore::RenderFlowThread::objectShouldFragmentInFlowRegion):
+ (WebCore::RenderFlowThread::objectShouldPaintInFlowRegion): Deleted.
+ * rendering/RenderFlowThread.h:
+ * rendering/RenderLayer.cpp:
+ (WebCore::RenderLayer::paintLayer):
+ (WebCore::RenderLayer::hitTestLayer):
+ * rendering/RenderRegion.cpp:
+ (WebCore::RenderRegion::ensureOverflowForBox):
+ * rendering/RenderReplaced.cpp:
+ (WebCore::RenderReplaced::shouldPaint):
+
</ins><span class="cx"> 2014-04-25 Enrica Casucci <enrica@apple.com>
</span><span class="cx">
</span><span class="cx"> iOS build fix after http://trac.webkit.org/changeset/167803
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderBlockcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderBlock.cpp (167809 => 167810)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderBlock.cpp 2014-04-25 17:53:32 UTC (rev 167809)
+++ trunk/Source/WebCore/rendering/RenderBlock.cpp 2014-04-25 17:58:19 UTC (rev 167810)
</span><span class="lines">@@ -1792,7 +1792,7 @@
</span><span class="cx"> PaintPhase phase = paintInfo.phase;
</span><span class="cx">
</span><span class="cx"> // Check our region range to make sure we need to be painting in this region.
</span><del>- if (paintInfo.renderNamedFlowFragment && !paintInfo.renderNamedFlowFragment->flowThread()->objectShouldPaintInFlowRegion(this, paintInfo.renderNamedFlowFragment))
</del><ins>+ if (paintInfo.renderNamedFlowFragment && !paintInfo.renderNamedFlowFragment->flowThread()->objectShouldFragmentInFlowRegion(this, paintInfo.renderNamedFlowFragment))
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> // Check if we need to do anything at all.
</span><span class="lines">@@ -2415,7 +2415,7 @@
</span><span class="cx">
</span><span class="cx"> if (paintInfo && paintInfo->renderNamedFlowFragment && paintInfo->paintContainer->isRenderFlowThread()) {
</span><span class="cx"> // Make sure the current object is actually flowed into the region being painted.
</span><del>- if (!toRenderFlowThread(paintInfo->paintContainer)->objectShouldPaintInFlowRegion(this, paintInfo->renderNamedFlowFragment))
</del><ins>+ if (!toRenderFlowThread(paintInfo->paintContainer)->objectShouldFragmentInFlowRegion(this, paintInfo->renderNamedFlowFragment))
</ins><span class="cx"> return result;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -2958,7 +2958,7 @@
</span><span class="cx"> if (locationInContainer.region()) {
</span><span class="cx"> RenderFlowThread* flowThread = flowThreadContainingBlock();
</span><span class="cx"> ASSERT(flowThread);
</span><del>- if (!flowThread->objectShouldPaintInFlowRegion(this, locationInContainer.region()))
</del><ins>+ if (!flowThread->objectShouldFragmentInFlowRegion(this, locationInContainer.region()))
</ins><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderBoxcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderBox.cpp (167809 => 167810)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderBox.cpp 2014-04-25 17:53:32 UTC (rev 167809)
+++ trunk/Source/WebCore/rendering/RenderBox.cpp 2014-04-25 17:58:19 UTC (rev 167810)
</span><span class="lines">@@ -4159,7 +4159,7 @@
</span><span class="cx">
</span><span class="cx"> if (isRenderFlowThread()) {
</span><span class="cx"> ASSERT(region);
</span><del>- if (!toRenderFlowThread(this)->objectShouldPaintInFlowRegion(renderObject, region))
</del><ins>+ if (!toRenderFlowThread(this)->objectShouldFragmentInFlowRegion(renderObject, region))
</ins><span class="cx"> continue;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderFlowThreadcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderFlowThread.cpp (167809 => 167810)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderFlowThread.cpp 2014-04-25 17:53:32 UTC (rev 167809)
+++ trunk/Source/WebCore/rendering/RenderFlowThread.cpp 2014-04-25 17:58:19 UTC (rev 167810)
</span><span class="lines">@@ -804,7 +804,7 @@
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool RenderFlowThread::objectShouldPaintInFlowRegion(const RenderObject* object, const RenderRegion* region) const
</del><ins>+bool RenderFlowThread::objectShouldFragmentInFlowRegion(const RenderObject* object, const RenderRegion* region) const
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(object);
</span><span class="cx"> ASSERT(region);
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderFlowThreadh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderFlowThread.h (167809 => 167810)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderFlowThread.h 2014-04-25 17:53:32 UTC (rev 167809)
+++ trunk/Source/WebCore/rendering/RenderFlowThread.h 2014-04-25 17:58:19 UTC (rev 167810)
</span><span class="lines">@@ -141,7 +141,7 @@
</span><span class="cx"> bool objectInFlowRegion(const RenderObject*, const RenderRegion*) const;
</span><span class="cx">
</span><span class="cx"> // Check if the object should be painted in this region and if the region is part of this flow thread.
</span><del>- bool objectShouldPaintInFlowRegion(const RenderObject*, const RenderRegion*) const;
</del><ins>+ bool objectShouldFragmentInFlowRegion(const RenderObject*, const RenderRegion*) const;
</ins><span class="cx">
</span><span class="cx"> void markAutoLogicalHeightRegionsForLayout();
</span><span class="cx"> void markRegionsForOverflowLayoutIfNeeded();
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderLayercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderLayer.cpp (167809 => 167810)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderLayer.cpp 2014-04-25 17:53:32 UTC (rev 167809)
+++ trunk/Source/WebCore/rendering/RenderLayer.cpp 2014-04-25 17:58:19 UTC (rev 167810)
</span><span class="lines">@@ -3746,7 +3746,7 @@
</span><span class="cx"> info.renderNamedFlowFragment = nullptr;
</span><span class="cx"> else {
</span><span class="cx"> ASSERT(namedFlowFragment->isValid());
</span><del>- if (!namedFlowFragment->flowThread()->objectShouldPaintInFlowRegion(&renderer(), namedFlowFragment))
</del><ins>+ if (!namedFlowFragment->flowThread()->objectShouldFragmentInFlowRegion(&renderer(), namedFlowFragment))
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -4907,7 +4907,7 @@
</span><span class="cx"> if (hitTestLocation.region()) {
</span><span class="cx"> ASSERT(hitTestLocation.region()->isValid());
</span><span class="cx"> RenderFlowThread* flowThread = hitTestLocation.region()->flowThread();
</span><del>- if (!flowThread->objectShouldPaintInFlowRegion(&renderer(), hitTestLocation.region()))
</del><ins>+ if (!flowThread->objectShouldFragmentInFlowRegion(&renderer(), hitTestLocation.region()))
</ins><span class="cx"> return 0;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderRegioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderRegion.cpp (167809 => 167810)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderRegion.cpp 2014-04-25 17:53:32 UTC (rev 167809)
+++ trunk/Source/WebCore/rendering/RenderRegion.cpp 2014-04-25 17:58:19 UTC (rev 167810)
</span><span class="lines">@@ -444,7 +444,7 @@
</span><span class="cx">
</span><span class="cx"> LayoutRect borderBox = box->borderBoxRectInRegion(this);
</span><span class="cx"> LayoutRect clientBox;
</span><del>- ASSERT(m_flowThread->objectShouldPaintInFlowRegion(box, this));
</del><ins>+ ASSERT(m_flowThread->objectShouldFragmentInFlowRegion(box, this));
</ins><span class="cx">
</span><span class="cx"> if (!borderBox.isEmpty()) {
</span><span class="cx"> borderBox = rectFlowPortionForBox(box, borderBox);
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderReplacedcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderReplaced.cpp (167809 => 167810)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderReplaced.cpp 2014-04-25 17:53:32 UTC (rev 167809)
+++ trunk/Source/WebCore/rendering/RenderReplaced.cpp 2014-04-25 17:58:19 UTC (rev 167810)
</span><span class="lines">@@ -207,7 +207,7 @@
</span><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> // Check our region range to make sure we need to be painting in this region.
</span><del>- if (paintInfo.renderNamedFlowFragment && !paintInfo.renderNamedFlowFragment->flowThread()->objectShouldPaintInFlowRegion(this, paintInfo.renderNamedFlowFragment))
</del><ins>+ if (paintInfo.renderNamedFlowFragment && !paintInfo.renderNamedFlowFragment->flowThread()->objectShouldFragmentInFlowRegion(this, paintInfo.renderNamedFlowFragment))
</ins><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> LayoutPoint adjustedPaintOffset = paintOffset + location();
</span></span></pre>
</div>
</div>
</body>
</html>