RELEASE_ASSERT() under IPC::Connection::sendSync() from PluginProxy::supportsSnapshot...
authorcdumez@apple.com <cdumez@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 18 Jul 2018 03:43:37 +0000 (03:43 +0000)
committercdumez@apple.com <cdumez@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 18 Jul 2018 03:43:37 +0000 (03:43 +0000)
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

Source/WebKit/ChangeLog
Source/WebKit/WebProcess/Plugins/PluginProxy.cpp

index 6a7925b..e768664 100644 (file)
@@ -1,5 +1,20 @@
 2018-07-17  Chris Dumez  <cdumez@apple.com>
 
+        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-17  Chris Dumez  <cdumez@apple.com>
+
         Turn on PSON in WebKitTestRunner
         https://bugs.webkit.org/show_bug.cgi?id=186542
 
index 606c59c..38c372b 100644 (file)
@@ -234,7 +234,7 @@ bool PluginProxy::supportsSnapshotting() const
         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;