<!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>[161381] 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/161381">161381</a></dd>
<dt>Author</dt> <dd>timothy_horton@apple.com</dd>
<dt>Date</dt> <dd>2014-01-06 15:50:43 -0800 (Mon, 06 Jan 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Add {IntRect, FloatRect}::infiniteRect() and ::isInfinite()
https://bugs.webkit.org/show_bug.cgi?id=126537
Reviewed by Simon Fraser.
* platform/graphics/FloatRect.h:
(WebCore::FloatRect::infiniteRect):
(WebCore::FloatRect::isInfinite):
* platform/graphics/IntRect.h:
(WebCore::IntRect::infiniteRect):
(WebCore::IntRect::isInfinite):
Add infiniteRect() and isInfinite() to FloatRect and IntRect.
* platform/graphics/ca/GraphicsLayerCA.cpp:
(WebCore::GraphicsLayerCA::setNeedsDisplay):
* rendering/PaintInfo.h:
(WebCore::PaintInfo::applyTransform):
* rendering/RenderFlowThread.cpp:
(WebCore::RenderFlowThread::fragmentsBoundingBox):
* rendering/RenderLayer.cpp:
(WebCore::RenderLayer::collectFragments):
(WebCore::RenderLayer::calculateClipRects):
* rendering/RenderLayerBacking.cpp:
(WebCore::clipBox):
(WebCore::RenderLayerBacking::updateGraphicsLayerGeometry):
* rendering/RenderLayerCompositor.cpp:
(WebCore::RenderLayerCompositor::clippedByAncestor):
* rendering/svg/SVGRenderingContext.cpp:
(WebCore::SVGRenderingContext::renderSubtreeToImageBuffer):
Adopt the new functions.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsFloatRecth">trunk/Source/WebCore/platform/graphics/FloatRect.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsIntRecth">trunk/Source/WebCore/platform/graphics/IntRect.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscaGraphicsLayerCAcpp">trunk/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingPaintInfoh">trunk/Source/WebCore/rendering/PaintInfo.h</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="#trunkSourceWebCorerenderingsvgSVGRenderingContextcpp">trunk/Source/WebCore/rendering/svg/SVGRenderingContext.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (161380 => 161381)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-01-06 23:35:52 UTC (rev 161380)
+++ trunk/Source/WebCore/ChangeLog 2014-01-06 23:50:43 UTC (rev 161381)
</span><span class="lines">@@ -1,3 +1,36 @@
</span><ins>+2014-01-06 Tim Horton <timothy_horton@apple.com>
+
+ Add {IntRect, FloatRect}::infiniteRect() and ::isInfinite()
+ https://bugs.webkit.org/show_bug.cgi?id=126537
+
+ Reviewed by Simon Fraser.
+
+ * platform/graphics/FloatRect.h:
+ (WebCore::FloatRect::infiniteRect):
+ (WebCore::FloatRect::isInfinite):
+ * platform/graphics/IntRect.h:
+ (WebCore::IntRect::infiniteRect):
+ (WebCore::IntRect::isInfinite):
+ Add infiniteRect() and isInfinite() to FloatRect and IntRect.
+
+ * platform/graphics/ca/GraphicsLayerCA.cpp:
+ (WebCore::GraphicsLayerCA::setNeedsDisplay):
+ * rendering/PaintInfo.h:
+ (WebCore::PaintInfo::applyTransform):
+ * rendering/RenderFlowThread.cpp:
+ (WebCore::RenderFlowThread::fragmentsBoundingBox):
+ * rendering/RenderLayer.cpp:
+ (WebCore::RenderLayer::collectFragments):
+ (WebCore::RenderLayer::calculateClipRects):
+ * rendering/RenderLayerBacking.cpp:
+ (WebCore::clipBox):
+ (WebCore::RenderLayerBacking::updateGraphicsLayerGeometry):
+ * rendering/RenderLayerCompositor.cpp:
+ (WebCore::RenderLayerCompositor::clippedByAncestor):
+ * rendering/svg/SVGRenderingContext.cpp:
+ (WebCore::SVGRenderingContext::renderSubtreeToImageBuffer):
+ Adopt the new functions.
+
</ins><span class="cx"> 2014-01-06 Seokju Kwon <seokju@webkit.org>
</span><span class="cx">
</span><span class="cx"> Web Inspector: Get rid of DOM.setFileInputFiles from Protocol
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsFloatRecth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/FloatRect.h (161380 => 161381)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/FloatRect.h 2014-01-06 23:35:52 UTC (rev 161380)
+++ trunk/Source/WebCore/platform/graphics/FloatRect.h 2014-01-06 23:50:43 UTC (rev 161381)
</span><span class="lines">@@ -193,6 +193,9 @@
</span><span class="cx">
</span><span class="cx"> void dump(PrintStream& out) const;
</span><span class="cx">
</span><ins>+ static FloatRect infiniteRect();
+ bool isInfinite() const;
+
</ins><span class="cx"> private:
</span><span class="cx"> FloatPoint m_location;
</span><span class="cx"> FloatSize m_size;
</span><span class="lines">@@ -246,6 +249,17 @@
</span><span class="cx"> return a.location() != b.location() || a.size() != b.size();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+inline FloatRect FloatRect::infiniteRect()
+{
+ static FloatRect infiniteRect(-std::numeric_limits<float>::max() / 2, -std::numeric_limits<float>::max() / 2, std::numeric_limits<float>::max(), std::numeric_limits<float>::max());
+ return infiniteRect;
+}
+
+inline bool FloatRect::isInfinite() const
+{
+ return *this == infiniteRect();
+}
+
</ins><span class="cx"> IntRect enclosingIntRect(const FloatRect&);
</span><span class="cx">
</span><span class="cx"> // Returns a valid IntRect contained within the given FloatRect.
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsIntRecth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/IntRect.h (161380 => 161381)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/IntRect.h 2014-01-06 23:35:52 UTC (rev 161380)
+++ trunk/Source/WebCore/platform/graphics/IntRect.h 2014-01-06 23:50:43 UTC (rev 161381)
</span><span class="lines">@@ -203,6 +203,9 @@
</span><span class="cx">
</span><span class="cx"> void dump(PrintStream& out) const;
</span><span class="cx">
</span><ins>+ static IntRect infiniteRect();
+ bool isInfinite() const;
+
</ins><span class="cx"> private:
</span><span class="cx"> IntPoint m_location;
</span><span class="cx"> IntSize m_size;
</span><span class="lines">@@ -234,6 +237,17 @@
</span><span class="cx"> return a.location() != b.location() || a.size() != b.size();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+inline IntRect IntRect::infiniteRect()
+{
+ static IntRect infiniteRect(-std::numeric_limits<int>::max() / 2, -std::numeric_limits<int>::max() / 2, std::numeric_limits<int>::max(), std::numeric_limits<int>::max());
+ return infiniteRect;
+}
+
+inline bool IntRect::isInfinite() const
+{
+ return *this == infiniteRect();
+}
+
</ins><span class="cx"> #if USE(CG)
</span><span class="cx"> IntRect enclosingIntRect(const CGRect&);
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscaGraphicsLayerCAcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp (161380 => 161381)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp 2014-01-06 23:35:52 UTC (rev 161380)
+++ trunk/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp 2014-01-06 23:50:43 UTC (rev 161381)
</span><span class="lines">@@ -705,10 +705,7 @@
</span><span class="cx">
</span><span class="cx"> void GraphicsLayerCA::setNeedsDisplay()
</span><span class="cx"> {
</span><del>- FloatRect hugeRect(-std::numeric_limits<float>::max() / 2, -std::numeric_limits<float>::max() / 2,
- std::numeric_limits<float>::max(), std::numeric_limits<float>::max());
-
- setNeedsDisplayInRect(hugeRect);
</del><ins>+ setNeedsDisplayInRect(FloatRect::infiniteRect());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void GraphicsLayerCA::setNeedsDisplayInRect(const FloatRect& r)
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingPaintInfoh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/PaintInfo.h (161380 => 161381)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/PaintInfo.h 2014-01-06 23:35:52 UTC (rev 161380)
+++ trunk/Source/WebCore/rendering/PaintInfo.h 2014-01-06 23:50:43 UTC (rev 161381)
</span><span class="lines">@@ -98,15 +98,13 @@
</span><span class="cx">
</span><span class="cx"> context->concatCTM(localToAncestorTransform);
</span><span class="cx">
</span><del>- if (rect == infiniteRect())
</del><ins>+ if (rect.isInfinite())
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> rect = localToAncestorTransform.inverse().mapRect(rect);
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>- static IntRect infiniteRect() { return IntRect(LayoutRect::infiniteRect()); }
-
</del><span class="cx"> GraphicsContext* context;
</span><span class="cx"> IntRect rect;
</span><span class="cx"> PaintPhase phase;
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderFlowThreadcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderFlowThread.cpp (161380 => 161381)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderFlowThread.cpp 2014-01-06 23:35:52 UTC (rev 161380)
+++ trunk/Source/WebCore/rendering/RenderFlowThread.cpp 2014-01-06 23:50:43 UTC (rev 161381)
</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->collectLayerFragments(fragments, layerBoundingBox, PaintInfo::infiniteRect());
</del><ins>+ region->collectLayerFragments(fragments, layerBoundingBox, IntRect::infiniteRect());
</ins><span class="cx"> for (size_t i = 0; i < fragments.size(); ++i) {
</span><span class="cx"> const LayerFragment& 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 (161380 => 161381)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderLayer.cpp 2014-01-06 23:35:52 UTC (rev 161380)
+++ trunk/Source/WebCore/rendering/RenderLayer.cpp 2014-01-06 23:50:43 UTC (rev 161381)
</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, PaintInfo::infiniteRect(), layerBoundsInFlowThread, backgroundRectInFlowThread, foregroundRectInFlowThread,
</del><ins>+ calculateRects(paginationClipRectsContext, IntRect::infiniteRect(), layerBoundsInFlowThread, backgroundRectInFlowThread, foregroundRectInFlowThread,
</ins><span class="cx"> outlineRectInFlowThread, &offsetWithinPaginatedLayer);
</span><span class="cx">
</span><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><span class="cx"> // The root layer's clip rect is always infinite.
</span><del>- clipRects.reset(PaintInfo::infiniteRect());
</del><ins>+ clipRects.reset(IntRect::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->calculateClipRects(parentContext, clipRects);
</span><span class="cx"> }
</span><span class="cx"> } else
</span><del>- clipRects.reset(PaintInfo::infiniteRect());
</del><ins>+ clipRects.reset(IntRect::infiniteRect());
</ins><span class="cx">
</span><span class="cx"> // A fixed object is essentially the root of its containing block hierarchy, so when
</span><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& view = renderer().view();
</span><span class="cx">
</span><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() && &clipRectsContext.rootLayer->renderer() == &view && backgroundClipRect != PaintInfo::infiniteRect())
</del><ins>+ if (parentRects.fixed() && &clipRectsContext.rootLayer->renderer() == &view && backgroundClipRect != IntRect::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, PaintInfo::infiniteRect(), layerBounds, backgroundRect, foregroundRect, outlineRect);
</del><ins>+ calculateRects(clipRectsContext, IntRect::infiniteRect(), layerBounds, backgroundRect, foregroundRect, outlineRect);
</ins><span class="cx">
</span><span class="cx"> LayoutRect clipRect = backgroundRect.rect();
</span><del>- if (clipRect == PaintInfo::infiniteRect())
</del><ins>+ if (clipRect == IntRect::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 & UseLocalClipRectIfPossible) {
</span><span class="cx"> LayoutRect localClipRect = this->localClipRect();
</span><del>- if (localClipRect != PaintInfo::infiniteRect()) {
</del><ins>+ if (localClipRect != IntRect::infiniteRect()) {
</ins><span class="cx"> if ((flags & IncludeSelfTransform) && paintsWithTransform(PaintBehaviorNormal))
</span><span class="cx"> localClipRect = transform()->mapRect(localClipRect);
</span><span class="cx">
</span><span class="lines">@@ -6955,12 +6955,12 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Optimize clipping for the single fragment case.
</span><del>- if (!regionClipRect.isEmpty() && regionClipRect != PaintInfo::infiniteRect())
</del><ins>+ if (!regionClipRect.isEmpty() && regionClipRect != IntRect::infiniteRect())
</ins><span class="cx"> clipToRect(paintingInfo.rootLayer, context, paintingInfo.paintDirtyRect, regionClipRect);
</span><span class="cx">
</span><span class="cx"> flowThreadLayer->paintNamedFlowThreadInsideRegion(context, region, paintingInfo.paintDirtyRect, paintOffset, paintingInfo.paintBehavior, paintFlags);
</span><span class="cx">
</span><del>- if (!regionClipRect.isEmpty() && regionClipRect != PaintInfo::infiniteRect())
</del><ins>+ if (!regionClipRect.isEmpty() && regionClipRect != IntRect::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 (161380 => 161381)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderLayerBacking.cpp 2014-01-06 23:35:52 UTC (rev 161380)
+++ trunk/Source/WebCore/rendering/RenderLayerBacking.cpp 2014-01-06 23:50:43 UTC (rev 161381)
</span><span class="lines">@@ -646,7 +646,7 @@
</span><span class="cx">
</span><span class="cx"> static IntRect clipBox(RenderBox& renderer)
</span><span class="cx"> {
</span><del>- LayoutRect result = PaintInfo::infiniteRect();
</del><ins>+ LayoutRect result = IntRect::infiniteRect();
</ins><span class="cx"> if (renderer.hasOverflowClip())
</span><span class="cx"> result = renderer.overflowClipRect(LayoutPoint(), 0); // FIXME: Incorrect for CSS regions.
</span><span class="cx">
</span><span class="lines">@@ -753,7 +753,7 @@
</span><span class="cx"> // for a compositing layer, rootLayer is the layer itself.
</span><span class="cx"> RenderLayer::ClipRectsContext clipRectsContext(compAncestor, 0, TemporaryClipRects, IgnoreOverlayScrollbarSize, IgnoreOverflowClip);
</span><span class="cx"> IntRect parentClipRect = pixelSnappedIntRect(m_owningLayer.backgroundClipRect(clipRectsContext).rect()); // FIXME: Incorrect for CSS regions.
</span><del>- ASSERT(parentClipRect != PaintInfo::infiniteRect());
</del><ins>+ ASSERT(parentClipRect != IntRect::infiniteRect());
</ins><span class="cx"> m_ancestorClippingLayer->setPosition(FloatPoint(parentClipRect.location() - graphicsLayerParentLocation));
</span><span class="cx"> m_ancestorClippingLayer->setSize(parentClipRect.size());
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderLayerCompositorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp (161380 => 161381)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp 2014-01-06 23:35:52 UTC (rev 161380)
+++ trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp 2014-01-06 23:50:43 UTC (rev 161381)
</span><span class="lines">@@ -2195,7 +2195,7 @@
</span><span class="cx"> if (!computeClipRoot || computeClipRoot == &layer)
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>- return layer.backgroundClipRect(RenderLayer::ClipRectsContext(computeClipRoot, 0, TemporaryClipRects)).rect() != PaintInfo::infiniteRect(); // FIXME: Incorrect for CSS regions.
</del><ins>+ return layer.backgroundClipRect(RenderLayer::ClipRectsContext(computeClipRoot, 0, TemporaryClipRects)).rect() != IntRect::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>
<a id="trunkSourceWebCorerenderingsvgSVGRenderingContextcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/svg/SVGRenderingContext.cpp (161380 => 161381)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/svg/SVGRenderingContext.cpp 2014-01-06 23:35:52 UTC (rev 161380)
+++ trunk/Source/WebCore/rendering/svg/SVGRenderingContext.cpp 2014-01-06 23:50:43 UTC (rev 161381)
</span><span class="lines">@@ -275,7 +275,7 @@
</span><span class="cx"> ASSERT(image);
</span><span class="cx"> ASSERT(image->context());
</span><span class="cx">
</span><del>- PaintInfo info(image->context(), PaintInfo::infiniteRect(), PaintPhaseForeground, PaintBehaviorNormal);
</del><ins>+ PaintInfo info(image->context(), IntRect::infiniteRect(), PaintPhaseForeground, PaintBehaviorNormal);
</ins><span class="cx">
</span><span class="cx"> AffineTransform& contentTransformation = currentContentTransformation();
</span><span class="cx"> AffineTransform savedContentTransformation = contentTransformation;
</span></span></pre>
</div>
</div>
</body>
</html>