[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 06:03:03 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit d660f4ee3156ece25441cd4722abde4cdb46a34a
Author: cblu <cblu at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Fri Apr 5 00:27:53 2002 +0000
2002-04-04 Chris Blumenberg <cblu at apple.com>
* src/kdelibs/khtml/rendering/render_frames.cpp:
(RenderPartObject::updateWidget):
* src/kwq/WCPluginWidget.mm: (WCPluginWidget::WCPluginWidget):
Moved the removal of __KHTML__ EMBED attributes to WCPluginWidget. One less APPLE_CHANGES.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@968 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index 779bf1c..a7ac6c4 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,3 +1,11 @@
+2002-04-04 Chris Blumenberg <cblu at apple.com>
+
+ * src/kdelibs/khtml/rendering/render_frames.cpp:
+ (RenderPartObject::updateWidget):
+ * src/kwq/WCPluginWidget.mm: (WCPluginWidget::WCPluginWidget):
+
+ Moved the removal of __KHTML__ EMBED to attributes WCPluginWidget. One less APPLE_CHANGES.
+
2002-04-04 Darin Adler <darin at apple.com>
Redo clobbered fixes for problems that show up only when xNDEBUG is set
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 779bf1c..a7ac6c4 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,11 @@
+2002-04-04 Chris Blumenberg <cblu at apple.com>
+
+ * src/kdelibs/khtml/rendering/render_frames.cpp:
+ (RenderPartObject::updateWidget):
+ * src/kwq/WCPluginWidget.mm: (WCPluginWidget::WCPluginWidget):
+
+ Moved the removal of __KHTML__ EMBED to attributes WCPluginWidget. One less APPLE_CHANGES.
+
2002-04-04 Darin Adler <darin at apple.com>
Redo clobbered fixes for problems that show up only when xNDEBUG is set
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 779bf1c..a7ac6c4 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,11 @@
+2002-04-04 Chris Blumenberg <cblu at apple.com>
+
+ * src/kdelibs/khtml/rendering/render_frames.cpp:
+ (RenderPartObject::updateWidget):
+ * src/kwq/WCPluginWidget.mm: (WCPluginWidget::WCPluginWidget):
+
+ Moved the removal of __KHTML__ EMBED to attributes WCPluginWidget. One less APPLE_CHANGES.
+
2002-04-04 Darin Adler <darin at apple.com>
Redo clobbered fixes for problems that show up only when xNDEBUG is set
diff --git a/WebCore/khtml/rendering/render_frames.cpp b/WebCore/khtml/rendering/render_frames.cpp
index ae58692..19b5741 100644
--- a/WebCore/khtml/rendering/render_frames.cpp
+++ b/WebCore/khtml/rendering/render_frames.cpp
@@ -615,10 +615,8 @@ void RenderPartObject::updateWidget()
params.append(aStr);
}
}
-#ifndef APPLE_CHANGES
params.append( QString::fromLatin1("__KHTML__PLUGINEMBED=\"YES\"") );
params.append( QString::fromLatin1("__KHTML__PLUGINBASEURL=\"%1\"").arg( part->url().url() ) );
-#endif /* APPLE_CHANGES not defined */
}
if(element()->id() == ID_OBJECT) {
diff --git a/WebCore/kwq/WCPluginWidget.mm b/WebCore/kwq/WCPluginWidget.mm
index 995e63e..9a02d91 100644
--- a/WebCore/kwq/WCPluginWidget.mm
+++ b/WebCore/kwq/WCPluginWidget.mm
@@ -53,13 +53,16 @@ WCPluginWidget::WCPluginWidget(const QString &url, const QString &serviceType, c
URL = QSTRING_TO_NSSTRING(url);
arguments = [NSMutableDictionary dictionaryWithCapacity:10];
for(i=0; i<args.count(); i++){
- arg = QSTRING_TO_NSSTRING(args[i]);
- r1 = [arg rangeOfString:@"="]; // parse out attributes and values
- r2 = [arg rangeOfString:@"\""];
- r3.location = r2.location + 1;
- r3.length = [arg length] - r2.location - 2; // don't include quotes
- [arguments setObject:[arg substringWithRange:r3] forKey:[arg substringToIndex:r1.location]];
+ if(!args[i].contains("__KHTML__")){
+ arg = QSTRING_TO_NSSTRING(args[i]);
+ r1 = [arg rangeOfString:@"="]; // parse out attributes and values
+ r2 = [arg rangeOfString:@"\""];
+ r3.location = r2.location + 1;
+ r3.length = [arg length] - r2.location - 2; // don't include quotes
+ [arguments setObject:[arg substringWithRange:r3] forKey:[arg substringToIndex:r1.location]];
+ }
}
+
if(serviceType.isNull()){
plugin = [[WCPluginDatabase installedPlugins] getPluginForExtension:[URL pathExtension]];
if(plugin != nil){
diff --git a/WebCore/src/kdelibs/khtml/rendering/render_frames.cpp b/WebCore/src/kdelibs/khtml/rendering/render_frames.cpp
index ae58692..19b5741 100644
--- a/WebCore/src/kdelibs/khtml/rendering/render_frames.cpp
+++ b/WebCore/src/kdelibs/khtml/rendering/render_frames.cpp
@@ -615,10 +615,8 @@ void RenderPartObject::updateWidget()
params.append(aStr);
}
}
-#ifndef APPLE_CHANGES
params.append( QString::fromLatin1("__KHTML__PLUGINEMBED=\"YES\"") );
params.append( QString::fromLatin1("__KHTML__PLUGINBASEURL=\"%1\"").arg( part->url().url() ) );
-#endif /* APPLE_CHANGES not defined */
}
if(element()->id() == ID_OBJECT) {
diff --git a/WebCore/src/kwq/WCPluginWidget.mm b/WebCore/src/kwq/WCPluginWidget.mm
index 995e63e..9a02d91 100644
--- a/WebCore/src/kwq/WCPluginWidget.mm
+++ b/WebCore/src/kwq/WCPluginWidget.mm
@@ -53,13 +53,16 @@ WCPluginWidget::WCPluginWidget(const QString &url, const QString &serviceType, c
URL = QSTRING_TO_NSSTRING(url);
arguments = [NSMutableDictionary dictionaryWithCapacity:10];
for(i=0; i<args.count(); i++){
- arg = QSTRING_TO_NSSTRING(args[i]);
- r1 = [arg rangeOfString:@"="]; // parse out attributes and values
- r2 = [arg rangeOfString:@"\""];
- r3.location = r2.location + 1;
- r3.length = [arg length] - r2.location - 2; // don't include quotes
- [arguments setObject:[arg substringWithRange:r3] forKey:[arg substringToIndex:r1.location]];
+ if(!args[i].contains("__KHTML__")){
+ arg = QSTRING_TO_NSSTRING(args[i]);
+ r1 = [arg rangeOfString:@"="]; // parse out attributes and values
+ r2 = [arg rangeOfString:@"\""];
+ r3.location = r2.location + 1;
+ r3.length = [arg length] - r2.location - 2; // don't include quotes
+ [arguments setObject:[arg substringWithRange:r3] forKey:[arg substringToIndex:r1.location]];
+ }
}
+
if(serviceType.isNull()){
plugin = [[WCPluginDatabase installedPlugins] getPluginForExtension:[URL pathExtension]];
if(plugin != nil){
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list