Title: [233965] branches/safari-606-branch/Source/WebKit
- Revision
- 233965
- Author
- [email protected]
- Date
- 2018-07-18 19:00:37 -0700 (Wed, 18 Jul 2018)
Log Message
Cherry-pick r233904. rdar://problem/42345140
RELEASE_ASSERT() under IPC::Connection::sendSync() from PluginProxy::supportsSnapshotting()
https://bugs.webkit.org/show_bug.cgi?id=187740
<rdar://problem/41818955>
Reviewed by Youenn Fablet.
As per the crash trace, PluginProxy::supportsSnapshotting() can be called during layout but does synchronous
IPC. As a result, we need to prevent WebCore re-entrancy by using DoNotProcessIncomingMessagesWhenWaitingForSyncReply
sendOption.
* WebProcess/Plugins/PluginProxy.cpp:
(WebKit::PluginProxy::supportsSnapshotting const):
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@233904 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Modified Paths
Diff
Modified: branches/safari-606-branch/Source/WebKit/ChangeLog (233964 => 233965)
--- branches/safari-606-branch/Source/WebKit/ChangeLog 2018-07-19 02:00:35 UTC (rev 233964)
+++ branches/safari-606-branch/Source/WebKit/ChangeLog 2018-07-19 02:00:37 UTC (rev 233965)
@@ -1,5 +1,40 @@
2018-07-18 Babak Shafiei <[email protected]>
+ Cherry-pick r233904. rdar://problem/42345140
+
+ RELEASE_ASSERT() under IPC::Connection::sendSync() from PluginProxy::supportsSnapshotting()
+ https://bugs.webkit.org/show_bug.cgi?id=187740
+ <rdar://problem/41818955>
+
+ Reviewed by Youenn Fablet.
+
+ As per the crash trace, PluginProxy::supportsSnapshotting() can be called during layout but does synchronous
+ IPC. As a result, we need to prevent WebCore re-entrancy by using DoNotProcessIncomingMessagesWhenWaitingForSyncReply
+ sendOption.
+
+ * WebProcess/Plugins/PluginProxy.cpp:
+ (WebKit::PluginProxy::supportsSnapshotting const):
+
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@233904 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2018-07-17 Chris Dumez <[email protected]>
+
+ RELEASE_ASSERT() under IPC::Connection::sendSync() from PluginProxy::supportsSnapshotting()
+ https://bugs.webkit.org/show_bug.cgi?id=187740
+ <rdar://problem/41818955>
+
+ Reviewed by Youenn Fablet.
+
+ As per the crash trace, PluginProxy::supportsSnapshotting() can be called during layout but does synchronous
+ IPC. As a result, we need to prevent WebCore re-entrancy by using DoNotProcessIncomingMessagesWhenWaitingForSyncReply
+ sendOption.
+
+ * WebProcess/Plugins/PluginProxy.cpp:
+ (WebKit::PluginProxy::supportsSnapshotting const):
+
+2018-07-18 Babak Shafiei <[email protected]>
+
Cherry-pick r233888. rdar://problem/42345191
Add completion handlers to TestRunner functions setStatisticsLastSeen(), setStatisticsPrevalentResource(), setStatisticsVeryPrevalentResource(), setStatisticsHasHadUserInteraction(), and setStatisticsHasHadNonRecentUserInteraction()
Modified: branches/safari-606-branch/Source/WebKit/WebProcess/Plugins/PluginProxy.cpp (233964 => 233965)
--- branches/safari-606-branch/Source/WebKit/WebProcess/Plugins/PluginProxy.cpp 2018-07-19 02:00:35 UTC (rev 233964)
+++ branches/safari-606-branch/Source/WebKit/WebProcess/Plugins/PluginProxy.cpp 2018-07-19 02:00:37 UTC (rev 233965)
@@ -234,7 +234,7 @@
return false;
bool isSupported = false;
- if (m_connection && !m_connection->connection()->sendSync(Messages::PluginControllerProxy::SupportsSnapshotting(), Messages::PluginControllerProxy::SupportsSnapshotting::Reply(isSupported), m_pluginInstanceID))
+ if (m_connection && !m_connection->connection()->sendSync(Messages::PluginControllerProxy::SupportsSnapshotting(), Messages::PluginControllerProxy::SupportsSnapshotting::Reply(isSupported), m_pluginInstanceID, Seconds::infinity(), IPC::SendSyncOption::DoNotProcessIncomingMessagesWhenWaitingForSyncReply))
return false;
return isSupported;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
