[3603191] REGRESSION: Applets not receiving all of the Applet Parameters in Java...

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@8634 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 742519750f48c7021ce805f20c10663b0606a605..827b1d45e8030f4050f85ad96880035bb867ce65 100644 (file)
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,21 @@
+2005-02-18  Jens Alfke  <jens@apple.com>
+
+        Reviewed by cblu, hyatt.
+
+       Fixes <rdar://problem/3603191> "REGRESSION: Applets not receiving all of the Applet Parameters in Java 1.4.1/1.4.2"
+       Defer instantiation of Java applet plugin until after all of the <applet> tag's nested <param> tags have been parsed, otherwise the list of parameters passed to the applet is incomplete. The regression was introduced (says Dave) when the parser's close-tag notifications were removed in the name of performance.
+
+        * khtml/html/html_objectimpl.cpp:
+        (HTMLAppletElementImpl::HTMLAppletElementImpl):
+        (HTMLAppletElementImpl::getAppletInstance):
+        (HTMLAppletElementImpl::setAllParamsAvailable):
+        (HTMLAppletElementImpl::allParamsAvailable):
+        * khtml/html/html_objectimpl.h:
+        * khtml/html/htmlparser.cpp:
+        (KHTMLParser::processCloseTag):
+        * khtml/rendering/render_applet.cpp:
+        (RenderApplet::createWidgetIfNecessary):
+
 2005-02-18  Richard Williamson   <rjw@apple.com>
 
        Fixed <rdar://problem/4006161> Tiger8A380: Widgets leak dashboard regions

diff --git a/WebCore/khtml/html/html_objectimpl.cpp b/WebCore/khtml/html/html_objectimpl.cpp
index 6e3106679124d9d8ae798e6d9f0afdd3f86f1606..ab471707d560dd002ce98b53a512f25e0f8797c5 100644 (file)
--- a/WebCore/khtml/html/html_objectimpl.cpp
+++ b/WebCore/khtml/html/html_objectimpl.cpp
@@ -59,6 +59,7 @@ HTMLAppletElementImpl::HTMLAppletElementImpl(DocumentPtr *doc)
   : HTMLElementImpl(doc)
 {
     appletInstance = 0;
+    m_allParamsAvailable = false;
 }
 
 HTMLAppletElementImpl::~HTMLAppletElementImpl()
@@ -210,6 +211,19 @@ KJS::Bindings::Instance *HTMLAppletElementImpl::getAppletInstance() const
     }
     return appletInstance;
 }
+
+void HTMLAppletElementImpl::setAllParamsAvailable()
+{
+    // The parser just reached </applet>, so all the params are available now.
+    m_allParamsAvailable = true;
+    if( m_render )
+        m_render->setNeedsLayout(); // This will cause it to create its widget & the Java applet
+}
+
+bool HTMLAppletElementImpl::allParamsAvailable()
+{
+    return m_allParamsAvailable;
+}
 #endif
 
 // -------------------------------------------------------------------------

diff --git a/WebCore/khtml/html/html_objectimpl.h b/WebCore/khtml/html/html_objectimpl.h
index 5d68536439bf6abc6b493a6f4d69893943ce8958..e19c9a2c721aa44bf1d951f2fd714b4baa3994b4 100644 (file)
--- a/WebCore/khtml/html/html_objectimpl.h
+++ b/WebCore/khtml/html/html_objectimpl.h
@@ -61,6 +61,8 @@ public:
     bool callMember(const QString &, const QStringList &, JType &, QString &);
     
 #if APPLE_CHANGES
+    virtual void setAllParamsAvailable();
+    virtual bool allParamsAvailable();
     void setupApplet() const;
     KJS::Bindings::Instance *getAppletInstance() const;
 #endif
@@ -71,6 +73,7 @@ protected:
 private:
 #if APPLE_CHANGES
     mutable KJS::Bindings::Instance *appletInstance;
+    bool m_allParamsAvailable;
 #endif
 };
 

diff --git a/WebCore/khtml/html/htmlparser.cpp b/WebCore/khtml/html/htmlparser.cpp
index 99196e5932342b67560e6c86ec17aa8feb19766e..725b8b2fe269575399daaf25ee57d5a7790380c9 100644 (file)
--- a/WebCore/khtml/html/htmlparser.cpp
+++ b/WebCore/khtml/html/htmlparser.cpp
@@ -981,6 +981,11 @@ void KHTMLParser::processCloseTag(Token *t)
     case ID_SELECT+ID_CLOSE_TAG:
         inSelect = false;
         break;
+    case ID_APPLET+ID_CLOSE_TAG:
+        // Applets can't be laid out till the entire tag is parsed, because the contents of all of
+        // the embedded <param> tags have to be passed to Java at once. [3603191]
+        static_cast<HTMLAppletElementImpl*>(current)->setAllParamsAvailable();
+        break;
     default:
         break;
     }

diff --git a/WebCore/khtml/rendering/render_applet.cpp b/WebCore/khtml/rendering/render_applet.cpp
index fee31075b314573b573d57f704d8f1fe6da22c44..ee8f7fd26d21d32136c8cd76d923ed66a6e3208b 100644 (file)
--- a/WebCore/khtml/rendering/render_applet.cpp
+++ b/WebCore/khtml/rendering/render_applet.cpp
@@ -93,23 +93,25 @@ int RenderApplet::intrinsicHeight() const
 void RenderApplet::createWidgetIfNecessary()
 {
     if (!m_widget) {
-        // FIXME: Java applets can't be resized (this is a bug in Apple's Java implementation).  In order to work around
-        // this problem, we will simply use fixed widths/heights from the style system when we can, since the widget might
-        // not have an accurate m_width/m_height.
-        int width = style()->width().isFixed() ? style()->width().value : 
-                    m_width - borderLeft() - borderRight() - paddingLeft() - paddingRight();
-        int height = style()->height().isFixed() ? style()->height().value :
-                     m_height - borderTop() - borderBottom() - paddingTop() - paddingBottom();
-        NodeImpl *child = element()->firstChild();
-        while (child) {
-            if (child->id() == ID_PARAM) {
-                HTMLParamElementImpl *p = static_cast<HTMLParamElementImpl *>(child);
-                m_args.insert(p->name(), p->value());
+        if (static_cast<HTMLAppletElementImpl*>(element())->allParamsAvailable()) {
+            // FIXME: Java applets can't be resized (this is a bug in Apple's Java implementation).  In order to work around
+            // this problem, we will simply use fixed widths/heights from the style system when we can, since the widget might
+            // not have an accurate m_width/m_height.
+            int width = style()->width().isFixed() ? style()->width().value : 
+                        m_width - borderLeft() - borderRight() - paddingLeft() - paddingRight();
+            int height = style()->height().isFixed() ? style()->height().value :
+                         m_height - borderTop() - borderBottom() - paddingTop() - paddingBottom();
+            NodeImpl *child = element()->firstChild();
+            while (child) {
+                if (child->id() == ID_PARAM) {
+                    HTMLParamElementImpl *p = static_cast<HTMLParamElementImpl *>(child);
+                    m_args.insert(p->name(), p->value());
+                }
+                child = child->nextSibling();
             }
-            child = child->nextSibling();
+        
+            setQWidget(new KJavaAppletWidget(QSize(width, height), m_context, m_args));
         }
-    
-        setQWidget(new KJavaAppletWidget(QSize(width, height), m_context, m_args));
     }
 }