Upstream version 9.38.198.0

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

diff --git a/src/third_party/WebKit/Source/core/editing/SplitTextNodeCommand.cpp b/src/third_party/WebKit/Source/core/editing/SplitTextNodeCommand.cpp
index e4a3bd2..b7d03c9 100644 (file)
--- a/src/third_party/WebKit/Source/core/editing/SplitTextNodeCommand.cpp
+++ b/src/third_party/WebKit/Source/core/editing/SplitTextNodeCommand.cpp
@@ -26,14 +26,14 @@
 #include "config.h"
 #include "core/editing/SplitTextNodeCommand.h"
 
-#include "bindings/v8/ExceptionState.h"
-#include "bindings/v8/ExceptionStatePlaceholder.h"
+#include "bindings/core/v8/ExceptionState.h"
+#include "bindings/core/v8/ExceptionStatePlaceholder.h"
 #include "core/dom/Document.h"
 #include "core/dom/DocumentMarkerController.h"
 #include "core/dom/Text.h"
 #include "wtf/Assertions.h"
 
-namespace WebCore {
+namespace blink {
 
 SplitTextNodeCommand::SplitTextNodeCommand(PassRefPtrWillBeRawPtr<Text> text, int offset)
     : SimpleEditCommand(text->document())
@@ -53,7 +53,7 @@ SplitTextNodeCommand::SplitTextNodeCommand(PassRefPtrWillBeRawPtr<Text> text, in
 void SplitTextNodeCommand::doApply()
 {
     ContainerNode* parent = m_text2->parentNode();
-    if (!parent || !parent->rendererIsEditable())
+    if (!parent || !parent->hasEditableStyle())
         return;
 
     String prefixText = m_text2->substringData(0, m_offset, IGNORE_EXCEPTION);
@@ -69,7 +69,7 @@ void SplitTextNodeCommand::doApply()
 
 void SplitTextNodeCommand::doUnapply()
 {
-    if (!m_text1 || !m_text1->rendererIsEditable())
+    if (!m_text1 || !m_text1->hasEditableStyle())
         return;
 
     ASSERT(m_text1->document() == document());
@@ -88,7 +88,7 @@ void SplitTextNodeCommand::doReapply()
         return;
 
     ContainerNode* parent = m_text2->parentNode();
-    if (!parent || !parent->rendererIsEditable())
+    if (!parent || !parent->hasEditableStyle())
         return;
 
     insertText1AndTrimText2();
@@ -110,4 +110,4 @@ void SplitTextNodeCommand::trace(Visitor* visitor)
     SimpleEditCommand::trace(visitor);
 }
 
-} // namespace WebCore
+} // namespace blink