Upstream version 9.38.198.0

[platform/framework/web/crosswalk.git] / src / third_party / WebKit / Source / core / dom / PositionIterator.cpp

diff --git a/src/third_party/WebKit/Source/core/dom/PositionIterator.cpp b/src/third_party/WebKit/Source/core/dom/PositionIterator.cpp
index 147ab5e..2bbfbf8 100644 (file)
--- a/src/third_party/WebKit/Source/core/dom/PositionIterator.cpp
+++ b/src/third_party/WebKit/Source/core/dom/PositionIterator.cpp
@@ -30,7 +30,7 @@
 #include "core/html/HTMLHtmlElement.h"
 #include "core/rendering/RenderBlock.h"
 
-namespace WebCore {
+namespace blink {
 
 using namespace HTMLNames;
 
@@ -171,18 +171,18 @@ bool PositionIterator::isCandidate() const
         return false;
     }
 
-    if (isRenderedTableElement(m_anchorNode) || editingIgnoresContent(m_anchorNode))
+    if (isRenderedHTMLTableElement(m_anchorNode) || editingIgnoresContent(m_anchorNode))
         return (atStartOfNode() || atEndOfNode()) && !Position::nodeIsUserSelectNone(m_anchorNode->parentNode());
 
     if (!isHTMLHtmlElement(*m_anchorNode) && renderer->isRenderBlockFlow()) {
         if (toRenderBlock(renderer)->logicalHeight() || isHTMLBodyElement(*m_anchorNode)) {
             if (!Position::hasRenderedNonAnonymousDescendantsWithHeight(renderer))
                 return atStartOfNode() && !Position::nodeIsUserSelectNone(m_anchorNode);
-            return m_anchorNode->rendererIsEditable() && !Position::nodeIsUserSelectNone(m_anchorNode) && Position(*this).atEditingBoundary();
+            return m_anchorNode->hasEditableStyle() && !Position::nodeIsUserSelectNone(m_anchorNode) && Position(*this).atEditingBoundary();
         }
     }
 
     return false;
 }
 
-} // namespace WebCore
+} // namespace blink