Changeset 105649 in webkit

Timestamp:

Jan 23, 2012 3:46:15 PM (12 years ago)

Author:

commit-queue@webkit.org

Message:

​https://bugs.webkit.org/show_bug.cgi?id=75799
Calling intersectsNode on a detached range should throw.

Source/WebCore:

INVALID_STATE_ERR exception should be thrown if intersectsNode is called on a detached Range.

Patch by Joe Thomas <​joethomas@motorola.com> on 2012-01-23
Reviewed by Darin Adler.

Test: fast/dom/Range/range-intersectsNode-exception.html

• dom/Range.cpp:

(WebCore::Range::intersectsNode): Throwing INVALID_STATE_ERR exception if the range is detached.

LayoutTests:

Added test case to verify the exception thrown while calling intersectsNode on a detached range.

Patch by Joe Thomas <​joethomas@motorola.com> on 2012-01-23
Reviewed by Darin Adler.

• fast/dom/Range/range-intersectsNode-exception-expected.txt: Added.
• fast/dom/Range/range-intersectsNode-exception.html: Added.
• fast/dom/Range/range-intersectsNode-expected.txt:
• fast/dom/Range/resources/intersectsNode.js: Modified the test case to catch the exception.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/dom/Range/range-intersectsNode-exception-expected.txt (added)
• LayoutTests/fast/dom/Range/range-intersectsNode-exception.html (added)
• LayoutTests/fast/dom/Range/range-intersectsNode-expected.txt (modified) (1 diff)
• LayoutTests/fast/dom/Range/resources/intersectsNode.js (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/dom/Range.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2012-01-23  Joe Thomas  <joethomas@motorola.com>
+
+        https://bugs.webkit.org/show_bug.cgi?id=75799
+        Calling intersectsNode on a detached range should throw.
+
+        Added test case to verify the exception thrown while calling intersectsNode on a detached range.
+
+        Reviewed by Darin Adler.
+
+        * fast/dom/Range/range-intersectsNode-exception-expected.txt: Added.
+        * fast/dom/Range/range-intersectsNode-exception.html: Added.
+        * fast/dom/Range/range-intersectsNode-expected.txt:
+        * fast/dom/Range/resources/intersectsNode.js:  Modified the test case to catch the exception.
+
 2012-01-23  Mike Lawther  <mikelawther@chromium.org>
 

trunk/LayoutTests/fast/dom/Range/range-intersectsNode-expected.txt

@@ -45 +45 @@
 
 2.1 Detached Range, attached node
-PASS intersects is false
+PASS detachedRange.intersectsNode(document.getElementById('a1')) threw exception Error: INVALID_STATE_ERR: DOM Exception 11.
 
 2.2 attached range, detached node

trunk/LayoutTests/fast/dom/Range/resources/intersectsNode.js

@@ -96 +96 @@
 var detachedRange = document.createRange();
 detachedRange.detach();
-intersects = detachedRange.intersectsNode(document.getElementById("a1"));
-shouldBeFalse("intersects");
+shouldThrow("detachedRange.intersectsNode(document.getElementById('a1'))", '"Error: INVALID_STATE_ERR: DOM Exception 11"');
 debug("");
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-01-23  Joe Thomas  <joethomas@motorola.com>
+
+        https://bugs.webkit.org/show_bug.cgi?id=75799
+        Calling intersectsNode on a detached range should throw.
+
+        INVALID_STATE_ERR exception should be thrown if intersectsNode is called on a detached Range.
+
+        Reviewed by Darin Adler.
+
+        Test: fast/dom/Range/range-intersectsNode-exception.html
+
+        * dom/Range.cpp:
+        (WebCore::Range::intersectsNode): Throwing INVALID_STATE_ERR exception if the range is detached.
+
 2012-01-23  Daniel Cheng  <dcheng@chromium.org>
 

trunk/Source/WebCore/dom/Range.cpp

@@ -590 +590 @@
     // Returns a bool if the node intersects the range.
 
+    // Throw exception if the range is already detached.
+    if (!m_start.container()) {
+        ec = INVALID_STATE_ERR;
+        return false;
+    }
     if (!refNode) {
         ec = NOT_FOUND_ERR;
         return false;
     }
-    
-    if ((!m_start.container() && refNode->attached())
-            || (m_start.container() && !refNode->attached())
-            || refNode->document() != m_ownerDocument) {
+
+    if (!refNode->attached() || refNode->document() != m_ownerDocument) {
         // Firefox doesn't throw an exception for these cases; it returns false.
         return false;