Title: [228167] branches/safari-605-branch/Source/WebKit
- Revision
- 228167
- Author
- [email protected]
- Date
- 2018-02-06 07:16:37 -0800 (Tue, 06 Feb 2018)
Log Message
Cherry-pick r228125. rdar://problem/37264500
Modified Paths
Diff
Modified: branches/safari-605-branch/Source/WebKit/ChangeLog (228166 => 228167)
--- branches/safari-605-branch/Source/WebKit/ChangeLog 2018-02-06 15:16:34 UTC (rev 228166)
+++ branches/safari-605-branch/Source/WebKit/ChangeLog 2018-02-06 15:16:37 UTC (rev 228167)
@@ -1,5 +1,25 @@
2018-02-06 Jason Marcell <[email protected]>
+ Cherry-pick r228125. rdar://problem/37264500
+
+ 2018-02-05 Ryosuke Niwa <[email protected]>
+
+ 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-06 Jason Marcell <[email protected]>
+
Cherry-pick r228116. rdar://problem/37264514
2018-02-05 Youenn Fablet <[email protected]>
Modified: branches/safari-605-branch/Source/WebKit/WebProcess/Plugins/WebPluginInfoProvider.cpp (228166 => 228167)
--- branches/safari-605-branch/Source/WebKit/WebProcess/Plugins/WebPluginInfoProvider.cpp 2018-02-06 15:16:34 UTC (rev 228166)
+++ branches/safari-605-branch/Source/WebKit/WebProcess/Plugins/WebPluginInfoProvider.cpp 2018-02-06 15:16:37 UTC (rev 228167)
@@ -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: branches/safari-605-branch/Source/WebKit/WebProcess/WebPage/WebPage.cpp (228166 => 228167)
--- branches/safari-605-branch/Source/WebKit/WebProcess/WebPage/WebPage.cpp 2018-02-06 15:16:34 UTC (rev 228166)
+++ branches/safari-605-branch/Source/WebKit/WebProcess/WebPage/WebPage.cpp 2018-02-06 15:16:37 UTC (rev 228167)
@@ -2889,7 +2889,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
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
