Changeset 136198 in webkit

Timestamp:

Nov 29, 2012, 7:26:09 PM (14 years ago)

Author:

commit-queue@webkit.org

Message:

Node::isDescendantOf contains logic that duplicates isDocumentNode
​https://bugs.webkit.org/show_bug.cgi?id=103698

Patch by Elliott Sprehn <​esprehn@chromium.org> on 2012-11-29
Reviewed by Hajime Morita.

Instead of checking for documents with node->document() == node just
use node->isDocumentNode().

• dom/Node.cpp:

(WebCore::Node::isDescendantOf):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• dom/Node.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-11-29  Elliott Sprehn  <esprehn@chromium.org>
+
+        Node::isDescendantOf contains logic that duplicates isDocumentNode
+        https://bugs.webkit.org/show_bug.cgi?id=103698
+
+        Reviewed by Hajime Morita.
+
+        Instead of checking for documents with node->document() == node just
+        use node->isDocumentNode().
+
+        * dom/Node.cpp:
+        (WebCore::Node::isDescendantOf):
+
 2012-11-29  Alexey Proskuryakov  <ap@apple.com>
 

trunk/Source/WebCore/dom/Node.cpp

@@ -1158 +1158 @@
     if (!other || !other->hasChildNodes() || inDocument() != other->inDocument())
         return false;
-    if (other == other->document())
-        return document() == other && this != document() && inDocument();
+    if (other->isDocumentNode())
+        return document() == other && !isDocumentNode() && inDocument();
     for (const ContainerNode* n = parentNode(); n; n = n->parentNode()) {
         if (n == other)