Upstream version 9.38.198.0

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

diff --git a/src/third_party/WebKit/Source/core/editing/DeleteFromTextNodeCommand.cpp b/src/third_party/WebKit/Source/core/editing/DeleteFromTextNodeCommand.cpp
index fad7866..8fd9ad1 100644 (file)
--- a/src/third_party/WebKit/Source/core/editing/DeleteFromTextNodeCommand.cpp
+++ b/src/third_party/WebKit/Source/core/editing/DeleteFromTextNodeCommand.cpp
@@ -26,12 +26,11 @@
 #include "config.h"
 #include "core/editing/DeleteFromTextNodeCommand.h"
 
-#include "bindings/v8/ExceptionState.h"
-#include "bindings/v8/ExceptionStatePlaceholder.h"
-#include "core/dom/Document.h"
+#include "bindings/core/v8/ExceptionState.h"
+#include "bindings/core/v8/ExceptionStatePlaceholder.h"
 #include "core/dom/Text.h"
 
-namespace WebCore {
+namespace blink {
 
 DeleteFromTextNodeCommand::DeleteFromTextNodeCommand(PassRefPtrWillBeRawPtr<Text> node, unsigned offset, unsigned count)
     : SimpleEditCommand(node->document())
@@ -63,7 +62,7 @@ void DeleteFromTextNodeCommand::doUnapply()
 {
     ASSERT(m_node);
 
-    if (!m_node->rendererIsEditable())
+    if (!m_node->hasEditableStyle())
         return;
 
     m_node->insertData(m_offset, m_text, IGNORE_EXCEPTION, CharacterData::DeprecatedRecalcStyleImmediatlelyForEditing);
@@ -75,4 +74,4 @@ void DeleteFromTextNodeCommand::trace(Visitor* visitor)
     SimpleEditCommand::trace(visitor);
 }
 
-} // namespace WebCore
+} // namespace blink