[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677

[darin]

The following commit has been merged in the debian/unstable branch:
commit ef0e6dc0ec3e021313d17d501518a1b73c328a21
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Sep 9 20:24:45 2003 +0000

            Reviewed by Chris.
    
            - fixed 3373654 -- REGRESSION: Yahoo chat applet reloads over and over due to "baseURL" param name conflict
    
            After some research by the Java team, we discovered that there was no need to
            pass in baseURL at all This patch gets rid of that by only passingindividual specified
            arguments, rather than passing all the arguments, as applet parameters.
    
            * khtml/rendering/render_applet.cpp: (RenderApplet::processArguments): Remove the
            call to KJavaApplet::processArguments, because we only want the individual arguments.
            * kwq/KWQKJavaAppletWidget.h: Implement setAppletClass, setAppletName, setArchives, and
            setCodeBase. Remove processArguments.
            * kwq/KWQKJavaAppletWidget.mm: (KJavaAppletWidget::setParameter): Lowercase all the
            parameters as we put them in the dictionary, since this is the semantics required by Java.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@4957 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 8fe4255..6d1e67d 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,20 @@
+2003-09-09  Darin Adler  <darin at apple.com>
+
+        Reviewed by Chris.
+
+        - fixed 3373654 -- REGRESSION: Yahoo chat applet reloads over and over due to "baseURL" param name conflict
+
+        After some research by the Java team, we discovered that there was no need to
+        pass in baseURL at all This patch gets rid of that by only passingindividual specified
+        arguments, rather than passing all the arguments, as applet parameters.
+
+        * khtml/rendering/render_applet.cpp: (RenderApplet::processArguments): Remove the
+        call to KJavaApplet::processArguments, because we only want the individual arguments.
+        * kwq/KWQKJavaAppletWidget.h: Implement setAppletClass, setAppletName, setArchives, and
+        setCodeBase. Remove processArguments.
+        * kwq/KWQKJavaAppletWidget.mm: (KJavaAppletWidget::setParameter): Lowercase all the
+        parameters as we put them in the dictionary, since this is the semantics required by Java.
+
 === Safari-99 ===
 
 2003-09-07  Darin Adler  <darin at apple.com>
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 8fe4255..6d1e67d 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,20 @@
+2003-09-09  Darin Adler  <darin at apple.com>
+
+        Reviewed by Chris.
+
+        - fixed 3373654 -- REGRESSION: Yahoo chat applet reloads over and over due to "baseURL" param name conflict
+
+        After some research by the Java team, we discovered that there was no need to
+        pass in baseURL at all This patch gets rid of that by only passingindividual specified
+        arguments, rather than passing all the arguments, as applet parameters.
+
+        * khtml/rendering/render_applet.cpp: (RenderApplet::processArguments): Remove the
+        call to KJavaApplet::processArguments, because we only want the individual arguments.
+        * kwq/KWQKJavaAppletWidget.h: Implement setAppletClass, setAppletName, setArchives, and
+        setCodeBase. Remove processArguments.
+        * kwq/KWQKJavaAppletWidget.mm: (KJavaAppletWidget::setParameter): Lowercase all the
+        parameters as we put them in the dictionary, since this is the semantics required by Java.
+
 === Safari-99 ===
 
 2003-09-07  Darin Adler  <darin at apple.com>
diff --git a/WebCore/khtml/rendering/render_applet.cpp b/WebCore/khtml/rendering/render_applet.cpp
index 44be58e..e53f4d4 100644
--- a/WebCore/khtml/rendering/render_applet.cpp
+++ b/WebCore/khtml/rendering/render_applet.cpp
@@ -131,11 +131,6 @@ void RenderApplet::processArguments(const QMap<QString, QString> &args)
     KJavaAppletWidget *w = static_cast<KJavaAppletWidget*>(m_widget);
     KJavaApplet* applet = w ? w->applet() : 0;
 
-#if APPLE_CHANGES
-    if (w)
-        w->processArguments(args);
-#endif
-
     if ( applet ) {
         applet->setBaseURL( args[QString::fromLatin1("baseURL") ] );
         applet->setAppletClass( args[QString::fromLatin1("code") ] );
diff --git a/WebCore/kwq/KWQKJavaAppletWidget.h b/WebCore/kwq/KWQKJavaAppletWidget.h
index 55cf0e2..89fb263 100644
--- a/WebCore/kwq/KWQKJavaAppletWidget.h
+++ b/WebCore/kwq/KWQKJavaAppletWidget.h
@@ -24,7 +24,6 @@
  */
 
 #include "KWQWidget.h"
-#include "KWQMap.h"
 #include "KWQString.h"
 
 class KJavaAppletContext;
@@ -41,11 +40,11 @@ class KJavaApplet
 public:
     KJavaApplet(KJavaAppletWidget &widget) : m_widget(widget) { }
 
-    void setAppletClass(const QString &) { }
-    void setAppletName(const QString &) { }
-    void setArchives(const QString &) { }
+    void setAppletClass(const QString &);
+    void setAppletName(const QString &);
+    void setArchives(const QString &);
     void setBaseURL(const QString &);
-    void setCodeBase(const QString &) { }
+    void setCodeBase(const QString &);
     
     void setParameter(const QString &, const QString &);
 
@@ -59,8 +58,6 @@ public:
     KJavaAppletWidget(KJavaAppletContext *, QWidget *);
     ~KJavaAppletWidget();
     
-    void processArguments(const QMap<QString, QString>&);
-
     KJavaApplet *applet() { return &_applet; }
     
     void setBaseURL(const QString &baseURL) { _baseURL = baseURL; }
@@ -75,5 +72,9 @@ private:
     NSMutableDictionary *_parameters;
 };
 
+inline void KJavaApplet::setAppletClass(const QString &s) { m_widget.setParameter("code", s); }
+inline void KJavaApplet::setAppletName(const QString &s) { m_widget.setParameter("name", s); }
+inline void KJavaApplet::setArchives(const QString &s) { m_widget.setParameter("archive", s); }
 inline void KJavaApplet::setBaseURL(const QString &URL) { m_widget.setBaseURL(URL); }
+inline void KJavaApplet::setCodeBase(const QString &s) { m_widget.setParameter("codebase", s); }
 inline void KJavaApplet::setParameter(const QString &name, const QString &value) { m_widget.setParameter(name, value); }
diff --git a/WebCore/kwq/KWQKJavaAppletWidget.mm b/WebCore/kwq/KWQKJavaAppletWidget.mm
index 604c7ea..96780cd 100644
--- a/WebCore/kwq/KWQKJavaAppletWidget.mm
+++ b/WebCore/kwq/KWQKJavaAppletWidget.mm
@@ -49,17 +49,10 @@ void KJavaAppletWidget::setParameter(const QString &name, const QString &value)
     // When putting strings into dictionaries, we should use an immutable copy.
     // That's not necessary for keys, because they are copied.
     NSString *immutableString = [value.getNSString() copy];
-    [_parameters setObject:immutableString forKey:name.getNSString()];
+    [_parameters setObject:immutableString forKey:name.lower().getNSString()];
     [immutableString release];
 }
 
-void KJavaAppletWidget::processArguments(const QMap<QString, QString> &arguments)
-{
-    for (QMap<QString, QString>::ConstIterator it = arguments.begin(); it != arguments.end(); ++it) {
-        setParameter(it.key(), it.data());
-    }
-}
-
 void KJavaAppletWidget::showApplet()
 {
     // If the view is a KWQView, we haven't replaced it with the Java view yet.

-- 
WebKit Debian packaging