<!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>[199038] 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/199038">199038</a></dd>
<dt>Author</dt> <dd>simon.fraser@apple.com</dd>
<dt>Date</dt> <dd>2016-04-04 21:04:35 -0700 (Mon, 04 Apr 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Make FrameView's exposedRect an Optional<>
https://bugs.webkit.org/show_bug.cgi?id=156189
Reviewed by Tim Horton.
Instead of testing against isInfinite(), make FrameView::exposedRect() and the
member variable an Optional<FloatRect>.
* page/FrameView.cpp:
(WebCore::FrameView::setExposedRect):
* page/FrameView.h:
* rendering/RenderLayerBacking.cpp:
(WebCore::computeTileCoverage):
* rendering/RenderLayerCompositor.cpp:
(WebCore::RenderLayerCompositor::flushPendingLayerChanges):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorepageFrameViewcpp">trunk/Source/WebCore/page/FrameView.cpp</a></li>
<li><a href="#trunkSourceWebCorepageFrameViewh">trunk/Source/WebCore/page/FrameView.h</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 (199037 => 199038)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-04-05 03:56:46 UTC (rev 199037)
+++ trunk/Source/WebCore/ChangeLog 2016-04-05 04:04:35 UTC (rev 199038)
</span><span class="lines">@@ -1,5 +1,23 @@
</span><span class="cx"> 2016-04-04 Simon Fraser <simon.fraser@apple.com>
</span><span class="cx">
</span><ins>+ Make FrameView's exposedRect an Optional<>
+ https://bugs.webkit.org/show_bug.cgi?id=156189
+
+ Reviewed by Tim Horton.
+
+ Instead of testing against isInfinite(), make FrameView::exposedRect() and the
+ member variable an Optional<FloatRect>.
+
+ * page/FrameView.cpp:
+ (WebCore::FrameView::setExposedRect):
+ * page/FrameView.h:
+ * rendering/RenderLayerBacking.cpp:
+ (WebCore::computeTileCoverage):
+ * rendering/RenderLayerCompositor.cpp:
+ (WebCore::RenderLayerCompositor::flushPendingLayerChanges):
+
+2016-04-04 Simon Fraser <simon.fraser@apple.com>
+
</ins><span class="cx"> Don't crash when rendering form controls with Display List Drawing enabled
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=156122
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorepageFrameViewcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/FrameView.cpp (199037 => 199038)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/FrameView.cpp 2016-04-05 03:56:46 UTC (rev 199037)
+++ trunk/Source/WebCore/page/FrameView.cpp 2016-04-05 04:04:35 UTC (rev 199038)
</span><span class="lines">@@ -207,7 +207,6 @@
</span><span class="cx"> , m_delayedScrollEventTimer(*this, &FrameView::sendScrollEvent)
</span><span class="cx"> , m_isTrackingRepaints(false)
</span><span class="cx"> , m_shouldUpdateWhileOffscreen(true)
</span><del>- , m_exposedRect(FloatRect::infiniteRect())
</del><span class="cx"> , m_deferSetNeedsLayoutCount(0)
</span><span class="cx"> , m_setNeedsLayoutWasDeferred(false)
</span><span class="cx"> , m_speculativeTilingEnabled(false)
</span><span class="lines">@@ -4910,8 +4909,9 @@
</span><span class="cx">
</span><span class="cx"> void FrameView::setExposedRect(FloatRect exposedRect)
</span><span class="cx"> {
</span><del>- if (m_exposedRect == exposedRect)
</del><ins>+ if (m_exposedRect && m_exposedRect.value() == exposedRect)
</ins><span class="cx"> return;
</span><ins>+
</ins><span class="cx"> m_exposedRect = exposedRect;
</span><span class="cx">
</span><span class="cx"> // FIXME: We should support clipping to the exposed rect for subframes as well.
</span></span></pre></div>
<a id="trunkSourceWebCorepageFrameViewh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/FrameView.h (199037 => 199038)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/FrameView.h 2016-04-05 03:56:46 UTC (rev 199037)
+++ trunk/Source/WebCore/page/FrameView.h 2016-04-05 04:04:35 UTC (rev 199038)
</span><span class="lines">@@ -543,7 +543,7 @@
</span><span class="cx"> // clipping by other UI elements), whereas visibleContentRect is
</span><span class="cx"> // internal to WebCore and doesn't respect those things.
</span><span class="cx"> WEBCORE_EXPORT void setExposedRect(FloatRect);
</span><del>- FloatRect exposedRect() const { return m_exposedRect; }
</del><ins>+ Optional<FloatRect> exposedRect() const { return m_exposedRect; }
</ins><span class="cx">
</span><span class="cx"> #if ENABLE(CSS_SCROLL_SNAP)
</span><span class="cx"> void updateSnapOffsets() override;
</span><span class="lines">@@ -754,7 +754,7 @@
</span><span class="cx">
</span><span class="cx"> bool m_shouldUpdateWhileOffscreen;
</span><span class="cx">
</span><del>- FloatRect m_exposedRect;
</del><ins>+ Optional<FloatRect> m_exposedRect;
</ins><span class="cx">
</span><span class="cx"> unsigned m_deferSetNeedsLayoutCount;
</span><span class="cx"> bool m_setNeedsLayoutWasDeferred;
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderLayerBackingcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderLayerBacking.cpp (199037 => 199038)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderLayerBacking.cpp 2016-04-05 03:56:46 UTC (rev 199037)
+++ trunk/Source/WebCore/rendering/RenderLayerBacking.cpp 2016-04-05 04:04:35 UTC (rev 199038)
</span><span class="lines">@@ -226,7 +226,7 @@
</span><span class="cx"> TiledBacking::TileCoverage tileCoverage = TiledBacking::CoverageForVisibleArea;
</span><span class="cx"> bool useMinimalTilesDuringLiveResize = frameView.inLiveResize();
</span><span class="cx"> if (frameView.speculativeTilingEnabled() && !useMinimalTilesDuringLiveResize) {
</span><del>- bool clipsToExposedRect = !frameView.exposedRect().isInfinite();
</del><ins>+ bool clipsToExposedRect = static_cast<bool>(frameView.exposedRect());
</ins><span class="cx"> if (frameView.horizontalScrollbarMode() != ScrollbarAlwaysOff || clipsToExposedRect)
</span><span class="cx"> tileCoverage |= TiledBacking::CoverageForHorizontalScrolling;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderLayerCompositorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp (199037 => 199038)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp 2016-04-05 03:56:46 UTC (rev 199037)
+++ trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp 2016-04-05 04:04:35 UTC (rev 199038)
</span><span class="lines">@@ -59,6 +59,7 @@
</span><span class="cx"> #include "ScrollingConstraints.h"
</span><span class="cx"> #include "ScrollingCoordinator.h"
</span><span class="cx"> #include "Settings.h"
</span><ins>+#include "TextStream.h"
</ins><span class="cx"> #include "TiledBacking.h"
</span><span class="cx"> #include "TransformState.h"
</span><span class="cx"> #include <wtf/CurrentTime.h>
</span><span class="lines">@@ -458,12 +459,12 @@
</span><span class="cx"> rootLayer->flushCompositingState(exposedRect, frameView.viewportIsStable());
</span><span class="cx"> #else
</span><span class="cx"> // Having a m_clipLayer indicates that we're doing scrolling via GraphicsLayers.
</span><del>- IntRect visibleRect = m_clipLayer ? IntRect(IntPoint(), frameView.unscaledVisibleContentSizeIncludingObscuredArea()) : frameView.visibleContentRect();
- if (!frameView.exposedRect().isInfinite())
- visibleRect.intersect(IntRect(frameView.exposedRect()));
</del><ins>+ FloatRect visibleRect = m_clipLayer ? FloatRect({ 0, 0 }, frameView.unscaledVisibleContentSizeIncludingObscuredArea()) : frameView.visibleContentRect();
</ins><span class="cx">
</span><del>- LOG(Compositing, "RenderLayerCompositor %p flushPendingLayerChanges(%d) %d, %d, %dx%d (stable viewport %d)", this, isFlushRoot,
- visibleRect.x(), visibleRect.y(), visibleRect.width(), visibleRect.height(), frameView.viewportIsStable());
</del><ins>+ if (frameView.exposedRect())
+ visibleRect.intersect(frameView.exposedRect().value());
+
+ LOG_WITH_STREAM(Compositing, stream << "RenderLayerCompositor " << this << " flushPendingLayerChanges(" << isFlushRoot << ") " << visibleRect << " (stable viewport " << frameView.viewportIsStable() << ")");
</ins><span class="cx"> rootLayer->flushCompositingState(visibleRect, frameView.viewportIsStable());
</span><span class="cx"> #endif
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>