<!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>[180044] branches/safari-600.1.4.15-branch/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/180044">180044</a></dd>
<dt>Author</dt> <dd>matthew_hanson@apple.com</dd>
<dt>Date</dt> <dd>2015-02-13 08:15:35 -0800 (Fri, 13 Feb 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/180031">r180031</a>. rdar://problem/19432928</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari6001415branchSourceWebKit2ChangeLog">branches/safari-600.1.4.15-branch/Source/WebKit2/ChangeLog</a></li>
<li><a href="#branchessafari6001415branchSourceWebKit2WebProcessWebPageWebPagecpp">branches/safari-600.1.4.15-branch/Source/WebKit2/WebProcess/WebPage/WebPage.cpp</a></li>
<li><a href="#branchessafari6001415branchSourceWebKit2WebProcessWebPageWebPageh">branches/safari-600.1.4.15-branch/Source/WebKit2/WebProcess/WebPage/WebPage.h</a></li>
<li><a href="#branchessafari6001415branchSourceWebKit2WebProcessWebPageWebPagemessagesin">branches/safari-600.1.4.15-branch/Source/WebKit2/WebProcess/WebPage/WebPage.messages.in</a></li>
<li><a href="#branchessafari6001415branchSourceWebKit2WebProcessWebPagemacRemoteLayerTreeDrawingAreamm">branches/safari-600.1.4.15-branch/Source/WebKit2/WebProcess/WebPage/mac/RemoteLayerTreeDrawingArea.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari6001415branchSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1.4.15-branch/Source/WebKit2/ChangeLog (180043 => 180044)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.15-branch/Source/WebKit2/ChangeLog 2015-02-13 16:15:32 UTC (rev 180043)
+++ branches/safari-600.1.4.15-branch/Source/WebKit2/ChangeLog 2015-02-13 16:15:35 UTC (rev 180044)
</span><span class="lines">@@ -1,5 +1,32 @@
</span><span class="cx"> 2015-02-13 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><ins>+ Merge r180031. rdar://problem/19432928
+
+ 2015-02-12 Tim Horton <timothy_horton@apple.com>
+
+ Crash removing RemoteLayerTreeDisplayRefreshMonitor from the drawing area's map
+ https://bugs.webkit.org/show_bug.cgi?id=141545
+ <rdar://problem/17712200>
+
+ Reviewed by Simon Fraser.
+
+ * WebProcess/WebPage/WebPage.cpp:
+ (WebKit::WebPage::windowScreenDidChange):
+ * WebProcess/WebPage/WebPage.h:
+ * WebProcess/WebPage/WebPage.messages.in:
+ windowScreenDidChange should take uint32_t, since that's what PlatformDisplayID is.
+
+ * WebProcess/WebPage/mac/RemoteLayerTreeDrawingArea.mm:
+ (WebKit::RemoteLayerTreeDrawingArea::RemoteLayerTreeDrawingArea):
+ RemoteLayerTreeDisplayRefreshMonitor is driven by the page's
+ RemoteLayerTreeDrawingArea. Because of this, we cannot have the same
+ sharing of DisplayRefreshMonitors that other platforms use.
+ In order to ensure that we get a unique DisplayRefreshMonitor
+ per-DrawingArea, give each page a unique DisplayID derived
+ from WebPage's unique ID.
+
+2015-02-13 Matthew Hanson <matthew_hanson@apple.com>
+
</ins><span class="cx"> Merge r179885. rdar://problem/19812617
</span><span class="cx">
</span><span class="cx"> 2015-02-10 Enrica Casucci <enrica@apple.com>
</span></span></pre></div>
<a id="branchessafari6001415branchSourceWebKit2WebProcessWebPageWebPagecpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1.4.15-branch/Source/WebKit2/WebProcess/WebPage/WebPage.cpp (180043 => 180044)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.15-branch/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2015-02-13 16:15:32 UTC (rev 180043)
+++ branches/safari-600.1.4.15-branch/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2015-02-13 16:15:35 UTC (rev 180044)
</span><span class="lines">@@ -1372,7 +1372,7 @@
</span><span class="cx"> return frame->setPageAndTextZoomFactors(static_cast<float>(pageZoomFactor), static_cast<float>(textZoomFactor));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebPage::windowScreenDidChange(uint64_t displayID)
</del><ins>+void WebPage::windowScreenDidChange(uint32_t displayID)
</ins><span class="cx"> {
</span><span class="cx"> m_page->chrome().windowScreenDidChange(static_cast<PlatformDisplayID>(displayID));
</span><span class="cx"> }
</span></span></pre></div>
<a id="branchessafari6001415branchSourceWebKit2WebProcessWebPageWebPageh"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1.4.15-branch/Source/WebKit2/WebProcess/WebPage/WebPage.h (180043 => 180044)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.15-branch/Source/WebKit2/WebProcess/WebPage/WebPage.h 2015-02-13 16:15:32 UTC (rev 180043)
+++ branches/safari-600.1.4.15-branch/Source/WebKit2/WebProcess/WebPage/WebPage.h 2015-02-13 16:15:35 UTC (rev 180044)
</span><span class="lines">@@ -348,7 +348,7 @@
</span><span class="cx"> double pageZoomFactor() const;
</span><span class="cx"> void setPageZoomFactor(double);
</span><span class="cx"> void setPageAndTextZoomFactors(double pageZoomFactor, double textZoomFactor);
</span><del>- void windowScreenDidChange(uint64_t);
</del><ins>+ void windowScreenDidChange(uint32_t);
</ins><span class="cx">
</span><span class="cx"> void scalePage(double scale, const WebCore::IntPoint& origin);
</span><span class="cx"> void scalePageInViewCoordinates(double scale, WebCore::IntPoint centerInViewCoordinates);
</span></span></pre></div>
<a id="branchessafari6001415branchSourceWebKit2WebProcessWebPageWebPagemessagesin"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1.4.15-branch/Source/WebKit2/WebProcess/WebPage/WebPage.messages.in (180043 => 180044)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.15-branch/Source/WebKit2/WebProcess/WebPage/WebPage.messages.in 2015-02-13 16:15:32 UTC (rev 180043)
+++ branches/safari-600.1.4.15-branch/Source/WebKit2/WebProcess/WebPage/WebPage.messages.in 2015-02-13 16:15:35 UTC (rev 180044)
</span><span class="lines">@@ -181,7 +181,7 @@
</span><span class="cx"> SetPageAndTextZoomFactors(double pageZoomFactor, double textZoomFactor)
</span><span class="cx"> SetPageZoomFactor(double zoomFactor)
</span><span class="cx"> SetTextZoomFactor(double zoomFactor)
</span><del>- WindowScreenDidChange(uint64_t displayID)
</del><ins>+ WindowScreenDidChange(uint32_t displayID)
</ins><span class="cx">
</span><span class="cx"> ScalePage(double scale, WebCore::IntPoint origin)
</span><span class="cx"> ScalePageInViewCoordinates(double scale, WebCore::IntPoint centerInViewCoordinates)
</span></span></pre></div>
<a id="branchessafari6001415branchSourceWebKit2WebProcessWebPagemacRemoteLayerTreeDrawingAreamm"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1.4.15-branch/Source/WebKit2/WebProcess/WebPage/mac/RemoteLayerTreeDrawingArea.mm (180043 => 180044)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.15-branch/Source/WebKit2/WebProcess/WebPage/mac/RemoteLayerTreeDrawingArea.mm 2015-02-13 16:15:32 UTC (rev 180043)
+++ branches/safari-600.1.4.15-branch/Source/WebKit2/WebProcess/WebPage/mac/RemoteLayerTreeDrawingArea.mm 2015-02-13 16:15:35 UTC (rev 180044)
</span><span class="lines">@@ -73,6 +73,13 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> m_commitQueue = dispatch_queue_create("com.apple.WebKit.WebContent.RemoteLayerTreeDrawingArea.CommitQueue", nullptr);
</span><ins>+
+ // In order to ensure that we get a unique DisplayRefreshMonitor per-DrawingArea (necessary because DisplayRefreshMonitor
+ // is driven by this class), give each page a unique DisplayID derived from WebPage's unique ID.
+ // FIXME: While using the high end of the range of DisplayIDs makes a collision with real, non-RemoteLayerTreeDrawingArea
+ // DisplayIDs less likely, it is not entirely safe to have a RemoteLayerTreeDrawingArea and TiledCoreAnimationDrawingArea
+ // coeexist in the same process.
+ webPage.windowScreenDidChange(std::numeric_limits<uint32_t>::max() - webPage.pageID());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> RemoteLayerTreeDrawingArea::~RemoteLayerTreeDrawingArea()
</span></span></pre>
</div>
</div>
</body>
</html>