Changeset 67618 in webkit

Timestamp:

Sep 16, 2010 8:05:58 AM (14 years ago)

Author:

ap@apple.com

Message:

2010-09-16 Alexey Proskuryakov <​ap@apple.com>

Reviewed by Adam Barth.

​https://bugs.webkit.org/show_bug.cgi?id=45852
Range::selectNode and selectNodeContents misbehave when argument is in another document

• fast/dom/Range/select-node-different-document-expected.txt: Added.
• fast/dom/Range/select-node-different-document.html: Added.

2010-09-16 Alexey Proskuryakov <​ap@apple.com>

Reviewed by Adam Barth.

​https://bugs.webkit.org/show_bug.cgi?id=45852
Range::selectNode and selectNodeContents misbehave when argument is in another document

Test: fast/dom/Range/select-node-different-document.html

There is nothing in DOM Traversal spec that says this shouldn't work, and it does work in
Firefox.

• dom/Range.cpp: (WebCore::Range::setDocument): (WebCore::Range::selectNode): (WebCore::Range::selectNodeContents):
• dom/Range.h:

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/dom/Range/select-node-different-document-expected.txt (added)
• LayoutTests/fast/dom/Range/select-node-different-document.html (added)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/dom/Range.cpp (modified) (3 diffs)
• WebCore/dom/Range.h (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2010-09-16  Alexey Proskuryakov  <ap@apple.com>
+
+        Reviewed by Adam Barth.
+
+        https://bugs.webkit.org/show_bug.cgi?id=45852
+        Range::selectNode and selectNodeContents misbehave when argument is in another document
+
+        * fast/dom/Range/select-node-different-document-expected.txt: Added.
+        * fast/dom/Range/select-node-different-document.html: Added.
+
 2010-09-16  Satish Sampath  <satish@chromium.org>
 

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-09-16  Alexey Proskuryakov  <ap@apple.com>
+
+        Reviewed by Adam Barth.
+
+        https://bugs.webkit.org/show_bug.cgi?id=45852
+        Range::selectNode and selectNodeContents misbehave when argument is in another document
+
+        Test: fast/dom/Range/select-node-different-document.html
+
+        There is nothing in DOM Traversal spec that says this shouldn't work, and it does work in
+        Firefox.
+
+        * dom/Range.cpp:
+        (WebCore::Range::setDocument):
+        (WebCore::Range::selectNode):
+        (WebCore::Range::selectNodeContents):
+        * dom/Range.h:
+
 2010-09-16  Andrey Kosyakov  <caseq@chromium.org>
 

trunk/WebCore/dom/Range.cpp

@@ -106 +106 @@
     rangeCounter.decrement();
 #endif
+}
+
+void Range::setDocument(Document* document)
+{
+    ASSERT(m_ownerDocument != document);
+    if (m_ownerDocument)
+        m_ownerDocument->detachRange(this);
+    m_ownerDocument = document;
+    m_start.setToStartOfNode(document);
+    m_end.setToStartOfNode(document);
+    m_ownerDocument->attachRange(this);
 }
 
@@ -1317 +1328 @@
     }
 
+    if (m_ownerDocument != refNode->document())
+        setDocument(refNode->document());
+
     ec = 0;
     setStartBefore(refNode, ec);
@@ -1359 +1373 @@
     }
 
+    if (m_ownerDocument != refNode->document())
+        setDocument(refNode->document());
+
     m_start.setToStartOfNode(refNode);
     m_end.setToEndOfNode(refNode);

trunk/WebCore/dom/Range.h

@@ -136 +136 @@
     Range(PassRefPtr<Document>, PassRefPtr<Node> startContainer, int startOffset, PassRefPtr<Node> endContainer, int endOffset);
 
+    void setDocument(Document*);
+
     Node* checkNodeWOffset(Node*, int offset, ExceptionCode&) const;
     void checkNodeBA(Node*, ExceptionCode&) const;