Node::parentOrHostElement(): Node::shadowHost() already returns an Element*

https://bugs.webkit.org/show_bug.cgi?id=77332

Reviewed by Kent Tamura.

No new tests. (simple refactoring)

* dom/Node.cpp:
(WebCore::Node::parentOrHostElement):

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@106242 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index 8f781b7..a12c653 100644 (file)
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,15 @@
+2012-01-30  Roland Steiner  <rolandsteiner@chromium.org>
+
+        Node::parentOrHostElement(): Node::shadowHost() already returns an Element*
+        https://bugs.webkit.org/show_bug.cgi?id=77332
+
+        Reviewed by Kent Tamura.
+
+        No new tests. (simple refactoring)
+
+        * dom/Node.cpp:
+        (WebCore::Node::parentOrHostElement):
+
 2012-01-30  Carlos Garcia Campos  <cgarcia@igalia.com>
 
         Unreviewed. Fix make distcheck.

diff --git a/Source/WebCore/dom/Node.cpp b/Source/WebCore/dom/Node.cpp
index 419f7b5..c13c2b0 100644 (file)
--- a/Source/WebCore/dom/Node.cpp
+++ b/Source/WebCore/dom/Node.cpp
@@ -1547,7 +1547,7 @@ Element* Node::parentOrHostElement() const
         return 0;
 
     if (parent->isShadowRoot())
-        parent = parent->shadowHost();
+        return parent->shadowHost();
 
     if (!parent->isElementNode())
         return 0;