[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677
cblu
cblu at 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Sat Sep 26 05:56:18 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit f48842a33d7257edfee09a58d65c8622c233a241
Author: cblu <cblu at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Tue Feb 26 23:22:12 2002 +0000
Now sending complete URL's to the plug-in classes - woops
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@671 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/kwq/KWQKHTMLPart.mm b/WebCore/kwq/KWQKHTMLPart.mm
index a65bed1..3191e74 100644
--- a/WebCore/kwq/KWQKHTMLPart.mm
+++ b/WebCore/kwq/KWQKHTMLPart.mm
@@ -46,6 +46,7 @@
#include <kjs_dom.h>
#include <dom_doc.h>
#include <qcursor.h>
+#include <kurl.h>
#include <KWQKHTMLPart.h>
@@ -1742,7 +1743,7 @@ bool KHTMLPart::requestObject( khtml::RenderPart *frame, const QString &url, con
// The plugins array is an attempt to avoid multiple creations of the same plug-in.
// FIXME: Can't have multiple plug-ins with the same URL on a page
if(!plugins.contains(url)){
- WCPluginWidget *pluginWidget = new WCPluginWidget(0, url, serviceType, args);
+ WCPluginWidget *pluginWidget = new WCPluginWidget(0, completeURL(url).url(), serviceType, args);
frame->setWidget(pluginWidget);
plugins.append(url);
}
diff --git a/WebCore/kwq/KWQKHTMLPartImpl.mm b/WebCore/kwq/KWQKHTMLPartImpl.mm
index a65bed1..3191e74 100644
--- a/WebCore/kwq/KWQKHTMLPartImpl.mm
+++ b/WebCore/kwq/KWQKHTMLPartImpl.mm
@@ -46,6 +46,7 @@
#include <kjs_dom.h>
#include <dom_doc.h>
#include <qcursor.h>
+#include <kurl.h>
#include <KWQKHTMLPart.h>
@@ -1742,7 +1743,7 @@ bool KHTMLPart::requestObject( khtml::RenderPart *frame, const QString &url, con
// The plugins array is an attempt to avoid multiple creations of the same plug-in.
// FIXME: Can't have multiple plug-ins with the same URL on a page
if(!plugins.contains(url)){
- WCPluginWidget *pluginWidget = new WCPluginWidget(0, url, serviceType, args);
+ WCPluginWidget *pluginWidget = new WCPluginWidget(0, completeURL(url).url(), serviceType, args);
frame->setWidget(pluginWidget);
plugins.append(url);
}
diff --git a/WebCore/src/kwq/KWQKHTMLPart.mm b/WebCore/src/kwq/KWQKHTMLPart.mm
index a65bed1..3191e74 100644
--- a/WebCore/src/kwq/KWQKHTMLPart.mm
+++ b/WebCore/src/kwq/KWQKHTMLPart.mm
@@ -46,6 +46,7 @@
#include <kjs_dom.h>
#include <dom_doc.h>
#include <qcursor.h>
+#include <kurl.h>
#include <KWQKHTMLPart.h>
@@ -1742,7 +1743,7 @@ bool KHTMLPart::requestObject( khtml::RenderPart *frame, const QString &url, con
// The plugins array is an attempt to avoid multiple creations of the same plug-in.
// FIXME: Can't have multiple plug-ins with the same URL on a page
if(!plugins.contains(url)){
- WCPluginWidget *pluginWidget = new WCPluginWidget(0, url, serviceType, args);
+ WCPluginWidget *pluginWidget = new WCPluginWidget(0, completeURL(url).url(), serviceType, args);
frame->setWidget(pluginWidget);
plugins.append(url);
}
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list