summaryrefslogtreecommitdiffstats
path: root/webkit
diff options
context:
space:
mode:
authorananta@chromium.org <ananta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-07-07 01:56:26 +0000
committerananta@chromium.org <ananta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-07-07 01:56:26 +0000
commit6a9c78e51aac5935aeb22b335a1d63a763bc1d5b (patch)
tree7c79ae2e0c8cf1c05cbee7467ea2176f2a3dae2f /webkit
parent90194366afc0d58559604cdec2e15e17b8bee7ce (diff)
downloadchromium_src-6a9c78e51aac5935aeb22b335a1d63a763bc1d5b.zip
chromium_src-6a9c78e51aac5935aeb22b335a1d63a763bc1d5b.tar.gz
chromium_src-6a9c78e51aac5935aeb22b335a1d63a763bc1d5b.tar.bz2
The webkit java applet creation code passes in the baseURL which is typically the url of the containing document to
create the plugin widget. This URL should not be treated as the plugin SRC url. This mimics the webkit plugin implementation specifically the upstream WebFrame::createJavaAppletWidget implementation. This fixes http://code.google.com/p/chromium/issues/detail?id=991, which manifested itself due to our plugin implementation issuing a spurious GET request for the baseURL which is incorrect as per above. Bug=991 Review URL: http://codereview.chromium.org/155069 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@20005 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
-rw-r--r--webkit/glue/webframeloaderclient_impl.cc4
-rw-r--r--webkit/glue/webframeloaderclient_impl.h2
2 files changed, 3 insertions, 3 deletions
diff --git a/webkit/glue/webframeloaderclient_impl.cc b/webkit/glue/webframeloaderclient_impl.cc
index 3a65c91..d832ef2 100644
--- a/webkit/glue/webframeloaderclient_impl.cc
+++ b/webkit/glue/webframeloaderclient_impl.cc
@@ -1419,10 +1419,10 @@ void WebFrameLoaderClient::redirectDataToPlugin(Widget* pluginWidget) {
Widget* WebFrameLoaderClient::createJavaAppletWidget(
const IntSize& size,
HTMLAppletElement* element,
- const KURL& url,
+ const KURL& /* base_url */,
const Vector<String>& param_names,
const Vector<String>& param_values) {
- return createPlugin(size, element, url, param_names, param_values,
+ return createPlugin(size, element, KURL(), param_names, param_values,
"application/x-java-applet", false);
}
diff --git a/webkit/glue/webframeloaderclient_impl.h b/webkit/glue/webframeloaderclient_impl.h
index e31e7e4..bf49c74 100644
--- a/webkit/glue/webframeloaderclient_impl.h
+++ b/webkit/glue/webframeloaderclient_impl.h
@@ -185,7 +185,7 @@ class WebFrameLoaderClient : public WebCore::FrameLoaderClient {
virtual WebCore::Widget* createJavaAppletWidget(
const WebCore::IntSize&,
WebCore::HTMLAppletElement*,
- const WebCore::KURL& baseURL,
+ const WebCore::KURL& /* base_url */,
const WTF::Vector<WebCore::String>& paramNames,
const WTF::Vector<WebCore::String>& paramValues);