Upstream version 7.36.149.0

[platform/framework/web/crosswalk.git] / src / third_party / WebKit / Source / core / dom / ElementTraversal.h

diff --git a/src/third_party/WebKit/Source/core/dom/ElementTraversal.h b/src/third_party/WebKit/Source/core/dom/ElementTraversal.h
index e6d7e92..e824182 100644 (file)
--- a/src/third_party/WebKit/Source/core/dom/ElementTraversal.h
+++ b/src/third_party/WebKit/Source/core/dom/ElementTraversal.h
@@ -119,7 +119,10 @@ template <>
 template <class NodeType>
 inline Element* Traversal<Element>::lastWithinTemplate(NodeType& current)
 {
-    return lastChildTemplate(current);
+    Node* node = NodeTraversal::lastWithin(current);
+    while (node && !node->isElementNode())
+        node = NodeTraversal::previous(*node, &current);
+    return toElement(node);
 }
 
 template <>