Upstream version 5.34.104.0

[platform/framework/web/crosswalk.git] / src / third_party / WebKit / Source / core / editing / htmlediting.cpp

diff --git a/src/third_party/WebKit/Source/core/editing/htmlediting.cpp b/src/third_party/WebKit/Source/core/editing/htmlediting.cpp
index 0778bcf..7d8591f 100644 (file)
--- a/src/third_party/WebKit/Source/core/editing/htmlediting.cpp
+++ b/src/third_party/WebKit/Source/core/editing/htmlediting.cpp
@@ -158,7 +158,7 @@ bool isEditablePosition(const Position& p, EditableType editableType, EUpdateSty
     else
         ASSERT(updateStyle == DoNotUpdateStyle);
 
-    if (isTableElement(node))
+    if (isRenderedTableElement(node))
         node = node->parentNode();
 
     return node->rendererIsEditable(editableType);
@@ -177,7 +177,7 @@ bool isRichlyEditablePosition(const Position& p, EditableType editableType)
     if (!node)
         return false;
 
-    if (isTableElement(node))
+    if (isRenderedTableElement(node))
         node = node->parentNode();
 
     return node->rendererIsRichlyEditable(editableType);
@@ -189,7 +189,7 @@ Element* editableRootForPosition(const Position& p, EditableType editableType)
     if (!node)
         return 0;
 
-    if (isTableElement(node))
+    if (isRenderedTableElement(node))
         node = node->parentNode();
 
     return node->rootEditableElement(editableType);
@@ -723,12 +723,12 @@ bool canMergeLists(Element* firstList, Element* secondList)
     // Make sure there is no visible content between this li and the previous list
 }
 
-bool isTableElement(const Node* node)
+bool isRenderedTableElement(const Node* node)
 {
     if (!node || !node->isElementNode())
         return false;
 
-    return node->hasTagName(tableTag);
+    return node->renderer() && node->hasTagName(tableTag);
 }
 
 bool isRenderedTable(const Node* node)