<!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>[161443] 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/161443">161443</a></dd>

<dt>Author</dt> <dd>carlosgc@webkit.org</dd>

<dt>Date</dt> <dd>2014-01-07 12:01:31 -0800 (Tue, 07 Jan 2014)</dd>

</dl>

<h3>Log Message</h3>

<pre>REGRESSION(<a href="http://trac.webkit.org/projects/webkit/changeset/161381">r161381</a>): [GTK] Rendering is broken in GTK after <a href="http://trac.webkit.org/projects/webkit/changeset/161381">r161381</a>

https://bugs.webkit.org/show_bug.cgi?id=126570

Reviewed by Tim Horton.

Use LayoutRect::infiniteRect() instead of IntRect::infiniteRect()

when a LayoutRect is expected.

* rendering/RenderFlowThread.cpp:

(WebCore::RenderFlowThread::fragmentsBoundingBox):

* rendering/RenderLayer.cpp:

(WebCore::RenderLayer::collectFragments):

(WebCore::RenderLayer::calculateClipRects):

* rendering/RenderLayerBacking.cpp:

(WebCore::clipBox):

* rendering/RenderLayerCompositor.cpp:

(WebCore::RenderLayerCompositor::clippedByAncestor):</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>

</ul>

</div>

<div id="patch">

<h3>Diff</h3>

<a id="trunkSourceWebCoreChangeLog"></a>

<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (161442 => 161443)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/Source/WebCore/ChangeLog        2014-01-07 19:39:50 UTC (rev 161442)

+++ trunk/Source/WebCore/ChangeLog        2014-01-07 20:01:31 UTC (rev 161443)

</span><span class="lines">@@ -1,3 +1,23 @@

</span><ins>+2014-01-07  Carlos Garcia Campos  &lt;cgarcia@igalia.com&gt;

+

+        REGRESSION(r161381): [GTK] Rendering is broken in GTK after r161381

+        https://bugs.webkit.org/show_bug.cgi?id=126570

+

+        Reviewed by Tim Horton.

+

+        Use LayoutRect::infiniteRect() instead of IntRect::infiniteRect()

+        when a LayoutRect is expected.

+

+        * rendering/RenderFlowThread.cpp:

+        (WebCore::RenderFlowThread::fragmentsBoundingBox):

+        * rendering/RenderLayer.cpp:

+        (WebCore::RenderLayer::collectFragments):

+        (WebCore::RenderLayer::calculateClipRects):

+        * rendering/RenderLayerBacking.cpp:

+        (WebCore::clipBox):

+        * rendering/RenderLayerCompositor.cpp:

+        (WebCore::RenderLayerCompositor::clippedByAncestor):

+

</ins><span class="cx"> 2014-01-07  Bear Travis  &lt;betravis@adobe.com&gt;

</span><span class="cx"> 

</span><span class="cx">         [CSS Shapes] Change default value from 'auto' to 'none'

</span></span></pre></div>

<a id="trunkSourceWebCorerenderingRenderFlowThreadcpp"></a>

<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderFlowThread.cpp (161442 => 161443)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/Source/WebCore/rendering/RenderFlowThread.cpp        2014-01-07 19:39:50 UTC (rev 161442)

+++ trunk/Source/WebCore/rendering/RenderFlowThread.cpp        2014-01-07 20:01:31 UTC (rev 161443)

</span><span class="lines">@@ -1089,7 +1089,7 @@

</span><span class="cx">     for (auto iter = m_regionList.begin(), end = m_regionList.end(); iter != end; ++iter) {

</span><span class="cx">         RenderRegion* region = *iter;

</span><span class="cx">         LayerFragments fragments;

</span><del>-        region-&gt;collectLayerFragments(fragments, layerBoundingBox, IntRect::infiniteRect());

</del><ins>+        region-&gt;collectLayerFragments(fragments, layerBoundingBox, LayoutRect::infiniteRect());

</ins><span class="cx">         for (size_t i = 0; i &lt; fragments.size(); ++i) {

</span><span class="cx">             const LayerFragment&amp; fragment = fragments.at(i);

</span><span class="cx">             LayoutRect fragmentRect(layerBoundingBox);

</span></span></pre></div>

<a id="trunkSourceWebCorerenderingRenderLayercpp"></a>

<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderLayer.cpp (161442 => 161443)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/Source/WebCore/rendering/RenderLayer.cpp        2014-01-07 19:39:50 UTC (rev 161442)

+++ trunk/Source/WebCore/rendering/RenderLayer.cpp        2014-01-07 20:01:31 UTC (rev 161443)

</span><span class="lines">@@ -4280,7 +4280,7 @@

</span><span class="cx">     ClipRect backgroundRectInFlowThread;

</span><span class="cx">     ClipRect foregroundRectInFlowThread;

</span><span class="cx">     ClipRect outlineRectInFlowThread;

</span><del>-    calculateRects(paginationClipRectsContext, IntRect::infiniteRect(), layerBoundsInFlowThread, backgroundRectInFlowThread, foregroundRectInFlowThread,

</del><ins>+    calculateRects(paginationClipRectsContext, LayoutRect::infiniteRect(), layerBoundsInFlowThread, backgroundRectInFlowThread, foregroundRectInFlowThread,

</ins><span class="cx">         outlineRectInFlowThread, &amp;offsetWithinPaginatedLayer);

</span><span class="cx">     

<span class="cx">     // Take our bounding box within the flow thread and clip it.

</span><span class="lines">@@ -5346,7 +5346,7 @@

</span><span class="cx"> {

</span><span class="cx">     if (!parent()) {

<span class="cx">         // The root layer's clip rect is always infinite.

</span><del>-        clipRects.reset(IntRect::infiniteRect());

</del><ins>+        clipRects.reset(LayoutRect::infiniteRect());

</ins><span class="cx">         return;

</span><span class="cx">     }

</span><span class="cx">     

</span><span class="lines">@@ -5372,7 +5372,7 @@

</span><span class="cx">             parentLayer-&gt;calculateClipRects(parentContext, clipRects);

</span><span class="cx">         }

</span><span class="cx">     } else

</span><del>-        clipRects.reset(IntRect::infiniteRect());

</del><ins>+        clipRects.reset(LayoutRect::infiniteRect());

</ins><span class="cx"> 

</span><span class="cx">     // A fixed object is essentially the root of its containing block hierarchy, so when

<span class="cx">     // we encounter such an object, we reset our clip rects to the fixedClipRect.

</span><span class="lines">@@ -5465,7 +5465,7 @@

</span><span class="cx">     RenderView&amp; view = renderer().view();

</span><span class="cx"> 

<span class="cx">     // Note: infinite clipRects should not be scrolled here, otherwise they will accidentally no longer be considered infinite.

</span><del>-    if (parentRects.fixed() &amp;&amp; &amp;clipRectsContext.rootLayer-&gt;renderer() == &amp;view &amp;&amp; backgroundClipRect != IntRect::infiniteRect())

</del><ins>+    if (parentRects.fixed() &amp;&amp; &amp;clipRectsContext.rootLayer-&gt;renderer() == &amp;view &amp;&amp; backgroundClipRect != LayoutRect::infiniteRect())

</ins><span class="cx">         backgroundClipRect.move(view.frameView().scrollOffsetForFixedPosition());

</span><span class="cx"> 

</span><span class="cx">     return backgroundClipRect;

</span><span class="lines">@@ -5596,10 +5596,10 @@

</span><span class="cx">     LayoutRect layerBounds;

</span><span class="cx">     ClipRect backgroundRect, foregroundRect, outlineRect;

</span><span class="cx">     ClipRectsContext clipRectsContext(clippingRootLayer, 0, PaintingClipRects);

</span><del>-    calculateRects(clipRectsContext, IntRect::infiniteRect(), layerBounds, backgroundRect, foregroundRect, outlineRect);

</del><ins>+    calculateRects(clipRectsContext, LayoutRect::infiniteRect(), layerBounds, backgroundRect, foregroundRect, outlineRect);

</ins><span class="cx"> 

</span><span class="cx">     LayoutRect clipRect = backgroundRect.rect();

</span><del>-    if (clipRect == IntRect::infiniteRect())

</del><ins>+    if (clipRect == LayoutRect::infiniteRect())

</ins><span class="cx">         return clipRect;

</span><span class="cx"> 

</span><span class="cx">     LayoutPoint clippingRootOffset;

</span><span class="lines">@@ -5792,7 +5792,7 @@

</span><span class="cx"> 

</span><span class="cx">     if (flags &amp; UseLocalClipRectIfPossible) {

</span><span class="cx">         LayoutRect localClipRect = this-&gt;localClipRect();

</span><del>-        if (localClipRect != IntRect::infiniteRect()) {

</del><ins>+        if (localClipRect != LayoutRect::infiniteRect()) {

</ins><span class="cx">             if ((flags &amp; IncludeSelfTransform) &amp;&amp; paintsWithTransform(PaintBehaviorNormal))

</span><span class="cx">                 localClipRect = transform()-&gt;mapRect(localClipRect);

</span><span class="cx"> 

</span><span class="lines">@@ -6955,12 +6955,12 @@

</span><span class="cx">     }

</span><span class="cx"> 

<span class="cx">     // Optimize clipping for the single fragment case.

</span><del>-    if (!regionClipRect.isEmpty() &amp;&amp; regionClipRect != IntRect::infiniteRect())

</del><ins>+    if (!regionClipRect.isEmpty() &amp;&amp; regionClipRect != LayoutRect::infiniteRect())

</ins><span class="cx">         clipToRect(paintingInfo.rootLayer, context, paintingInfo.paintDirtyRect, regionClipRect);

</span><span class="cx"> 

</span><span class="cx">     flowThreadLayer-&gt;paintNamedFlowThreadInsideRegion(context, region, paintingInfo.paintDirtyRect, paintOffset, paintingInfo.paintBehavior, paintFlags);

</span><span class="cx"> 

</span><del>-    if (!regionClipRect.isEmpty() &amp;&amp; regionClipRect != IntRect::infiniteRect())

</del><ins>+    if (!regionClipRect.isEmpty() &amp;&amp; regionClipRect != LayoutRect::infiniteRect())

</ins><span class="cx">         restoreClip(context, paintingInfo.paintDirtyRect, regionClipRect);

</span><span class="cx"> }

</span><span class="cx"> 

</span></span></pre></div>

<a id="trunkSourceWebCorerenderingRenderLayerBackingcpp"></a>

<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderLayerBacking.cpp (161442 => 161443)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/Source/WebCore/rendering/RenderLayerBacking.cpp        2014-01-07 19:39:50 UTC (rev 161442)

+++ trunk/Source/WebCore/rendering/RenderLayerBacking.cpp        2014-01-07 20:01:31 UTC (rev 161443)

</span><span class="lines">@@ -646,7 +646,7 @@

</span><span class="cx"> 

</span><span class="cx"> static IntRect clipBox(RenderBox&amp; renderer)

</span><span class="cx"> {

</span><del>-    LayoutRect result = IntRect::infiniteRect();

</del><ins>+    LayoutRect result = LayoutRect::infiniteRect();

</ins><span class="cx">     if (renderer.hasOverflowClip())

<span class="cx">         result = renderer.overflowClipRect(LayoutPoint(), 0); // FIXME: Incorrect for CSS regions.

</span><span class="cx"> 

</span></span></pre></div>

<a id="trunkSourceWebCorerenderingRenderLayerCompositorcpp"></a>

<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp (161442 => 161443)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp        2014-01-07 19:39:50 UTC (rev 161442)

+++ trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp        2014-01-07 20:01:31 UTC (rev 161443)

</span><span class="lines">@@ -2195,7 +2195,7 @@

</span><span class="cx">     if (!computeClipRoot || computeClipRoot == &amp;layer)

</span><span class="cx">         return false;

</span><span class="cx"> 

<del>-    return layer.backgroundClipRect(RenderLayer::ClipRectsContext(computeClipRoot, 0, TemporaryClipRects)).rect() != IntRect::infiniteRect(); // FIXME: Incorrect for CSS regions.

</del><ins>+    return layer.backgroundClipRect(RenderLayer::ClipRectsContext(computeClipRoot, 0, TemporaryClipRects)).rect() != LayoutRect::infiniteRect(); // FIXME: Incorrect for CSS regions.

</ins><span class="cx"> }

</span><span class="cx"> 

</span><span class="cx"> // Return true if the given layer is a stacking context and has compositing child

</span></span></pre>

</div>

</div>

</body>

</html>