Changeset 13555 in webkit

Timestamp:

Mar 29, 2006 1:38:54 AM (18 years ago)

Author:

mjs

Message:

LayoutTests:

Reviewed by Anders.

Test cases for Element.contains, including testing fix for
<rdar://problem/4405353> JavaScript flickers popups onmouseover

• fast/dom/Element/contains-method-expected.txt: Added.
• fast/dom/Element/contains-method.html: Added.
• fast/dom/Element/resources/contains-method.js: Added.
• fast/events/capture-on-target.html:

WebCore:

Reviewed by Anders.

• fixed <rdar://problem/4454976> repro crash in -[NSTextView(NSSharing) setSelectedRanges:affinity:stillSelecting:] when navigating

Also fixed other issues with contains. The problem that caused the bug was:

• contains should return true for the element itself, unlike isAncestor

Other problems I fixed:

• contains shouldn't be present on non-Element nodes
• contains should return false when passed a non-Element node
• contains should return false when passed a non-Node

• bindings/scripts/CodeGeneratorJS.pm: Handle Element as a parameter.
• dom/Element.cpp: (WebCore::Element::contains): Added new implementation.
• dom/Element.h: Added prototype for contains.
• dom/Element.idl: Added IDL declaration for contains.
• khtml/ecma/kjs_dom.cpp: (KJS::DOMNodeProtoFunc::callAsFunction): Added old wrong contains().

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/dom/Element/contains-method-expected.txt (added)
• LayoutTests/fast/dom/Element/contains-method.html (added)
• LayoutTests/fast/dom/Element/resources/contains-method.js (added)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/bindings/scripts/CodeGeneratorJS.pm (modified) (3 diffs)
• WebCore/dom/Element.cpp (modified) (1 diff)
• WebCore/dom/Element.h (modified) (1 diff)
• WebCore/dom/Element.idl (modified) (1 diff)
• WebCore/khtml/ecma/kjs_dom.cpp (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2006-03-29  Maciej Stachowiak  <mjs@apple.com>
+
+        Reviewed by Anders.
+        
+        Test cases for Element.contains, including testing fix for
+        <rdar://problem/4405353> JavaScript flickers popups onmouseover
+
+        * fast/dom/Element/contains-method-expected.txt: Added.
+        * fast/dom/Element/contains-method.html: Added.
+        * fast/dom/Element/resources/contains-method.js: Added.
+        * fast/events/capture-on-target.html:
+
 2006-03-28  Beth Dakin  <bdakin@apple.com>
 

trunk/WebCore/ChangeLog

@@ +1 @@
+2006-03-29  Maciej Stachowiak  <mjs@apple.com>
+
+        Reviewed by Anders.
+        
+        - fixed  <rdar://problem/4454976> repro crash in -[NSTextView(NSSharing) setSelectedRanges:affinity:stillSelecting:] when navigating
+        
+        Also fixed other issues with contains. The problem that caused the bug was:
+        - contains should return true for the element itself, unlike isAncestor
+        
+        Other problems I fixed:
+        - contains shouldn't be present on non-Element nodes
+        - contains should return false when passed a non-Element node
+        - contains should return false when passed a non-Node
+
+        * bindings/scripts/CodeGeneratorJS.pm: Handle Element as a parameter.
+        * dom/Element.cpp:
+        (WebCore::Element::contains): Added new implementation.
+        * dom/Element.h: Added prototype for contains.
+        * dom/Element.idl: Added IDL declaration for contains.
+        * khtml/ecma/kjs_dom.cpp:
+        (KJS::DOMNodeProtoFunc::callAsFunction): Added old wrong contains().
+
 2006-03-28  Beth Dakin  <bdakin@apple.com>
 

trunk/WebCore/bindings/scripts/CodeGeneratorJS.pm

@@ -711 +711 @@
     return "AbstractView*";
   } elsif ($type eq "Node" or
+           $type eq "Element" or
            $type eq "Attr" or
            $type eq "DocumentType" or
@@ -748 +749 @@
   } elsif ($type eq "Node") {
       return 0;
+  } elsif ($type eq "Element") {
+      return 0;
   } elsif ($type eq "Attr") {
       $implIncludes{"ExceptionCode.h"} = 1;
@@ -807 +810 @@
       $implIncludes{"JSRange.h"} = 1;
       return "toRange($value)";
+  } elsif ($type eq "Element") {
+    $implIncludes{"kjs_dom.h"} = 1;
+    return "toElement($value)";
   } else {
     die "Don't know how to convert a JS value of type $type."

trunk/WebCore/dom/Element.cpp

@@ -289 +289 @@
 }
 
+bool Element::contains(const Element* element) const
+{
+    if (!element)
+        return false;
+    return this == element || element->isAncestor(this);
+}
+
 void Element::createAttributeMap() const
 {

trunk/WebCore/dom/Element.h

@@ -144 +144 @@
 
     Node* insertAdjacentElement(const String& where, Node* newChild, int& exception);
+    bool contains(const Element*) const;
  
 protected:

trunk/WebCore/dom/Element.idl

@@ -80 +80 @@
         void blur();
 
-        // IE only extension
-        Node insertAdjacentElement(in DOMString position, 
-                                   in Node newAttr)
-            raises(DOMException);
-
         readonly attribute CSSStyleDeclaration style;
 
+        // IE only extensions
+        Node insertAdjacentElement(in DOMString position, 
+                                   in Node newElement)
+            raises(DOMException);
+        
+        boolean contains(in Element element);
     };
 

trunk/WebCore/khtml/ecma/kjs_dom.cpp

@@ -88 +88 @@
   lookupNamespaceURI    DOMNode::LookupNamespaceURI DontDelete|Function 1
   lookupPrefix  DOMNode::LookupPrefix   DontDelete|Function 1
-# IE extension
-  contains      DOMNode::Contains       DontDelete|Function 1
 # "DOM level 0" (from Gecko DOM reference; also in WinIE)
   item          DOMNode::Item           DontDelete|Function 1
@@ -321 +319 @@
         return args[1];
       return jsNull();
-    case DOMNode::Contains:
-      if (node.isElementNode())
-        if (Node *node0 = toNode(args[0]))
-          return jsBoolean(node.isAncestor(node0));
-      // FIXME: Is there a good reason to return undefined rather than false
-      // when the parameter is not a node? When the object is not an element?
-      return jsUndefined();
     case DOMNode::Item:
       return thisObj->get(exec, args[0]->toInt32(exec));