<!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>[178541] 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/178541">178541</a></dd>
<dt>Author</dt> <dd>zalan@apple.com</dd>
<dt>Date</dt> <dd>2015-01-15 16:11:27 -0800 (Thu, 15 Jan 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Reduce LayoutRect::infiniteRect() usage.
https://bugs.webkit.org/show_bug.cgi?id=140511
Reviewed by Simon Fraser.
This is in preparation to get rid of LayoutRect/FloatRect::infiniteRect().
No change in functionality.
* platform/graphics/LayoutRect.h:
(WebCore::LayoutRect::isInfinite):
* rendering/ClipRect.h:
(WebCore::ClipRect::reset):
(WebCore::ClipRect::isEmpty):
(WebCore::ClipRect::isInfinite):
(WebCore::ClipRect::setRect): Deleted.
* rendering/PaintInfo.h:
(WebCore::PaintInfo::applyTransform):
* rendering/RenderLayer.cpp:
(WebCore::RenderLayer::calculateClipRects):
* rendering/RenderLayer.h:
(WebCore::ClipRects::reset):
* rendering/RenderLayerBacking.cpp:
(WebCore::RenderLayerBacking::updateGeometry):
* 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="#trunkSourceWebCoreplatformgraphicsLayoutRecth">trunk/Source/WebCore/platform/graphics/LayoutRect.h</a></li>
<li><a href="#trunkSourceWebCorerenderingClipRecth">trunk/Source/WebCore/rendering/ClipRect.h</a></li>
<li><a href="#trunkSourceWebCorerenderingPaintInfoh">trunk/Source/WebCore/rendering/PaintInfo.h</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 (178540 => 178541)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-01-16 00:06:22 UTC (rev 178540)
+++ trunk/Source/WebCore/ChangeLog 2015-01-16 00:11:27 UTC (rev 178541)
</span><span class="lines">@@ -1,3 +1,32 @@
</span><ins>+2015-01-15 Zalan Bujtas <zalan@apple.com>
+
+ Reduce LayoutRect::infiniteRect() usage.
+ https://bugs.webkit.org/show_bug.cgi?id=140511
+
+ Reviewed by Simon Fraser.
+
+ This is in preparation to get rid of LayoutRect/FloatRect::infiniteRect().
+
+ No change in functionality.
+
+ * platform/graphics/LayoutRect.h:
+ (WebCore::LayoutRect::isInfinite):
+ * rendering/ClipRect.h:
+ (WebCore::ClipRect::reset):
+ (WebCore::ClipRect::isEmpty):
+ (WebCore::ClipRect::isInfinite):
+ (WebCore::ClipRect::setRect): Deleted.
+ * rendering/PaintInfo.h:
+ (WebCore::PaintInfo::applyTransform):
+ * rendering/RenderLayer.cpp:
+ (WebCore::RenderLayer::calculateClipRects):
+ * rendering/RenderLayer.h:
+ (WebCore::ClipRects::reset):
+ * rendering/RenderLayerBacking.cpp:
+ (WebCore::RenderLayerBacking::updateGeometry):
+ * rendering/RenderLayerCompositor.cpp:
+ (WebCore::RenderLayerCompositor::clippedByAncestor):
+
</ins><span class="cx"> 2015-01-15 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> Intermittent WebCore build failures - CSSPropertyNames.gperf: No keywords in input file! calling gperf failed: 256 at WebCore/css/makeprop.pl line 901
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsLayoutRecth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/LayoutRect.h (178540 => 178541)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/LayoutRect.h 2015-01-16 00:06:22 UTC (rev 178540)
+++ trunk/Source/WebCore/platform/graphics/LayoutRect.h 2015-01-16 00:11:27 UTC (rev 178541)
</span><span class="lines">@@ -153,6 +153,7 @@
</span><span class="cx"> void scale(float xScale, float yScale);
</span><span class="cx">
</span><span class="cx"> LayoutRect transposedRect() const { return LayoutRect(m_location.transposedPoint(), m_size.transposedSize()); }
</span><ins>+ bool isInfinite() const { return *this == LayoutRect::infiniteRect(); }
</ins><span class="cx">
</span><span class="cx"> static LayoutRect infiniteRect()
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingClipRecth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/ClipRect.h (178540 => 178541)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/ClipRect.h 2015-01-16 00:06:22 UTC (rev 178540)
+++ trunk/Source/WebCore/rendering/ClipRect.h 2015-01-16 00:11:27 UTC (rev 178541)
</span><span class="lines">@@ -42,8 +42,9 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> const LayoutRect& rect() const { return m_rect; }
</span><del>- void setRect(const LayoutRect& rect) { m_rect = rect; }
-
</del><ins>+
+ void reset() { m_rect = LayoutRect::infiniteRect(); }
+
</ins><span class="cx"> bool affectedByRadius() const { return m_affectedByRadius; }
</span><span class="cx"> void setAffectedByRadius(bool affectedByRadius) { m_affectedByRadius = affectedByRadius; }
</span><span class="cx">
</span><span class="lines">@@ -57,10 +58,12 @@
</span><span class="cx"> void move(const LayoutSize& size) { m_rect.move(size); }
</span><span class="cx"> void moveBy(const LayoutPoint& point) { m_rect.moveBy(point); }
</span><span class="cx">
</span><del>- bool isEmpty() const { return m_rect.isEmpty(); }
</del><span class="cx"> bool intersects(const LayoutRect& rect) const { return m_rect.intersects(rect); }
</span><span class="cx"> bool intersects(const HitTestLocation&) const;
</span><del>-
</del><ins>+
+ bool isEmpty() const { return m_rect.isEmpty(); }
+ bool isInfinite() const { return m_rect.isInfinite(); }
+
</ins><span class="cx"> void inflateX(LayoutUnit dx) { m_rect.inflateX(dx); }
</span><span class="cx"> void inflateY(LayoutUnit dy) { m_rect.inflateY(dy); }
</span><span class="cx"> void inflate(LayoutUnit d) { inflateX(d); inflateY(d); }
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingPaintInfoh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/PaintInfo.h (178540 => 178541)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/PaintInfo.h 2015-01-16 00:06:22 UTC (rev 178540)
+++ trunk/Source/WebCore/rendering/PaintInfo.h 2015-01-16 00:11:27 UTC (rev 178541)
</span><span class="lines">@@ -95,7 +95,7 @@
</span><span class="cx">
</span><span class="cx"> context->concatCTM(localToAncestorTransform);
</span><span class="cx">
</span><del>- if (rect == LayoutRect::infiniteRect())
</del><ins>+ if (rect.isInfinite())
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> FloatRect tranformedRect(localToAncestorTransform.inverse().mapRect(rect));
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderLayercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderLayer.cpp (178540 => 178541)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderLayer.cpp 2015-01-16 00:06:22 UTC (rev 178540)
+++ trunk/Source/WebCore/rendering/RenderLayer.cpp 2015-01-16 00:11:27 UTC (rev 178541)
</span><span class="lines">@@ -148,11 +148,11 @@
</span><span class="cx">
</span><span class="cx"> ClipRects() = default;
</span><span class="cx">
</span><del>- void reset(const LayoutRect& clipRect)
</del><ins>+ void reset()
</ins><span class="cx"> {
</span><del>- m_overflowClipRect = clipRect;
- m_fixedClipRect = clipRect;
- m_posClipRect = clipRect;
</del><ins>+ m_overflowClipRect.reset();
+ m_fixedClipRect.reset();
+ m_posClipRect.reset();
</ins><span class="cx"> m_fixed = false;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -5406,7 +5406,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(LayoutRect::infiniteRect());
</del><ins>+ clipRects.reset();
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -5430,7 +5430,7 @@
</span><span class="cx"> parentLayer->calculateClipRects(parentContext, clipRects);
</span><span class="cx"> }
</span><span class="cx"> } else
</span><del>- clipRects.reset(LayoutRect::infiniteRect());
</del><ins>+ clipRects.reset();
</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">@@ -5519,7 +5519,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 != LayoutRect::infiniteRect())
</del><ins>+ if (parentRects.fixed() && &clipRectsContext.rootLayer->renderer() == &view && !backgroundClipRect.isInfinite())
</ins><span class="cx"> backgroundClipRect.move(view.frameView().scrollOffsetForFixedPosition());
</span><span class="cx">
</span><span class="cx"> return backgroundClipRect;
</span><span class="lines">@@ -5671,7 +5671,7 @@
</span><span class="cx"> calculateRects(clipRectsContext, LayoutRect::infiniteRect(), layerBounds, backgroundRect, foregroundRect, outlineRect, offsetFromRoot);
</span><span class="cx">
</span><span class="cx"> LayoutRect clipRect = backgroundRect.rect();
</span><del>- if (clipRect == LayoutRect::infiniteRect())
</del><ins>+ if (clipRect.isInfinite())
</ins><span class="cx"> return clipRect;
</span><span class="cx">
</span><span class="cx"> if (renderer().hasClip()) {
</span><span class="lines">@@ -5881,7 +5881,7 @@
</span><span class="cx"> if (flags & UseLocalClipRectIfPossible) {
</span><span class="cx"> bool clipExceedsBounds = false;
</span><span class="cx"> LayoutRect localClipRect = this->localClipRect(clipExceedsBounds);
</span><del>- if (localClipRect != LayoutRect::infiniteRect() && !clipExceedsBounds) {
</del><ins>+ if (!localClipRect.isInfinite() && !clipExceedsBounds) {
</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">@@ -6917,7 +6917,7 @@
</span><span class="cx"> if (flowFragment->shouldClipFlowThreadContent())
</span><span class="cx"> clipRect.intersect(regionClipRect);
</span><span class="cx">
</span><del>- bool shouldClip = (clipRect != LayoutRect::infiniteRect());
</del><ins>+ bool shouldClip = !clipRect.isInfinite();
</ins><span class="cx"> // Optimize clipping for the single fragment case.
</span><span class="cx"> if (shouldClip)
</span><span class="cx"> clipToRect(paintingInfo, context, clipRect);
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderLayerBackingcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderLayerBacking.cpp (178540 => 178541)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderLayerBacking.cpp 2015-01-16 00:06:22 UTC (rev 178540)
+++ trunk/Source/WebCore/rendering/RenderLayerBacking.cpp 2015-01-16 00:11:27 UTC (rev 178541)
</span><span class="lines">@@ -774,7 +774,7 @@
</span><span class="cx"> ShouldRespectOverflowClip shouldRespectOverflowClip = compAncestor->isolatesCompositedBlending() ? RespectOverflowClip : IgnoreOverflowClip;
</span><span class="cx"> RenderLayer::ClipRectsContext clipRectsContext(compAncestor, TemporaryClipRects, IgnoreOverlayScrollbarSize, shouldRespectOverflowClip);
</span><span class="cx"> LayoutRect parentClipRect = m_owningLayer.backgroundClipRect(clipRectsContext).rect(); // FIXME: Incorrect for CSS regions.
</span><del>- ASSERT(parentClipRect != LayoutRect::infiniteRect());
</del><ins>+ ASSERT(!parentClipRect.isInfinite());
</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 (178540 => 178541)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp 2015-01-16 00:06:22 UTC (rev 178540)
+++ trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp 2015-01-16 00:11:27 UTC (rev 178541)
</span><span class="lines">@@ -2417,7 +2417,7 @@
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- return layer.backgroundClipRect(RenderLayer::ClipRectsContext(computeClipRoot, TemporaryClipRects)).rect() != LayoutRect::infiniteRect(); // FIXME: Incorrect for CSS regions.
</del><ins>+ return !layer.backgroundClipRect(RenderLayer::ClipRectsContext(computeClipRoot, TemporaryClipRects)).isInfinite(); // 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>