Changeset 66655 in webkit

Timestamp:

Sep 2, 2010 3:49:55 AM (14 years ago)

Author:

andreas.kling@nokia.com

Message:

2010-09-01 Andreas Kling <​andreas.kling@nokia.com>

Reviewed by Darin Adler.

DOM Selection: collapse() and selectAllChildren() should throw WRONG_DOCUMENT_ERR if node belongs to other document
​https://bugs.webkit.org/show_bug.cgi?id=44595

Spec links:
​http://www.whatwg.org/specs/web-apps/current-work/#dom-selection-collapse
​http://www.whatwg.org/specs/web-apps/current-work/#dom-selection-selectallchildren

Test: fast/dom/Selection/wrong-document-err.html

• page/DOMSelection.cpp: (WebCore::DOMSelection::collapse): (WebCore::DOMSelection::selectAllChildren):

2010-09-01 Andreas Kling <​andreas.kling@nokia.com>

Reviewed by Darin Adler.

DOM Selection: collapse() and selectAllChildren() should throw WRONG_DOCUMENT_ERR if node belongs to other document
​https://bugs.webkit.org/show_bug.cgi?id=44595

Spec links:
​http://www.whatwg.org/specs/web-apps/current-work/#dom-selection-collapse
​http://www.whatwg.org/specs/web-apps/current-work/#dom-selection-selectallchildren

• fast/dom/Selection/script-tests/wrong-document-err.js: Added.
• fast/dom/Selection/wrong-document-err-expected.txt: Added.
• fast/dom/Selection/wrong-document-err.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/page/DOMSelection.cpp (modified) (3 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2010-09-01  Andreas Kling  <andreas.kling@nokia.com>
+
+        Reviewed by Darin Adler.
+
+        DOM Selection: collapse() and selectAllChildren() should throw WRONG_DOCUMENT_ERR if node belongs to other document
+        https://bugs.webkit.org/show_bug.cgi?id=44595
+
+        Spec links:
+        http://www.whatwg.org/specs/web-apps/current-work/#dom-selection-collapse
+        http://www.whatwg.org/specs/web-apps/current-work/#dom-selection-selectallchildren
+
+        * fast/dom/Selection/script-tests/wrong-document-err.js: Added.
+        * fast/dom/Selection/wrong-document-err-expected.txt: Added.
+        * fast/dom/Selection/wrong-document-err.html: Added.
+
 2010-09-02  Tony Gentilcore  <tonyg@chromium.org>
 

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-09-01  Andreas Kling  <andreas.kling@nokia.com>
+
+        Reviewed by Darin Adler.
+
+        DOM Selection: collapse() and selectAllChildren() should throw WRONG_DOCUMENT_ERR if node belongs to other document
+        https://bugs.webkit.org/show_bug.cgi?id=44595
+
+        Spec links:
+        http://www.whatwg.org/specs/web-apps/current-work/#dom-selection-collapse
+        http://www.whatwg.org/specs/web-apps/current-work/#dom-selection-selectallchildren
+
+        Test: fast/dom/Selection/wrong-document-err.html
+
+        * page/DOMSelection.cpp:
+        (WebCore::DOMSelection::collapse):
+        (WebCore::DOMSelection::selectAllChildren):
+
 2010-09-02  Eric Seidel  <eric@webkit.org>
 

trunk/WebCore/page/DOMSelection.cpp

@@ -201 +201 @@
 void DOMSelection::collapse(Node* node, int offset, ExceptionCode& ec)
 {
-    if (!m_frame)
-        return;
+    Document* selectionDocument = m_frame ? m_frame->document() : 0;
+    Document* nodeDocument = node ? node->document() : 0;
+
+    if (selectionDocument != nodeDocument) {
+        ec = WRONG_DOCUMENT_ERR;
+        return;
+    }
 
     if (offset < 0) {
@@ -208 +213 @@
         return;
     }
+
+    if (!m_frame)
+        return;
 
     if (!isValidForPosition(node))
@@ -489 +497 @@
         return;
 
+    Document* selectionDocument = m_frame ? m_frame->document() : 0;
+
+    if (selectionDocument != n->document()) {
+        ec = WRONG_DOCUMENT_ERR;
+        return;
+    }
+
     // This doesn't (and shouldn't) select text node characters.
     setBaseAndExtent(n, 0, n, n->childNodeCount(), ec);