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

[rjw]

The following commit has been merged in the debian/unstable branch:
commit 535323cb308e916ba9a5de5dedb34ae6a25fa3e4
Author: rjw <rjw at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Dec 19 23:06:41 2003 +0000

    	Fixed 3515590.  Return Undefined to JS for applet if
    	Java is disabled.
    
            Reviewed by Chris.
    
            * khtml/html/html_objectimpl.cpp:
            (HTMLAppletElementImpl::getAppletInstance):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@5838 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 7109a7b..03cf335 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,13 @@
+2003-12-19  Richard Williamson   <rjw at apple.com>
+
+	Fixed 3515590.  Return Undefined to JS for applet if
+	Java is disabled.
+
+        Reviewed by Chris.
+
+        * khtml/html/html_objectimpl.cpp:
+        (HTMLAppletElementImpl::getAppletInstance):
+
 2003-12-19  Maciej Stachowiak  <mjs at apple.com>
 
         Reviewed by Chris.
diff --git a/WebCore/khtml/html/html_objectimpl.cpp b/WebCore/khtml/html/html_objectimpl.cpp
index c1005b6..a27353d 100644
--- a/WebCore/khtml/html/html_objectimpl.cpp
+++ b/WebCore/khtml/html/html_objectimpl.cpp
@@ -176,6 +176,10 @@ bool HTMLAppletElementImpl::callMember(const QString & name, const QStringList &
 #if APPLE_CHANGES
 KJS::Bindings::Instance *HTMLAppletElementImpl::getAppletInstance() const
 {
+	KHTMLPart* part = getDocument()->part();
+	if (!part->javaEnabled())
+		return 0;
+
     if (appletInstance)
         return appletInstance;
     
@@ -186,7 +190,6 @@ KJS::Bindings::Instance *HTMLAppletElementImpl::getAppletInstance() const
             // Call into the part (and over the bridge) to pull the Bindings::Instance
             // from the guts of the Java VM.
             void *_view = r->widget()->getView();
-            KHTMLPart* part = getDocument()->part();
             appletInstance = part ? KWQ(part)->getAppletInstanceForView((NSView *)_view) : 0;
         }
     }

-- 
WebKit Debian packaging