<!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>[170838] trunk/Source/WebKit2</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/170838">170838</a></dd>
<dt>Author</dt> <dd>timothy_horton@apple.com</dd>
<dt>Date</dt> <dd>2014-07-06 23:04:51 -0700 (Sun, 06 Jul 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[WK2] Don't support dynamically enabling the RemoteLayerTree debug indicator
https://bugs.webkit.org/show_bug.cgi?id=134644
Reviewed by Darin Adler.
* UIProcess/DrawingAreaProxy.h:
(WebKit::DrawingAreaProxy::setShouldShowDebugIndicator): Deleted.
* UIProcess/WebPageProxy.cpp:
(WebKit::WebPageProxy::preferencesDidChange):
* UIProcess/mac/RemoteLayerTreeDrawingAreaProxy.h:
* UIProcess/mac/RemoteLayerTreeDrawingAreaProxy.mm:
(WebKit::RemoteLayerTreeDrawingAreaProxy::RemoteLayerTreeDrawingAreaProxy):
(WebKit::RemoteLayerTreeDrawingAreaProxy::initializeDebugIndicator):
(WebKit::RemoteLayerTreeDrawingAreaProxy::setShouldShowDebugIndicator): Deleted.
The indicator depends on the live layer tree commits coming in, including layer creation,
so it can't be turned on after the root layer is created. Even a refresh is insufficient
to get it working; the debug indicator really needs to exist from the first commit.
So, don't even attempt to dynamically enable the indicator; create it at
RemoteLayerTreeDrawingAreaProxy construction time if the pref is enabled.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessDrawingAreaProxyh">trunk/Source/WebKit2/UIProcess/DrawingAreaProxy.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebPageProxycpp">trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessmacRemoteLayerTreeDrawingAreaProxyh">trunk/Source/WebKit2/UIProcess/mac/RemoteLayerTreeDrawingAreaProxy.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessmacRemoteLayerTreeDrawingAreaProxymm">trunk/Source/WebKit2/UIProcess/mac/RemoteLayerTreeDrawingAreaProxy.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (170837 => 170838)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-07-07 05:02:34 UTC (rev 170837)
+++ trunk/Source/WebKit2/ChangeLog 2014-07-07 06:04:51 UTC (rev 170838)
</span><span class="lines">@@ -1,3 +1,25 @@
</span><ins>+2014-07-06 Tim Horton <timothy_horton@apple.com>
+
+ [WK2] Don't support dynamically enabling the RemoteLayerTree debug indicator
+ https://bugs.webkit.org/show_bug.cgi?id=134644
+
+ Reviewed by Darin Adler.
+
+ * UIProcess/DrawingAreaProxy.h:
+ (WebKit::DrawingAreaProxy::setShouldShowDebugIndicator): Deleted.
+ * UIProcess/WebPageProxy.cpp:
+ (WebKit::WebPageProxy::preferencesDidChange):
+ * UIProcess/mac/RemoteLayerTreeDrawingAreaProxy.h:
+ * UIProcess/mac/RemoteLayerTreeDrawingAreaProxy.mm:
+ (WebKit::RemoteLayerTreeDrawingAreaProxy::RemoteLayerTreeDrawingAreaProxy):
+ (WebKit::RemoteLayerTreeDrawingAreaProxy::initializeDebugIndicator):
+ (WebKit::RemoteLayerTreeDrawingAreaProxy::setShouldShowDebugIndicator): Deleted.
+ The indicator depends on the live layer tree commits coming in, including layer creation,
+ so it can't be turned on after the root layer is created. Even a refresh is insufficient
+ to get it working; the debug indicator really needs to exist from the first commit.
+ So, don't even attempt to dynamically enable the indicator; create it at
+ RemoteLayerTreeDrawingAreaProxy construction time if the pref is enabled.
+
</ins><span class="cx"> 2014-07-06 Yoav Weiss <yoav@yoav.ws>
</span><span class="cx">
</span><span class="cx"> Turn on img@sizes compile flag
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessDrawingAreaProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/DrawingAreaProxy.h (170837 => 170838)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/DrawingAreaProxy.h 2014-07-07 05:02:34 UTC (rev 170837)
+++ trunk/Source/WebKit2/UIProcess/DrawingAreaProxy.h 2014-07-07 06:04:51 UTC (rev 170838)
</span><span class="lines">@@ -83,7 +83,6 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> virtual void updateDebugIndicator() { }
</span><del>- virtual void setShouldShowDebugIndicator(bool) { }
</del><span class="cx">
</span><span class="cx"> virtual void waitForDidUpdateViewState() { }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebPageProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp (170837 => 170838)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2014-07-07 05:02:34 UTC (rev 170837)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2014-07-07 06:04:51 UTC (rev 170838)
</span><span class="lines">@@ -2384,9 +2384,6 @@
</span><span class="cx"> inspector()->enableRemoteInspection();
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>- if (m_drawingArea)
- m_drawingArea->setShouldShowDebugIndicator(m_preferences->tiledScrollingIndicatorVisible());
-
</del><span class="cx"> m_process->pagePreferencesChanged(this);
</span><span class="cx">
</span><span class="cx"> m_pageClient.preferencesDidChange();
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessmacRemoteLayerTreeDrawingAreaProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/mac/RemoteLayerTreeDrawingAreaProxy.h (170837 => 170838)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/mac/RemoteLayerTreeDrawingAreaProxy.h 2014-07-07 05:02:34 UTC (rev 170837)
+++ trunk/Source/WebKit2/UIProcess/mac/RemoteLayerTreeDrawingAreaProxy.h 2014-07-07 06:04:51 UTC (rev 170838)
</span><span class="lines">@@ -62,7 +62,6 @@
</span><span class="cx"> virtual void dispatchAfterEnsuringDrawing(std::function<void (CallbackBase::Error)>) override;
</span><span class="cx">
</span><span class="cx"> WebCore::FloatRect scaledExposedRect() const;
</span><del>- virtual void setShouldShowDebugIndicator(bool) override;
</del><span class="cx">
</span><span class="cx"> #if PLATFORM(MAC)
</span><span class="cx"> virtual void setExposedRect(const WebCore::FloatRect&) override;
</span><span class="lines">@@ -72,6 +71,7 @@
</span><span class="cx"> virtual void updateDebugIndicator() override;
</span><span class="cx"> void updateDebugIndicator(WebCore::IntSize contentsSize, bool rootLayerChanged, float scale);
</span><span class="cx"> void updateDebugIndicatorPosition();
</span><ins>+ void initializeDebugIndicator();
</ins><span class="cx">
</span><span class="cx"> virtual void waitForDidUpdateViewState() override;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessmacRemoteLayerTreeDrawingAreaProxymm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/mac/RemoteLayerTreeDrawingAreaProxy.mm (170837 => 170838)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/mac/RemoteLayerTreeDrawingAreaProxy.mm 2014-07-07 05:02:34 UTC (rev 170837)
+++ trunk/Source/WebKit2/UIProcess/mac/RemoteLayerTreeDrawingAreaProxy.mm 2014-07-07 06:04:51 UTC (rev 170838)
</span><span class="lines">@@ -60,7 +60,8 @@
</span><span class="cx">
</span><span class="cx"> m_webPageProxy->process().addMessageReceiver(Messages::RemoteLayerTreeDrawingAreaProxy::messageReceiverName(), m_webPageProxy->pageID(), *this);
</span><span class="cx">
</span><del>- setShouldShowDebugIndicator(m_webPageProxy->preferences().tiledScrollingIndicatorVisible());
</del><ins>+ if (m_webPageProxy->preferences().tiledScrollingIndicatorVisible())
+ initializeDebugIndicator();
</ins><span class="cx">
</span><span class="cx"> m_layerCommitObserver = RunLoopObserver::create(didCommitLayersRunLoopOrder, [this]() {
</span><span class="cx"> this->coreAnimationDidCommitLayers();
</span><span class="lines">@@ -266,19 +267,8 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void RemoteLayerTreeDrawingAreaProxy::setShouldShowDebugIndicator(bool show)
</del><ins>+void RemoteLayerTreeDrawingAreaProxy::initializeDebugIndicator()
</ins><span class="cx"> {
</span><del>- if (show == !!m_debugIndicatorLayerTreeHost)
- return;
-
- if (!show) {
- [m_tileMapHostLayer removeFromSuperlayer];
- m_tileMapHostLayer = nullptr;
- m_exposedRectIndicatorLayer = nullptr;
- m_debugIndicatorLayerTreeHost = nullptr;
- return;
- }
-
</del><span class="cx"> m_debugIndicatorLayerTreeHost = std::make_unique<RemoteLayerTreeHost>(*this);
</span><span class="cx"> m_debugIndicatorLayerTreeHost->setIsDebugLayerTreeHost(true);
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>