<!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>[170319] 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/170319">170319</a></dd>
<dt>Author</dt> <dd>timothy_horton@apple.com</dd>
<dt>Date</dt> <dd>2014-06-23 14:32:03 -0700 (Mon, 23 Jun 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[wk2] Synchronously wait a short time for a layer tree update after bringing a web view in-window
https://bugs.webkit.org/show_bug.cgi?id=134189
Reviewed by Simon Fraser.
Make the old behavior of -[WKView endDeferringViewInWindowChangesSync] the default; synchronously wait
for a fraction of a second when a page that was previously in-window but currently isn't comes back in-window,
until new content is painted (or we hit a timeout).
* UIProcess/DrawingAreaProxy.h:
(WebKit::DrawingAreaProxy::waitForDidUpdateViewState):
* UIProcess/mac/TiledCoreAnimationDrawingAreaProxy.h:
* UIProcess/mac/TiledCoreAnimationDrawingAreaProxy.mm:
(WebKit::TiledCoreAnimationDrawingAreaProxy::waitForDidUpdateViewState):
Delegate waitForDidUpdateViewState to the DrawingAreaProxys, because behavior is very dependent on them.
* UIProcess/mac/RemoteLayerTreeDrawingAreaProxy.h:
* UIProcess/mac/RemoteLayerTreeDrawingAreaProxy.mm:
(WebKit::RemoteLayerTreeDrawingAreaProxy::coreAnimationDidCommitLayers):
(WebKit::RemoteLayerTreeDrawingAreaProxy::waitForDidUpdateViewState):
Implement waitForDidUpdateViewState for the RemoteLayerTree; it waits for CommitLayerTree.
* UIProcess/WebPageProxy.cpp:
(WebKit::WebPageProxy::WebPageProxy):
(WebKit::WebPageProxy::updateViewState):
(WebKit::WebPageProxy::viewStateDidChange):
(WebKit::WebPageProxy::dispatchViewStateChange):
(WebKit::WebPageProxy::waitForDidUpdateViewState):
(WebKit::WebPageProxy::resetStateAfterProcessExited):
(WebKit::WebPageProxy::viewSize): Deleted.
* UIProcess/WebPageProxy.h:
(WebKit::WebPageProxy::didUpdateViewState):
* UIProcess/API/mac/WKView.mm:
(-[WKView endDeferringViewInWindowChangesSync]):
Always waitForDidUpdateViewState when a page that was previously in-window but currently isn't comes back in-window.
* WebProcess/WebPage/DrawingArea.h:
(WebKit::DrawingArea::viewStateDidChange):
* WebProcess/WebPage/WebPage.cpp:
(WebKit::WebPage::WebPage):
(WebKit::WebPage::setViewState):
(WebKit::WebPage::didUpdateViewStateTimerFired): Deleted.
* WebProcess/WebPage/WebPage.h:
* WebProcess/WebPage/mac/RemoteLayerTreeDrawingArea.h:
* WebProcess/WebPage/mac/RemoteLayerTreeDrawingArea.mm:
(WebKit::RemoteLayerTreeDrawingArea::flushLayers):
(WebKit::RemoteLayerTreeDrawingArea::viewStateDidChange):
* WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.h:
* WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.mm:
(WebKit::TiledCoreAnimationDrawingArea::TiledCoreAnimationDrawingArea):
(WebKit::TiledCoreAnimationDrawingArea::viewStateDidChange):
(WebKit::TiledCoreAnimationDrawingArea::didUpdateViewStateTimerFired):
* WebProcess/WebPage/mac/WebPageMac.mm:
(WebKit::WebPage::didUpdateViewStateTimerFired): Deleted.
Delegate sending of didUpdateViewState to the DrawingAreas (RemoteLayerTreeDrawingArea won't send it,
because the UI process waits for CommitLayerTree instead).</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPImacWKViewmm">trunk/Source/WebKit2/UIProcess/API/mac/WKView.mm</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="#trunkSourceWebKit2UIProcessWebPageProxyh">trunk/Source/WebKit2/UIProcess/WebPageProxy.h</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>
<li><a href="#trunkSourceWebKit2UIProcessmacTiledCoreAnimationDrawingAreaProxyh">trunk/Source/WebKit2/UIProcess/mac/TiledCoreAnimationDrawingAreaProxy.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessmacTiledCoreAnimationDrawingAreaProxymm">trunk/Source/WebKit2/UIProcess/mac/TiledCoreAnimationDrawingAreaProxy.mm</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageDrawingAreah">trunk/Source/WebKit2/WebProcess/WebPage/DrawingArea.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageWebPagecpp">trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageWebPageh">trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPagemacRemoteLayerTreeDrawingAreah">trunk/Source/WebKit2/WebProcess/WebPage/mac/RemoteLayerTreeDrawingArea.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPagemacRemoteLayerTreeDrawingAreamm">trunk/Source/WebKit2/WebProcess/WebPage/mac/RemoteLayerTreeDrawingArea.mm</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPagemacTiledCoreAnimationDrawingAreah">trunk/Source/WebKit2/WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPagemacTiledCoreAnimationDrawingAreamm">trunk/Source/WebKit2/WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.mm</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPagemacWebPageMacmm">trunk/Source/WebKit2/WebProcess/WebPage/mac/WebPageMac.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (170318 => 170319)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-06-23 21:27:59 UTC (rev 170318)
+++ trunk/Source/WebKit2/ChangeLog 2014-06-23 21:32:03 UTC (rev 170319)
</span><span class="lines">@@ -1,3 +1,62 @@
</span><ins>+2014-06-23 Tim Horton <timothy_horton@apple.com>
+
+ [wk2] Synchronously wait a short time for a layer tree update after bringing a web view in-window
+ https://bugs.webkit.org/show_bug.cgi?id=134189
+
+ Reviewed by Simon Fraser.
+
+ Make the old behavior of -[WKView endDeferringViewInWindowChangesSync] the default; synchronously wait
+ for a fraction of a second when a page that was previously in-window but currently isn't comes back in-window,
+ until new content is painted (or we hit a timeout).
+
+ * UIProcess/DrawingAreaProxy.h:
+ (WebKit::DrawingAreaProxy::waitForDidUpdateViewState):
+ * UIProcess/mac/TiledCoreAnimationDrawingAreaProxy.h:
+ * UIProcess/mac/TiledCoreAnimationDrawingAreaProxy.mm:
+ (WebKit::TiledCoreAnimationDrawingAreaProxy::waitForDidUpdateViewState):
+ Delegate waitForDidUpdateViewState to the DrawingAreaProxys, because behavior is very dependent on them.
+
+ * UIProcess/mac/RemoteLayerTreeDrawingAreaProxy.h:
+ * UIProcess/mac/RemoteLayerTreeDrawingAreaProxy.mm:
+ (WebKit::RemoteLayerTreeDrawingAreaProxy::coreAnimationDidCommitLayers):
+ (WebKit::RemoteLayerTreeDrawingAreaProxy::waitForDidUpdateViewState):
+ Implement waitForDidUpdateViewState for the RemoteLayerTree; it waits for CommitLayerTree.
+
+ * UIProcess/WebPageProxy.cpp:
+ (WebKit::WebPageProxy::WebPageProxy):
+ (WebKit::WebPageProxy::updateViewState):
+ (WebKit::WebPageProxy::viewStateDidChange):
+ (WebKit::WebPageProxy::dispatchViewStateChange):
+ (WebKit::WebPageProxy::waitForDidUpdateViewState):
+ (WebKit::WebPageProxy::resetStateAfterProcessExited):
+ (WebKit::WebPageProxy::viewSize): Deleted.
+ * UIProcess/WebPageProxy.h:
+ (WebKit::WebPageProxy::didUpdateViewState):
+ * UIProcess/API/mac/WKView.mm:
+ (-[WKView endDeferringViewInWindowChangesSync]):
+ Always waitForDidUpdateViewState when a page that was previously in-window but currently isn't comes back in-window.
+
+ * WebProcess/WebPage/DrawingArea.h:
+ (WebKit::DrawingArea::viewStateDidChange):
+ * WebProcess/WebPage/WebPage.cpp:
+ (WebKit::WebPage::WebPage):
+ (WebKit::WebPage::setViewState):
+ (WebKit::WebPage::didUpdateViewStateTimerFired): Deleted.
+ * WebProcess/WebPage/WebPage.h:
+ * WebProcess/WebPage/mac/RemoteLayerTreeDrawingArea.h:
+ * WebProcess/WebPage/mac/RemoteLayerTreeDrawingArea.mm:
+ (WebKit::RemoteLayerTreeDrawingArea::flushLayers):
+ (WebKit::RemoteLayerTreeDrawingArea::viewStateDidChange):
+ * WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.h:
+ * WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.mm:
+ (WebKit::TiledCoreAnimationDrawingArea::TiledCoreAnimationDrawingArea):
+ (WebKit::TiledCoreAnimationDrawingArea::viewStateDidChange):
+ (WebKit::TiledCoreAnimationDrawingArea::didUpdateViewStateTimerFired):
+ * WebProcess/WebPage/mac/WebPageMac.mm:
+ (WebKit::WebPage::didUpdateViewStateTimerFired): Deleted.
+ Delegate sending of didUpdateViewState to the DrawingAreas (RemoteLayerTreeDrawingArea won't send it,
+ because the UI process waits for CommitLayerTree instead).
+
</ins><span class="cx"> 2014-06-23 Timothy Horton <timothy_horton@apple.com>
</span><span class="cx">
</span><span class="cx"> [iOS][wk2] Ensure that layers are marked volatile before allowing the process to suspend
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPImacWKViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/mac/WKView.mm (170318 => 170319)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/mac/WKView.mm 2014-06-23 21:27:59 UTC (rev 170318)
+++ trunk/Source/WebKit2/UIProcess/API/mac/WKView.mm 2014-06-23 21:32:03 UTC (rev 170319)
</span><span class="lines">@@ -3756,6 +3756,7 @@
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+// FIXME: All of these "DeferringViewInWindowChanges" methods should be able to be removed once clients are weaned off of them.
</ins><span class="cx"> - (void)beginDeferringViewInWindowChanges
</span><span class="cx"> {
</span><span class="cx"> if (_data->_shouldDeferViewInWindowChanges) {
</span><span class="lines">@@ -3788,18 +3789,12 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- PageClient* pageClient = _data->_pageClient.get();
- bool hasPendingViewInWindowChange = _data->_viewInWindowChangeWasDeferred && _data->_page->isInWindow() != pageClient->isViewInWindow();
-
</del><span class="cx"> _data->_shouldDeferViewInWindowChanges = NO;
</span><span class="cx">
</span><span class="cx"> if (_data->_viewInWindowChangeWasDeferred) {
</span><del>- _data->_page->viewStateDidChange(ViewState::IsInWindow, hasPendingViewInWindowChange ? WebPageProxy::WantsReplyOrNot::DoesWantReply : WebPageProxy::WantsReplyOrNot::DoesNotWantReply);
</del><ins>+ _data->_page->viewStateDidChange(ViewState::IsInWindow);
</ins><span class="cx"> _data->_viewInWindowChangeWasDeferred = NO;
</span><span class="cx"> }
</span><del>-
- if (hasPendingViewInWindowChange)
- _data->_page->waitForDidUpdateViewState();
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (BOOL)isDeferringViewInWindowChanges
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessDrawingAreaProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/DrawingAreaProxy.h (170318 => 170319)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/DrawingAreaProxy.h 2014-06-23 21:27:59 UTC (rev 170318)
+++ trunk/Source/WebKit2/UIProcess/DrawingAreaProxy.h 2014-06-23 21:32:03 UTC (rev 170319)
</span><span class="lines">@@ -87,6 +87,8 @@
</span><span class="cx">
</span><span class="cx"> virtual uint64_t lastVisibleTransactionID() const { ASSERT_NOT_REACHED(); return 0; }
</span><span class="cx">
</span><ins>+ virtual void waitForDidUpdateViewState() { }
+
</ins><span class="cx"> protected:
</span><span class="cx"> explicit DrawingAreaProxy(DrawingAreaType, WebPageProxy*);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebPageProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp (170318 => 170319)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2014-06-23 21:27:59 UTC (rev 170318)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2014-06-23 21:32:03 UTC (rev 170319)
</span><span class="lines">@@ -280,6 +280,7 @@
</span><span class="cx"> , m_geolocationPermissionRequestManager(*this)
</span><span class="cx"> , m_notificationPermissionRequestManager(*this)
</span><span class="cx"> , m_viewState(ViewState::NoFlags)
</span><ins>+ , m_viewWasEverInWindow(false)
</ins><span class="cx"> , m_backForwardList(WebBackForwardList::create(*this))
</span><span class="cx"> , m_loadStateAtProcessExit(FrameLoadState::State::Finished)
</span><span class="cx"> #if PLATFORM(MAC) && !USE(ASYNC_NSTEXTINPUTCLIENT)
</span><span class="lines">@@ -362,7 +363,6 @@
</span><span class="cx"> , m_autoSizingShouldExpandToViewHeight(false)
</span><span class="cx"> , m_mediaVolume(1)
</span><span class="cx"> , m_mayStartMediaWhenInWindow(true)
</span><del>- , m_waitingForDidUpdateViewState(false)
</del><span class="cx"> , m_scrollPinningBehavior(DoNotPin)
</span><span class="cx"> , m_navigationID(0)
</span><span class="cx"> , m_configurationPreferenceValues(configuration.preferenceValues)
</span><span class="lines">@@ -1094,19 +1094,22 @@
</span><span class="cx"> m_viewState |= ViewState::IsVisible;
</span><span class="cx"> if (flagsToUpdate & ViewState::IsVisibleOrOccluded && m_pageClient.isViewVisibleOrOccluded())
</span><span class="cx"> m_viewState |= ViewState::IsVisibleOrOccluded;
</span><del>- if (flagsToUpdate & ViewState::IsInWindow && m_pageClient.isViewInWindow())
</del><ins>+ if (flagsToUpdate & ViewState::IsInWindow && m_pageClient.isViewInWindow()) {
</ins><span class="cx"> m_viewState |= ViewState::IsInWindow;
</span><ins>+ m_viewWasEverInWindow = true;
+ }
</ins><span class="cx"> if (flagsToUpdate & ViewState::IsVisuallyIdle && m_pageClient.isVisuallyIdle())
</span><span class="cx"> m_viewState |= ViewState::IsVisuallyIdle;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebPageProxy::viewStateDidChange(ViewState::Flags mayHaveChanged, WantsReplyOrNot wantsReply)
</del><ins>+void WebPageProxy::viewStateDidChange(ViewState::Flags mayHaveChanged)
</ins><span class="cx"> {
</span><ins>+ bool isNewlyInWindow = !isInWindow() && (mayHaveChanged & ViewState::IsInWindow) && m_pageClient.isViewInWindow();
+
</ins><span class="cx"> m_potentiallyChangedViewStateFlags |= mayHaveChanged;
</span><del>- m_viewStateChangeWantsReply = (wantsReply == WantsReplyOrNot::DoesWantReply || m_viewStateChangeWantsReply == WantsReplyOrNot::DoesWantReply) ? WantsReplyOrNot::DoesWantReply : WantsReplyOrNot::DoesNotWantReply;
</del><ins>+ m_viewStateChangeWantsReply = ((m_viewWasEverInWindow && isNewlyInWindow) || m_viewStateChangeWantsReply == WantsReplyOrNot::DoesWantReply) ? WantsReplyOrNot::DoesWantReply : WantsReplyOrNot::DoesNotWantReply;
</ins><span class="cx">
</span><span class="cx"> #if PLATFORM(COCOA)
</span><del>- bool isNewlyInWindow = !(m_viewState & ViewState::IsInWindow) && (mayHaveChanged & ViewState::IsInWindow) && m_pageClient.isViewInWindow();
</del><span class="cx"> if (isNewlyInWindow) {
</span><span class="cx"> dispatchViewStateChange();
</span><span class="cx"> return;
</span><span class="lines">@@ -1174,6 +1177,9 @@
</span><span class="cx">
</span><span class="cx"> updateBackingStoreDiscardableState();
</span><span class="cx">
</span><ins>+ if (m_viewStateChangeWantsReply == WantsReplyOrNot::DoesWantReply)
+ waitForDidUpdateViewState();
+
</ins><span class="cx"> m_potentiallyChangedViewStateFlags = ViewState::NoFlags;
</span><span class="cx"> m_viewStateChangeWantsReply = WantsReplyOrNot::DoesNotWantReply;
</span><span class="cx"> }
</span><span class="lines">@@ -1203,19 +1209,19 @@
</span><span class="cx">
</span><span class="cx"> void WebPageProxy::waitForDidUpdateViewState()
</span><span class="cx"> {
</span><ins>+ if (!isValid())
+ return;
+
+ if (m_process->state() != WebProcessProxy::State::Running)
+ return;
+
</ins><span class="cx"> // If we have previously timed out with no response from the WebProcess, don't block the UIProcess again until it starts responding.
</span><span class="cx"> if (m_waitingForDidUpdateViewState)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- if (!isValid())
- return;
-
</del><span class="cx"> m_waitingForDidUpdateViewState = true;
</span><span class="cx">
</span><del>- if (m_process->state() != WebProcessProxy::State::Launching) {
- auto viewStateUpdateTimeout = std::chrono::milliseconds(250);
- m_process->connection()->waitForAndDispatchImmediately<Messages::WebPageProxy::DidUpdateViewState>(m_pageID, viewStateUpdateTimeout);
- }
</del><ins>+ m_drawingArea->waitForDidUpdateViewState();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> IntSize WebPageProxy::viewSize() const
</span><span class="lines">@@ -4295,7 +4301,6 @@
</span><span class="cx">
</span><span class="cx"> m_isValid = false;
</span><span class="cx"> m_isPageSuspended = false;
</span><del>- m_waitingForDidUpdateViewState = false;
</del><span class="cx">
</span><span class="cx"> if (m_mainFrame) {
</span><span class="cx"> m_urlAtProcessExit = m_mainFrame->url();
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebPageProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.h (170318 => 170319)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPageProxy.h 2014-06-23 21:27:59 UTC (rev 170318)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.h 2014-06-23 21:32:03 UTC (rev 170319)
</span><span class="lines">@@ -361,9 +361,10 @@
</span><span class="cx"> bool delegatesScrolling() const { return m_delegatesScrolling; }
</span><span class="cx">
</span><span class="cx"> enum class WantsReplyOrNot { DoesNotWantReply, DoesWantReply };
</span><del>- void viewStateDidChange(WebCore::ViewState::Flags mayHaveChanged, WantsReplyOrNot = WantsReplyOrNot::DoesNotWantReply);
</del><ins>+ void viewStateDidChange(WebCore::ViewState::Flags mayHaveChanged);
</ins><span class="cx"> bool isInWindow() const { return m_viewState & WebCore::ViewState::IsInWindow; }
</span><span class="cx"> void waitForDidUpdateViewState();
</span><ins>+ void didUpdateViewState() { m_waitingForDidUpdateViewState = false; }
</ins><span class="cx">
</span><span class="cx"> void layerHostingModeDidChange();
</span><span class="cx">
</span><span class="lines">@@ -575,8 +576,6 @@
</span><span class="cx">
</span><span class="cx"> void listenForLayoutMilestones(WebCore::LayoutMilestones);
</span><span class="cx">
</span><del>- void didUpdateViewState() { m_waitingForDidUpdateViewState = false; }
-
</del><span class="cx"> bool hasHorizontalScrollbar() const { return m_mainFrameHasHorizontalScrollbar; }
</span><span class="cx"> bool hasVerticalScrollbar() const { return m_mainFrameHasVerticalScrollbar; }
</span><span class="cx">
</span><span class="lines">@@ -1321,6 +1320,7 @@
</span><span class="cx"> NotificationPermissionRequestManagerProxy m_notificationPermissionRequestManager;
</span><span class="cx">
</span><span class="cx"> WebCore::ViewState::Flags m_viewState;
</span><ins>+ bool m_viewWasEverInWindow;
</ins><span class="cx">
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> std::unique_ptr<ProcessThrottler::ForegroundActivityToken> m_activityToken;
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessmacRemoteLayerTreeDrawingAreaProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/mac/RemoteLayerTreeDrawingAreaProxy.h (170318 => 170319)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/mac/RemoteLayerTreeDrawingAreaProxy.h 2014-06-23 21:27:59 UTC (rev 170318)
+++ trunk/Source/WebKit2/UIProcess/mac/RemoteLayerTreeDrawingAreaProxy.h 2014-06-23 21:32:03 UTC (rev 170319)
</span><span class="lines">@@ -67,6 +67,8 @@
</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>+
+ virtual void waitForDidUpdateViewState() override;
</ins><span class="cx">
</span><span class="cx"> WebCore::FloatPoint indicatorLocation() const;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessmacRemoteLayerTreeDrawingAreaProxymm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/mac/RemoteLayerTreeDrawingAreaProxy.mm (170318 => 170319)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/mac/RemoteLayerTreeDrawingAreaProxy.mm 2014-06-23 21:27:59 UTC (rev 170318)
+++ trunk/Source/WebKit2/UIProcess/mac/RemoteLayerTreeDrawingAreaProxy.mm 2014-06-23 21:32:03 UTC (rev 170319)
</span><span class="lines">@@ -37,6 +37,7 @@
</span><span class="cx"> #import <WebCore/IOSurfacePool.h>
</span><span class="cx"> #import <WebCore/WebActionDisablingCALayerDelegate.h>
</span><span class="cx">
</span><ins>+using namespace IPC;
</ins><span class="cx"> using namespace WebCore;
</span><span class="cx">
</span><span class="cx"> static const CFIndex didCommitLayersRunLoopOrder = (CFIndex)RunLoopObserver::WellKnownRunLoopOrders::CoreAnimationCommit + 1;
</span><span class="lines">@@ -317,6 +318,18 @@
</span><span class="cx"> m_webPageProxy->process().send(Messages::DrawingArea::DidUpdate(), m_webPageProxy->pageID());
</span><span class="cx">
</span><span class="cx"> m_lastVisibleTransactionID = m_transactionIDForPendingCACommit;
</span><ins>+
+ m_webPageProxy->didUpdateViewState();
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+void RemoteLayerTreeDrawingAreaProxy::waitForDidUpdateViewState()
+{
+#if PLATFORM(IOS)
+ auto viewStateUpdateTimeout = std::chrono::milliseconds(500);
+#else
+ auto viewStateUpdateTimeout = std::chrono::milliseconds(250);
+#endif
+ m_webPageProxy->process().connection()->waitForAndDispatchImmediately<Messages::RemoteLayerTreeDrawingAreaProxy::CommitLayerTree>(m_webPageProxy->pageID(), viewStateUpdateTimeout, InterruptWaitingIfSyncMessageArrives);
+}
+
</ins><span class="cx"> } // namespace WebKit
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessmacTiledCoreAnimationDrawingAreaProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/mac/TiledCoreAnimationDrawingAreaProxy.h (170318 => 170319)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/mac/TiledCoreAnimationDrawingAreaProxy.h 2014-06-23 21:27:59 UTC (rev 170318)
+++ trunk/Source/WebKit2/UIProcess/mac/TiledCoreAnimationDrawingAreaProxy.h 2014-06-23 21:32:03 UTC (rev 170319)
</span><span class="lines">@@ -52,6 +52,8 @@
</span><span class="cx"> virtual void adjustTransientZoom(double scale, WebCore::FloatPoint origin) override;
</span><span class="cx"> virtual void commitTransientZoom(double scale, WebCore::FloatPoint origin) override;
</span><span class="cx">
</span><ins>+ virtual void waitForDidUpdateViewState() override;
+
</ins><span class="cx"> // Message handlers.
</span><span class="cx"> virtual void didUpdateGeometry() override;
</span><span class="cx"> virtual void intrinsicContentSizeDidChange(const WebCore::IntSize& newIntrinsicContentSize) override;
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessmacTiledCoreAnimationDrawingAreaProxymm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/mac/TiledCoreAnimationDrawingAreaProxy.mm (170318 => 170319)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/mac/TiledCoreAnimationDrawingAreaProxy.mm 2014-06-23 21:27:59 UTC (rev 170318)
+++ trunk/Source/WebKit2/UIProcess/mac/TiledCoreAnimationDrawingAreaProxy.mm 2014-06-23 21:32:03 UTC (rev 170319)
</span><span class="lines">@@ -35,6 +35,7 @@
</span><span class="cx"> #import "WebPageProxy.h"
</span><span class="cx"> #import "WebProcessProxy.h"
</span><span class="cx">
</span><ins>+using namespace IPC;
</ins><span class="cx"> using namespace WebCore;
</span><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><span class="lines">@@ -126,6 +127,12 @@
</span><span class="cx"> sendUpdateGeometry();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void TiledCoreAnimationDrawingAreaProxy::waitForDidUpdateViewState()
+{
+ auto viewStateUpdateTimeout = std::chrono::milliseconds(250);
+ m_webPageProxy->process().connection()->waitForAndDispatchImmediately<Messages::WebPageProxy::DidUpdateViewState>(m_webPageProxy->pageID(), viewStateUpdateTimeout, InterruptWaitingIfSyncMessageArrives);
+}
+
</ins><span class="cx"> void TiledCoreAnimationDrawingAreaProxy::intrinsicContentSizeDidChange(const IntSize& newIntrinsicContentSize)
</span><span class="cx"> {
</span><span class="cx"> if (m_webPageProxy->minimumLayoutSize().width() > 0)
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageDrawingAreah"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/DrawingArea.h (170318 => 170319)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/DrawingArea.h 2014-06-23 21:27:59 UTC (rev 170318)
+++ trunk/Source/WebKit2/WebProcess/WebPage/DrawingArea.h 2014-06-23 21:32:03 UTC (rev 170319)
</span><span class="lines">@@ -114,7 +114,7 @@
</span><span class="cx">
</span><span class="cx"> virtual void dispatchAfterEnsuringUpdatedScrollPosition(std::function<void ()>);
</span><span class="cx">
</span><del>- virtual void viewStateDidChange(WebCore::ViewState::Flags) { }
</del><ins>+ virtual void viewStateDidChange(WebCore::ViewState::Flags, bool wantsDidUpdateViewState) { }
</ins><span class="cx"> virtual void setLayerHostingMode(LayerHostingMode) { }
</span><span class="cx">
</span><span class="cx"> virtual bool markLayersVolatileImmediatelyIfPossible() { return true; }
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageWebPagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp (170318 => 170319)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2014-06-23 21:27:59 UTC (rev 170318)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2014-06-23 21:32:03 UTC (rev 170319)
</span><span class="lines">@@ -266,7 +266,6 @@
</span><span class="cx"> , m_accessibilityObject(0)
</span><span class="cx"> #endif
</span><span class="cx"> , m_setCanStartMediaTimer(RunLoop::main(), this, &WebPage::setCanStartMediaTimerFired)
</span><del>- , m_sendDidUpdateViewStateTimer(RunLoop::main(), this, &WebPage::didUpdateViewStateTimerFired)
</del><span class="cx"> , m_formClient(std::make_unique<API::InjectedBundle::FormClient>())
</span><span class="cx"> , m_uiClient(std::make_unique<API::InjectedBundle::PageUIClient>())
</span><span class="cx"> , m_findController(this)
</span><span class="lines">@@ -2174,13 +2173,6 @@
</span><span class="cx"> m_page->setCanStartMedia(true);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if !PLATFORM(MAC)
-void WebPage::didUpdateViewStateTimerFired()
-{
- send(Messages::WebPageProxy::DidUpdateViewState());
-}
-#endif
-
</del><span class="cx"> inline bool WebPage::canHandleUserEvents() const
</span><span class="cx"> {
</span><span class="cx"> #if USE(TILED_BACKING_STORE)
</span><span class="lines">@@ -2220,16 +2212,14 @@
</span><span class="cx"> ViewState::Flags changed = m_viewState ^ viewState;
</span><span class="cx"> m_viewState = viewState;
</span><span class="cx">
</span><del>- m_drawingArea->viewStateDidChange(changed);
</del><span class="cx"> m_page->setViewState(viewState);
</span><span class="cx"> for (auto* pluginView : m_pluginViews)
</span><span class="cx"> pluginView->viewStateDidChange(changed);
</span><span class="cx">
</span><ins>+ m_drawingArea->viewStateDidChange(changed, wantsDidUpdateViewState);
+
</ins><span class="cx"> if (changed & ViewState::IsInWindow)
</span><span class="cx"> updateIsInWindow();
</span><del>-
- if (wantsDidUpdateViewState)
- m_sendDidUpdateViewStateTimer.startOneShot(0);
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebPage::setLayerHostingMode(unsigned layerHostingMode)
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageWebPageh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h (170318 => 170319)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h 2014-06-23 21:27:59 UTC (rev 170318)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h 2014-06-23 21:32:03 UTC (rev 170319)
</span><span class="lines">@@ -1024,7 +1024,6 @@
</span><span class="cx">
</span><span class="cx"> void changeSelectedIndex(int32_t index);
</span><span class="cx"> void setCanStartMediaTimerFired();
</span><del>- void didUpdateViewStateTimerFired();
</del><span class="cx">
</span><span class="cx"> bool canHandleUserEvents() const;
</span><span class="cx">
</span><span class="lines">@@ -1128,7 +1127,6 @@
</span><span class="cx"> #endif // !PLATFORM(IOS)
</span><span class="cx">
</span><span class="cx"> RunLoop::Timer<WebPage> m_setCanStartMediaTimer;
</span><del>- RunLoop::Timer<WebPage> m_sendDidUpdateViewStateTimer;
</del><span class="cx"> bool m_mayStartMediaWhenInWindow;
</span><span class="cx">
</span><span class="cx"> HashMap<uint64_t, RefPtr<WebUndoStep>> m_undoStepMap;
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPagemacRemoteLayerTreeDrawingAreah"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/mac/RemoteLayerTreeDrawingArea.h (170318 => 170319)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/mac/RemoteLayerTreeDrawingArea.h 2014-06-23 21:27:59 UTC (rev 170318)
+++ trunk/Source/WebKit2/WebProcess/WebPage/mac/RemoteLayerTreeDrawingArea.h 2014-06-23 21:32:03 UTC (rev 170319)
</span><span class="lines">@@ -95,6 +95,8 @@
</span><span class="cx">
</span><span class="cx"> virtual void mainFrameContentSizeChanged(const WebCore::IntSize&) override;
</span><span class="cx">
</span><ins>+ virtual void viewStateDidChange(WebCore::ViewState::Flags changed, bool wantsDidUpdateViewState) override;
+
</ins><span class="cx"> // GraphicsLayerClient
</span><span class="cx"> virtual void notifyAnimationStarted(const WebCore::GraphicsLayer*, double time) override { }
</span><span class="cx"> virtual void notifyFlushRequired(const WebCore::GraphicsLayer*) override { }
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPagemacRemoteLayerTreeDrawingAreamm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/mac/RemoteLayerTreeDrawingArea.mm (170318 => 170319)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/mac/RemoteLayerTreeDrawingArea.mm 2014-06-23 21:27:59 UTC (rev 170318)
+++ trunk/Source/WebKit2/WebProcess/WebPage/mac/RemoteLayerTreeDrawingArea.mm 2014-06-23 21:32:03 UTC (rev 170319)
</span><span class="lines">@@ -384,4 +384,9 @@
</span><span class="cx"> m_connection->sendMessage(std::move(m_commitEncoder));
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void RemoteLayerTreeDrawingArea::viewStateDidChange(ViewState::Flags, bool wantsDidUpdateViewState)
+{
+ // FIXME: Should we suspend painting while not visible, like TiledCoreAnimationDrawingArea? Probably.
+}
+
</ins><span class="cx"> } // namespace WebKit
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPagemacTiledCoreAnimationDrawingAreah"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.h (170318 => 170319)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.h 2014-06-23 21:27:59 UTC (rev 170318)
+++ trunk/Source/WebKit2/WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.h 2014-06-23 21:32:03 UTC (rev 170319)
</span><span class="lines">@@ -36,6 +36,7 @@
</span><span class="cx"> #include <WebCore/TransformationMatrix.h>
</span><span class="cx"> #include <wtf/HashMap.h>
</span><span class="cx"> #include <wtf/RetainPtr.h>
</span><ins>+#include <wtf/RunLoop.h>
</ins><span class="cx">
</span><span class="cx"> OBJC_CLASS CALayer;
</span><span class="cx">
</span><span class="lines">@@ -54,8 +55,6 @@
</span><span class="cx"> TiledCoreAnimationDrawingArea(WebPage&, const WebPageCreationParameters&);
</span><span class="cx"> virtual ~TiledCoreAnimationDrawingArea();
</span><span class="cx">
</span><del>- virtual void viewStateDidChange(WebCore::ViewState::Flags changed) override;
-
</del><span class="cx"> private:
</span><span class="cx"> // DrawingArea
</span><span class="cx"> virtual void setNeedsDisplay() override;
</span><span class="lines">@@ -81,6 +80,9 @@
</span><span class="cx">
</span><span class="cx"> virtual bool shouldUseTiledBackingForFrameView(const WebCore::FrameView*) override;
</span><span class="cx">
</span><ins>+ virtual void viewStateDidChange(WebCore::ViewState::Flags changed, bool wantsDidUpdateViewState) override;
+ void didUpdateViewStateTimerFired();
+
</ins><span class="cx"> // WebCore::LayerFlushSchedulerClient
</span><span class="cx"> virtual bool flushLayers() override;
</span><span class="cx">
</span><span class="lines">@@ -136,6 +138,8 @@
</span><span class="cx"> WebCore::FloatPoint m_transientZoomOrigin;
</span><span class="cx">
</span><span class="cx"> WebCore::TransformationMatrix m_transform;
</span><ins>+
+ RunLoop::Timer<TiledCoreAnimationDrawingArea> m_sendDidUpdateViewStateTimer;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> DRAWING_AREA_TYPE_CASTS(TiledCoreAnimationDrawingArea, type() == DrawingAreaTypeTiledCoreAnimation);
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPagemacTiledCoreAnimationDrawingAreamm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.mm (170318 => 170319)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.mm 2014-06-23 21:27:59 UTC (rev 170318)
+++ trunk/Source/WebKit2/WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.mm 2014-06-23 21:32:03 UTC (rev 170319)
</span><span class="lines">@@ -75,6 +75,7 @@
</span><span class="cx"> , m_exposedRect(FloatRect::infiniteRect())
</span><span class="cx"> , m_scrolledExposedRect(FloatRect::infiniteRect())
</span><span class="cx"> , m_transientZoomScale(1)
</span><ins>+ , m_sendDidUpdateViewStateTimer(RunLoop::main(), this, &TiledCoreAnimationDrawingArea::didUpdateViewStateTimerFired)
</ins><span class="cx"> {
</span><span class="cx"> m_webPage.corePage()->settings().setForceCompositingMode(true);
</span><span class="cx">
</span><span class="lines">@@ -294,7 +295,7 @@
</span><span class="cx"> return returnValue;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void TiledCoreAnimationDrawingArea::viewStateDidChange(ViewState::Flags changed)
</del><ins>+void TiledCoreAnimationDrawingArea::viewStateDidChange(ViewState::Flags changed, bool wantsDidUpdateViewState)
</ins><span class="cx"> {
</span><span class="cx"> if (changed & ViewState::IsVisible) {
</span><span class="cx"> if (m_webPage.isVisible())
</span><span class="lines">@@ -302,8 +303,17 @@
</span><span class="cx"> else
</span><span class="cx"> suspendPainting();
</span><span class="cx"> }
</span><ins>+
+ if (wantsDidUpdateViewState)
+ m_sendDidUpdateViewStateTimer.startOneShot(0);
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+void TiledCoreAnimationDrawingArea::didUpdateViewStateTimerFired()
+{
+ [CATransaction flush];
+ m_webPage.send(Messages::WebPageProxy::DidUpdateViewState());
+}
+
</ins><span class="cx"> void TiledCoreAnimationDrawingArea::suspendPainting()
</span><span class="cx"> {
</span><span class="cx"> ASSERT(!m_isPaintingSuspended);
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPagemacWebPageMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/mac/WebPageMac.mm (170318 => 170319)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/mac/WebPageMac.mm 2014-06-23 21:27:59 UTC (rev 170318)
+++ trunk/Source/WebKit2/WebProcess/WebPage/mac/WebPageMac.mm 2014-06-23 21:32:03 UTC (rev 170319)
</span><span class="lines">@@ -989,12 +989,6 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebPage::didUpdateViewStateTimerFired()
-{
- [CATransaction flush];
- send(Messages::WebPageProxy::DidUpdateViewState());
-}
-
</del><span class="cx"> #if ENABLE(WEBGL)
</span><span class="cx"> WebCore::WebGLLoadPolicy WebPage::webGLPolicyForURL(WebFrame* frame, const String& url)
</span><span class="cx"> {
</span></span></pre>
</div>
</div>
</body>
</html>