X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=src%2Fthird_party%2FWebKit%2FSource%2Fcore%2Fediting%2Fhtmlediting.cpp;h=7d8591fc4ea59d4a734b0ca6a11b29a6f767a64a;hb=ff3e2503a20db9193d323c1d19c38c68004dec4a;hp=0778bcf7258a4be12655589490e708ffe9aa3160;hpb=7338fba38ba696536d1cc9d389afd716a6ab2fe6;p=platform%2Fframework%2Fweb%2Fcrosswalk.git

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
--- 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)