Title: [133741] trunk/Source/WebKit2
Revision
133741
Author
[email protected]
Date
2012-11-07 05:35:13 -0800 (Wed, 07 Nov 2012)

Log Message

[WK2] Return earlier if a plugin snapshot cannot be created.
https://bugs.webkit.org/show_bug.cgi?id=101445

Reviewed by Kenneth Rohde Christiansen.

Currently only the Mac port has support for creating snapshots of
Netscape plugins. Return earlier in PluginProxy::snapshot() so
that we do not pass a null handler to ShareableBitmap::create()
and avoid crashing when running pixel tests with plugins.

* WebProcess/Plugins/PluginProxy.cpp:
(WebKit::PluginProxy::snapshot):

Modified Paths

Diff

Modified: trunk/Source/WebKit2/ChangeLog (133740 => 133741)


--- trunk/Source/WebKit2/ChangeLog	2012-11-07 13:33:40 UTC (rev 133740)
+++ trunk/Source/WebKit2/ChangeLog	2012-11-07 13:35:13 UTC (rev 133741)
@@ -1,3 +1,18 @@
+2012-11-07  Raphael Kubo da Costa  <[email protected]>
+
+        [WK2] Return earlier if a plugin snapshot cannot be created.
+        https://bugs.webkit.org/show_bug.cgi?id=101445
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        Currently only the Mac port has support for creating snapshots of
+        Netscape plugins. Return earlier in PluginProxy::snapshot() so
+        that we do not pass a null handler to ShareableBitmap::create()
+        and avoid crashing when running pixel tests with plugins.
+
+        * WebProcess/Plugins/PluginProxy.cpp:
+        (WebKit::PluginProxy::snapshot):
+
 2012-11-07  Kangil Han  <[email protected]>
 
         [EFL][WK2] Change encoding detector API names

Modified: trunk/Source/WebKit2/WebProcess/Plugins/PluginProxy.cpp (133740 => 133741)


--- trunk/Source/WebKit2/WebProcess/Plugins/PluginProxy.cpp	2012-11-07 13:33:40 UTC (rev 133740)
+++ trunk/Source/WebKit2/WebProcess/Plugins/PluginProxy.cpp	2012-11-07 13:35:13 UTC (rev 133741)
@@ -232,6 +232,9 @@
     ShareableBitmap::Handle snapshotStoreHandle;
     m_connection->connection()->sendSync(Messages::PluginControllerProxy::Snapshot(), Messages::PluginControllerProxy::Snapshot::Reply(snapshotStoreHandle), m_pluginInstanceID);
 
+    if (snapshotStoreHandle.isNull())
+        return 0;
+
     RefPtr<ShareableBitmap> snapshotBuffer = ShareableBitmap::create(snapshotStoreHandle);
     return snapshotBuffer.release();
 }
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to