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): Canonical link: https://commits.webkit.org/198304@main git-svn-id: https://svn.webkit.org/repository/webkit/trunk@228125 268f45cc-cd09-0410-ab3c-d52691b4dbfc
WebKit · Feb 5, 2018 · 63262d4b3d2c297fa59c077dfa7b9a2bc60c1deb · 63262d4
1 parent d07b31d
commit 63262d4b3d2c297fa59c077dfa7b9a2bc60c1deb
Showing with 20 additions and 2 deletions.

+16 −0 Source/WebKit/ChangeLog

+3 −1 Source/WebKit/WebProcess/Plugins/WebPluginInfoProvider.cpp

+1 −1 Source/WebKit/WebProcess/WebPage/WebPage.cpp
diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
@@ -1,3 +1,19 @@
+2018-02-05  Ryosuke Niwa  <rniwa@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  Commit Queue  <commit-queue@webkit.org>
 
         Unreviewed, rolling out r227964 and r228087.

diff --git a/Source/WebKit/WebProcess/Plugins/WebPluginInfoProvider.cpp b/Source/WebKit/WebProcess/Plugins/WebPluginInfoProvider.cpp
@@ -145,7 +145,9 @@ void WebPluginInfoProvider::populatePluginCache(const WebCore::Page& page)
     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;

diff --git a/Source/WebKit/WebProcess/WebPage/WebPage.cpp b/Source/WebKit/WebProcess/WebPage/WebPage.cpp
@@ -2890,7 +2890,7 @@ IntPoint WebPage::screenToRootView(const IntPoint& point)
 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;
 }