Title: [125601] trunk/Source/WebKit/mac
Revision
125601
Author
tse...@chromium.org
Date
2012-08-14 14:02:24 -0700 (Tue, 14 Aug 2012)

Log Message

REGRESSION r125500: 7 tests crashing on Mac bots
https://bugs.webkit.org/show_bug.cgi?id=93970

Reviewed by Eric Seidel.

Make WebFrameLoaderClient::redirectDataToPlugin expect the now real possibility
of a NULL pluginWidget argument.

* WebCoreSupport/WebFrameLoaderClient.mm:
(WebFrameLoaderClient::redirectDataToPlugin)

Modified Paths

Diff

Modified: trunk/Source/WebKit/mac/ChangeLog (125600 => 125601)


--- trunk/Source/WebKit/mac/ChangeLog	2012-08-14 20:53:09 UTC (rev 125600)
+++ trunk/Source/WebKit/mac/ChangeLog	2012-08-14 21:02:24 UTC (rev 125601)
@@ -1,3 +1,16 @@
+2012-08-14  Tom Sepez  <tse...@chromium.org>
+
+        REGRESSION r125500: 7 tests crashing on Mac bots
+        https://bugs.webkit.org/show_bug.cgi?id=93970
+
+        Reviewed by Eric Seidel.
+
+        Make WebFrameLoaderClient::redirectDataToPlugin expect the now real possibility
+        of a NULL pluginWidget argument.
+
+        * WebCoreSupport/WebFrameLoaderClient.mm:
+        (WebFrameLoaderClient::redirectDataToPlugin)
+        
 2012-08-09  Kinuko Yasuda  <kin...@chromium.org>
 
         http/tests/security/mixedContent/blob-url-in-iframe.html fails on Mac

Modified: trunk/Source/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.mm (125600 => 125601)


--- trunk/Source/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.mm	2012-08-14 20:53:09 UTC (rev 125600)
+++ trunk/Source/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.mm	2012-08-14 21:02:24 UTC (rev 125601)
@@ -1724,6 +1724,9 @@
 
 void WebFrameLoaderClient::redirectDataToPlugin(Widget* pluginWidget)
 {
+    if (!pluginWidget)
+        return;
+
     BEGIN_BLOCK_OBJC_EXCEPTIONS;
 
     WebHTMLRepresentation *representation = (WebHTMLRepresentation *)[[m_webFrame.get() _dataSource] representation];
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to