Title: [228625] releases/WebKitGTK/webkit-2.20/Source/WebKit
- Revision
- 228625
- Author
- carlo...@webkit.org
- Date
- 2018-02-19 01:32:40 -0800 (Mon, 19 Feb 2018)
Log Message
Merge r228125 - Add DoNotProcessIncomingMessagesWhenWaitingForSyncReply to GetPlugins and RootViewToScreen
https://bugs.webkit.org/show_bug.cgi?id=182458
Reviewed by Chris Dumez.
Added DoNotProcessIncomingMessagesWhenWaitingForSyncReply to GetPlugins and RootViewToScreen
which are found to get sent from WebContent process while ScriptDisallowedScope is present
by a work-in-progress patch on webkit.org/b/182449.
* WebProcess/Plugins/WebPluginInfoProvider.cpp:
(WebKit::WebPluginInfoProvider::populatePluginCache):
* WebProcess/WebPage/WebPage.cpp:
(WebKit::WebPage::rootViewToScreen):
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.20/Source/WebKit/ChangeLog (228624 => 228625)
--- releases/WebKitGTK/webkit-2.20/Source/WebKit/ChangeLog 2018-02-19 09:32:34 UTC (rev 228624)
+++ releases/WebKitGTK/webkit-2.20/Source/WebKit/ChangeLog 2018-02-19 09:32:40 UTC (rev 228625)
@@ -1,3 +1,19 @@
+2018-02-05 Ryosuke Niwa <rn...@webkit.org>
+
+ Add DoNotProcessIncomingMessagesWhenWaitingForSyncReply to GetPlugins and RootViewToScreen
+ https://bugs.webkit.org/show_bug.cgi?id=182458
+
+ Reviewed by Chris Dumez.
+
+ Added DoNotProcessIncomingMessagesWhenWaitingForSyncReply to GetPlugins and RootViewToScreen
+ which are found to get sent from WebContent process while ScriptDisallowedScope is present
+ by a work-in-progress patch on webkit.org/b/182449.
+
+ * WebProcess/Plugins/WebPluginInfoProvider.cpp:
+ (WebKit::WebPluginInfoProvider::populatePluginCache):
+ * WebProcess/WebPage/WebPage.cpp:
+ (WebKit::WebPage::rootViewToScreen):
+
2018-02-05 John Wilander <wilan...@apple.com>
Storage Access API: Add testRunner.getAllStorageAccessEntries() to make testing easier and more explicit
Modified: releases/WebKitGTK/webkit-2.20/Source/WebKit/WebProcess/Plugins/WebPluginInfoProvider.cpp (228624 => 228625)
--- releases/WebKitGTK/webkit-2.20/Source/WebKit/WebProcess/Plugins/WebPluginInfoProvider.cpp 2018-02-19 09:32:34 UTC (rev 228624)
+++ releases/WebKitGTK/webkit-2.20/Source/WebKit/WebProcess/Plugins/WebPluginInfoProvider.cpp 2018-02-19 09:32:40 UTC (rev 228625)
@@ -145,7 +145,9 @@
if (!m_pluginCacheIsPopulated) {
HangDetectionDisabler hangDetectionDisabler;
- if (!WebProcess::singleton().parentProcessConnection()->sendSync(Messages::WebProcessProxy::GetPlugins(m_shouldRefreshPlugins), Messages::WebProcessProxy::GetPlugins::Reply(m_cachedPlugins, m_cachedApplicationPlugins), 0))
+ if (!WebProcess::singleton().parentProcessConnection()->sendSync(Messages::WebProcessProxy::GetPlugins(m_shouldRefreshPlugins),
+ Messages::WebProcessProxy::GetPlugins::Reply(m_cachedPlugins, m_cachedApplicationPlugins), 0,
+ Seconds::infinity(), IPC::SendSyncOption::DoNotProcessIncomingMessagesWhenWaitingForSyncReply))
return;
m_shouldRefreshPlugins = false;
Modified: releases/WebKitGTK/webkit-2.20/Source/WebKit/WebProcess/WebPage/WebPage.cpp (228624 => 228625)
--- releases/WebKitGTK/webkit-2.20/Source/WebKit/WebProcess/WebPage/WebPage.cpp 2018-02-19 09:32:34 UTC (rev 228624)
+++ releases/WebKitGTK/webkit-2.20/Source/WebKit/WebProcess/WebPage/WebPage.cpp 2018-02-19 09:32:40 UTC (rev 228625)
@@ -2890,7 +2890,7 @@
IntRect WebPage::rootViewToScreen(const IntRect& rect)
{
IntRect screenRect;
- sendSync(Messages::WebPageProxy::RootViewToScreen(rect), Messages::WebPageProxy::RootViewToScreen::Reply(screenRect));
+ sendSync(Messages::WebPageProxy::RootViewToScreen(rect), Messages::WebPageProxy::RootViewToScreen::Reply(screenRect), Seconds::infinity(), IPC::SendSyncOption::DoNotProcessIncomingMessagesWhenWaitingForSyncReply);
return screenRect;
}
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
