Changeset 85493 in webkit

Timestamp:

May 2, 2011 11:04:06 AM (13 years ago)

Author:

sfalken@apple.com

Message:

2011-04-29 Steve Falkenburg <​sfalken@apple.com>

Reviewed by Maciej Stachowiak.

Plug-in failed to initialize message should be called when Java fails to initialize
​https://bugs.webkit.org/show_bug.cgi?id=59856

To match the WebKit1 behavior, WebKit2 should dispatch the plug-in failed
to initialize message when we can't instantiate the Java plug-in.

• WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp: (WebKit::WebFrameLoaderClient::createJavaAppletWidget):

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp (modified) (1 diff)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2011-04-29  Steve Falkenburg  <sfalken@apple.com>
+
+        Reviewed by Maciej Stachowiak.
+
+        Plug-in failed to initialize message should be called when Java fails to initialize
+        https://bugs.webkit.org/show_bug.cgi?id=59856
+        
+        To match the WebKit1 behavior, WebKit2 should dispatch the plug-in failed
+        to initialize message when we can't instantiate the Java plug-in.
+
+        * WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp:
+        (WebKit::WebFrameLoaderClient::createJavaAppletWidget):
+
 2011-05-02  Sam Weinig  <sam@webkit.org>
 

trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp

@@ -1255 +1255 @@
 PassRefPtr<Widget> WebFrameLoaderClient::createJavaAppletWidget(const IntSize& pluginSize, HTMLAppletElement* appletElement, const KURL& baseURL, const Vector<String>& paramNames, const Vector<String>& paramValues)
 {
-    return createPlugin(pluginSize, appletElement, KURL(), paramNames, paramValues, "application/x-java-applet", false);
+    const String mimeType = "application/x-java-applet";
+    RefPtr<Widget> plugin = createPlugin(pluginSize, appletElement, KURL(), paramNames, paramValues, mimeType, false);
+    if (!plugin) {
+        if (WebPage* webPage = m_frame->page())
+            webPage->send(Messages::WebPageProxy::DidFailToInitializePlugin(mimeType));
+    }
+    return plugin.release();
 }