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

darin darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Sat Sep 26 08:06:55 UTC 2009


The following commit has been merged in the debian/unstable branch:
commit 9a40e3011bf4abee1e80d8bc4c927c16e688c960
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Oct 29 05:42:42 2003 +0000

            Reviewed by Maciej.
    
            - fixed 3464702 -- node.item(x) is not implemented (dynamic menus not filled out at techcu.com)
    
            * khtml/ecma/kjs_dom.cpp: (DOMNodeProtoFunc::tryCall): Add implementation of item function.
            * khtml/ecma/kjs_dom.h: Added Item to the enum.
            * khtml/ecma/kjs_dom.lut.h: Regenerated.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@5296 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 96e3e59..8776130 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,13 @@
+2003-10-28  Darin Adler  <darin at apple.com>
+
+        Reviewed by Maciej.
+
+        - fixed 3464702 -- node.item(x) is not implemented (dynamic menus not filled out at techcu.com)
+
+        * khtml/ecma/kjs_dom.cpp: (DOMNodeProtoFunc::tryCall): Add implementation of item function.
+        * khtml/ecma/kjs_dom.h: Added Item to the enum.
+        * khtml/ecma/kjs_dom.lut.h: Regenerated.
+
 2003-10-28  Maciej Stachowiak  <mjs at apple.com>
 
         Reviewed by Dave,
diff --git a/WebCore/khtml/ecma/kjs_dom.cpp b/WebCore/khtml/ecma/kjs_dom.cpp
index 9d55949..278d96a 100644
--- a/WebCore/khtml/ecma/kjs_dom.cpp
+++ b/WebCore/khtml/ecma/kjs_dom.cpp
@@ -61,6 +61,8 @@ using DOM::DOMException;
   removeEventListener	DOMNode::RemoveEventListener	DontDelete|Function 3
   dispatchEvent		DOMNode::DispatchEvent	DontDelete|Function 1
   contains	DOMNode::Contains		DontDelete|Function 1
+# "DOM level 0" (from Gecko DOM reference; also in WinIE)
+  item          DOMNode::Item           DontDelete|Function 1
 @end
 */
 DEFINE_PROTOTYPE("DOMNode",DOMNodeProto)
@@ -475,7 +477,10 @@ Value DOMNodeProtoFunc::tryCall(ExecState *exec, Object &thisObj, const List &ar
 	    bool retval = !impl->checkNoOwner(other.handle(),exceptioncode);
 	    return Boolean(retval && exceptioncode == 0);
 	}
+        return Undefined();
     }
+    case DOMNode::Item:
+      return getDOMNode(exec, node.childNodes().item(static_cast<unsigned long>(args[0].toNumber(exec))));
   }
 
   return Undefined();
diff --git a/WebCore/khtml/ecma/kjs_dom.h b/WebCore/khtml/ecma/kjs_dom.h
index b41a563..92fd594 100644
--- a/WebCore/khtml/ecma/kjs_dom.h
+++ b/WebCore/khtml/ecma/kjs_dom.h
@@ -54,7 +54,7 @@ namespace KJS {
     virtual void pushEventHandlerScope(ExecState *exec, ScopeChain &scope) const;
 
     enum { NodeName, NodeValue, NodeType, ParentNode, ParentElement,
-           ChildNodes, FirstChild, LastChild, PreviousSibling, NextSibling,
+           ChildNodes, FirstChild, LastChild, PreviousSibling, NextSibling, Item,
            Attributes, NamespaceURI, Prefix, LocalName, OwnerDocument, InsertBefore,
            ReplaceChild, RemoveChild, AppendChild, HasAttributes, HasChildNodes,
            CloneNode, Normalize, IsSupported, AddEventListener, RemoveEventListener,
diff --git a/WebCore/khtml/ecma/kjs_dom.lut.h b/WebCore/khtml/ecma/kjs_dom.lut.h
index 1fbf889..b12fb98 100644
--- a/WebCore/khtml/ecma/kjs_dom.lut.h
+++ b/WebCore/khtml/ecma/kjs_dom.lut.h
@@ -5,7 +5,7 @@ namespace KJS {
 const struct HashEntry DOMNodeProtoTableEntries[] = {
    { 0, 0, 0, 0, 0 },
    { "hasAttributes", DOMNode::HasAttributes, DontDelete|Function, 0, 0 },
-   { "normalize", DOMNode::Normalize, DontDelete|Function, 0, 0 },
+   { "normalize", DOMNode::Normalize, DontDelete|Function, 0, &DOMNodeProtoTableEntries[16] },
    { "isSupported", DOMNode::IsSupported, DontDelete|Function, 2, 0 },
    { "removeEventListener", DOMNode::RemoveEventListener, DontDelete|Function, 3, 0 },
    { "hasChildNodes", DOMNode::HasChildNodes, DontDelete|Function, 0, &DOMNodeProtoTableEntries[15] },
@@ -18,10 +18,11 @@ const struct HashEntry DOMNodeProtoTableEntries[] = {
    { 0, 0, 0, 0, 0 },
    { "removeChild", DOMNode::RemoveChild, DontDelete|Function, 1, 0 },
    { "addEventListener", DOMNode::AddEventListener, DontDelete|Function, 3, 0 },
-   { "contains", DOMNode::Contains, DontDelete|Function, 1, 0 }
+   { "contains", DOMNode::Contains, DontDelete|Function, 1, 0 },
+   { "item", DOMNode::Item, DontDelete|Function, 1, 0 }
 };
 
-const struct HashTable DOMNodeProtoTable = { 2, 16, DOMNodeProtoTableEntries, 13 };
+const struct HashTable DOMNodeProtoTable = { 2, 17, DOMNodeProtoTableEntries, 13 };
 
 } // namespace
 

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list