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

rjw rjw at 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Sat Sep 26 08:21:18 UTC 2009


The following commit has been merged in the debian/unstable branch:
commit 836aa3d087d56c047d2bcd2f6feb99f0874aa4de
Author: rjw <rjw at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Jan 8 00:45:31 2004 +0000

    WebCore:
    	Fixed 3517550.  Named array lookup of applet failed, i.e.:
    	var appletobj = document.applets['myapplet']
    
            Reviewed by Chris.
    
            * khtml/ecma/kjs_html.cpp:
            (KJS::HTMLCollection::getNamedItems):
    
    Tests:
            Added lookup test for all three variants of applet access:
            named, indexed array, and named array.
    
            * LiveConnect/Blink/Blink.java:
            (Blink):
            (Blink.init):
            * LiveConnect/Blink/Blink.pbproj/project.pbxproj:
            * LiveConnect/Blink/test.html:
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@5869 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index e81bcd7..e14f78c 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,13 @@
+2004-01-07  Richard Williamson   <rjw at apple.com>
+
+	Fixed 3517550.  Named array lookup of applet failed, i.e.:
+	var appletobj = document.applets['myapplet']
+
+        Reviewed by Chris.
+
+        * khtml/ecma/kjs_html.cpp:
+        (KJS::HTMLCollection::getNamedItems):
+
 === Safari-120 ===
 
 2004-01-06  David Hyatt  <hyatt at apple.com>
diff --git a/WebCore/khtml/ecma/kjs_html.cpp b/WebCore/khtml/ecma/kjs_html.cpp
index e0cf093..691bf1b 100644
--- a/WebCore/khtml/ecma/kjs_html.cpp
+++ b/WebCore/khtml/ecma/kjs_html.cpp
@@ -3019,6 +3019,11 @@ Value KJS::HTMLCollection::getNamedItems(ExecState *exec, const Identifier &prop
 #ifdef KJS_VERBOSE
       kdDebug(6070) << "returning single node" << endl;
 #endif
+#if APPLE_CHANGES
+	  if (!node.isNull() && node.handle()->id() == ID_APPLET) {
+	    return getRuntimeObject(exec,node);
+	  }
+#endif
       return getDOMNode(exec,node);
     }
     else // multiple items, return a collection

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list