Title: [232340] tags/Safari-606.1.19/Source/WebKit
- Revision
- 232340
- Author
- [email protected]
- Date
- 2018-05-30 23:51:34 -0700 (Wed, 30 May 2018)
Log Message
Cherry-pick r232307. rdar://problem/40651225
Take a background process assertion in WebPageProxy::callAfterNextPresentationUpdate()
https://bugs.webkit.org/show_bug.cgi?id=186097
<rdar://problem/40651225>
Reviewed by Dan Bernstein.
Refactor fix landed in r232298 so that we rely on the existing Callback infrastructure
to take a background process assertion.
* UIProcess/RemoteLayerTree/RemoteLayerTreeDrawingAreaProxy.mm:
(WebKit::RemoteLayerTreeDrawingAreaProxy::dispatchAfterEnsuringDrawing):
* UIProcess/WebPageProxy.cpp:
(WebKit::WebPageProxy::callAfterNextPresentationUpdate):
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@232307 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Modified Paths
Diff
Modified: tags/Safari-606.1.19/Source/WebKit/ChangeLog (232339 => 232340)
--- tags/Safari-606.1.19/Source/WebKit/ChangeLog 2018-05-31 06:51:32 UTC (rev 232339)
+++ tags/Safari-606.1.19/Source/WebKit/ChangeLog 2018-05-31 06:51:34 UTC (rev 232340)
@@ -1,5 +1,42 @@
2018-05-30 Kocsen Chung <[email protected]>
+ Cherry-pick r232307. rdar://problem/40651225
+
+ Take a background process assertion in WebPageProxy::callAfterNextPresentationUpdate()
+ https://bugs.webkit.org/show_bug.cgi?id=186097
+ <rdar://problem/40651225>
+
+ Reviewed by Dan Bernstein.
+
+ Refactor fix landed in r232298 so that we rely on the existing Callback infrastructure
+ to take a background process assertion.
+
+ * UIProcess/RemoteLayerTree/RemoteLayerTreeDrawingAreaProxy.mm:
+ (WebKit::RemoteLayerTreeDrawingAreaProxy::dispatchAfterEnsuringDrawing):
+ * UIProcess/WebPageProxy.cpp:
+ (WebKit::WebPageProxy::callAfterNextPresentationUpdate):
+
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@232307 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2018-05-30 Chris Dumez <[email protected]>
+
+ Take a background process assertion in WebPageProxy::callAfterNextPresentationUpdate()
+ https://bugs.webkit.org/show_bug.cgi?id=186097
+ <rdar://problem/40651225>
+
+ Reviewed by Dan Bernstein.
+
+ Refactor fix landed in r232298 so that we rely on the existing Callback infrastructure
+ to take a background process assertion.
+
+ * UIProcess/RemoteLayerTree/RemoteLayerTreeDrawingAreaProxy.mm:
+ (WebKit::RemoteLayerTreeDrawingAreaProxy::dispatchAfterEnsuringDrawing):
+ * UIProcess/WebPageProxy.cpp:
+ (WebKit::WebPageProxy::callAfterNextPresentationUpdate):
+
+2018-05-30 Kocsen Chung <[email protected]>
+
Cherry-pick r232298. rdar://problem/40651225
Take a background process assertion in WebPageProxy::callAfterNextPresentationUpdate()
Modified: tags/Safari-606.1.19/Source/WebKit/UIProcess/RemoteLayerTree/RemoteLayerTreeDrawingAreaProxy.mm (232339 => 232340)
--- tags/Safari-606.1.19/Source/WebKit/UIProcess/RemoteLayerTree/RemoteLayerTreeDrawingAreaProxy.mm 2018-05-31 06:51:32 UTC (rev 232339)
+++ tags/Safari-606.1.19/Source/WebKit/UIProcess/RemoteLayerTree/RemoteLayerTreeDrawingAreaProxy.mm 2018-05-31 06:51:34 UTC (rev 232340)
@@ -456,7 +456,7 @@
return;
}
- m_webPageProxy.process().send(Messages::DrawingArea::AddTransactionCallbackID(m_callbacks.put(WTFMove(callbackFunction), nullptr)), m_webPageProxy.pageID());
+ m_webPageProxy.process().send(Messages::DrawingArea::AddTransactionCallbackID(m_callbacks.put(WTFMove(callbackFunction), m_webPageProxy.process().throttler().backgroundActivityToken())), m_webPageProxy.pageID());
}
void RemoteLayerTreeDrawingAreaProxy::hideContentUntilPendingUpdate()
Modified: tags/Safari-606.1.19/Source/WebKit/UIProcess/WebPageProxy.cpp (232339 => 232340)
--- tags/Safari-606.1.19/Source/WebKit/UIProcess/WebPageProxy.cpp 2018-05-31 06:51:32 UTC (rev 232339)
+++ tags/Safari-606.1.19/Source/WebKit/UIProcess/WebPageProxy.cpp 2018-05-31 06:51:34 UTC (rev 232340)
@@ -7351,9 +7351,7 @@
return;
}
- m_drawingArea->dispatchAfterEnsuringDrawing([callback = WTFMove(callback), backgroundActivity = m_process->throttler().backgroundActivityToken()](CallbackBase::Error error) {
- callback(error);
- });
+ m_drawingArea->dispatchAfterEnsuringDrawing(WTFMove(callback));
}
void WebPageProxy::setShouldScaleViewToFitDocument(bool shouldScaleViewToFitDocument)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
