Title: [151617] trunk/Source/WebKit2
- Revision
- 151617
- Author
- [email protected]
- Date
- 2013-06-15 15:56:00 -0700 (Sat, 15 Jun 2013)
Log Message
Crash in supportsSnapshotting
https://bugs.webkit.org/show_bug.cgi?id=117670
<rdar://problem/14059711>
Reviewed by Darin Adler.
Speculative fix for deferencing a null RefPtr in supportsSnapshotting.
It seems like it was possible to get in a state where the plugin machinery
would fire up and attempt to get a screenshot before there was an active
connection to the plugin process (usually under periods of high load, such
as opening a lot of tabs at once). In this case we're now returning false
from supportsSnapshotting, which will trigger the plugin to restart, but
that's better than requesting a snapshot on something that doesn't yet exist.
* WebProcess/Plugins/PluginProxy.cpp:
(WebKit::PluginProxy::supportsSnapshotting): Guard for an empty connection object.
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (151616 => 151617)
--- trunk/Source/WebKit2/ChangeLog 2013-06-15 22:37:03 UTC (rev 151616)
+++ trunk/Source/WebKit2/ChangeLog 2013-06-15 22:56:00 UTC (rev 151617)
@@ -1,3 +1,22 @@
+2013-06-14 Dean Jackson <[email protected]>
+
+ Crash in supportsSnapshotting
+ https://bugs.webkit.org/show_bug.cgi?id=117670
+ <rdar://problem/14059711>
+
+ Reviewed by Darin Adler.
+
+ Speculative fix for deferencing a null RefPtr in supportsSnapshotting.
+ It seems like it was possible to get in a state where the plugin machinery
+ would fire up and attempt to get a screenshot before there was an active
+ connection to the plugin process (usually under periods of high load, such
+ as opening a lot of tabs at once). In this case we're now returning false
+ from supportsSnapshotting, which will trigger the plugin to restart, but
+ that's better than requesting a snapshot on something that doesn't yet exist.
+
+ * WebProcess/Plugins/PluginProxy.cpp:
+ (WebKit::PluginProxy::supportsSnapshotting): Guard for an empty connection object.
+
2013-06-14 Enrica Casucci <[email protected]>
WKPageFindStringMatches ignores the kWKFindOptionsBackwards option.
Modified: trunk/Source/WebKit2/WebProcess/Plugins/PluginProxy.cpp (151616 => 151617)
--- trunk/Source/WebKit2/WebProcess/Plugins/PluginProxy.cpp 2013-06-15 22:37:03 UTC (rev 151616)
+++ trunk/Source/WebKit2/WebProcess/Plugins/PluginProxy.cpp 2013-06-15 22:56:00 UTC (rev 151617)
@@ -235,7 +235,7 @@
return false;
bool isSupported = false;
- if (!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))
return false;
return isSupported;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes