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 2ca40f0..8fd9ad1 100644 (file)
--- a/src/third_party/WebKit/Source/core/editing/DeleteFromTextNodeCommand.cpp
+++ b/src/third_party/WebKit/Source/core/editing/DeleteFromTextNodeCommand.cpp
@@ -26,14 +26,13 @@
 #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(PassRefPtr<Text> node, unsigned offset, unsigned count)
+DeleteFromTextNodeCommand::DeleteFromTextNodeCommand(PassRefPtrWillBeRawPtr<Text> node, unsigned offset, unsigned count)
     : SimpleEditCommand(node->document())
     , m_node(node)
     , m_offset(offset)
@@ -51,22 +50,28 @@ void DeleteFromTextNodeCommand::doApply()
     if (!m_node->isContentEditable(Node::UserSelectAllIsAlwaysNonEditable))
         return;
 
-    TrackExceptionState es;
-    m_text = m_node->substringData(m_offset, m_count, es);
-    if (es.hadException())
+    TrackExceptionState exceptionState;
+    m_text = m_node->substringData(m_offset, m_count, exceptionState);
+    if (exceptionState.hadException())
         return;
 
-    m_node->deleteData(m_offset, m_count, es, CharacterData::DeprecatedRecalcStyleImmediatlelyForEditing);
+    m_node->deleteData(m_offset, m_count, exceptionState, CharacterData::DeprecatedRecalcStyleImmediatlelyForEditing);
 }
 
 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);
 }
 
-} // namespace WebCore
+void DeleteFromTextNodeCommand::trace(Visitor* visitor)
+{
+    visitor->trace(m_node);
+    SimpleEditCommand::trace(visitor);
+}
+
+} // namespace blink