From cad810f21b803229eb11403f9209855525a25d57 Mon Sep 17 00:00:00 2001
From: Steve Block <steveblock@google.com>
Date: Fri, 6 May 2011 11:45:16 +0100
Subject: Merge WebKit at r75315: Initial merge by git.

Change-Id: I570314b346ce101c935ed22a626b48c2af266b84
---
 Source/WebCore/editing/JoinTextNodesCommand.cpp | 78 +++++++++++++++++++++++++
 1 file changed, 78 insertions(+)
 create mode 100644 Source/WebCore/editing/JoinTextNodesCommand.cpp

(limited to 'Source/WebCore/editing/JoinTextNodesCommand.cpp')

diff --git a/Source/WebCore/editing/JoinTextNodesCommand.cpp b/Source/WebCore/editing/JoinTextNodesCommand.cpp
new file mode 100644
index 0000000..2766b84
--- /dev/null
+++ b/Source/WebCore/editing/JoinTextNodesCommand.cpp
@@ -0,0 +1,78 @@
+/*
+ * Copyright (C) 2005, 2008 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE COMPUTER, INC. OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
+ */
+
+#include "config.h"
+#include "JoinTextNodesCommand.h"
+
+#include "Text.h"
+
+namespace WebCore {
+
+JoinTextNodesCommand::JoinTextNodesCommand(PassRefPtr<Text> text1, PassRefPtr<Text> text2)
+    : SimpleEditCommand(text1->document()), m_text1(text1), m_text2(text2)
+{
+    ASSERT(m_text1);
+    ASSERT(m_text2);
+    ASSERT(m_text1->nextSibling() == m_text2);
+    ASSERT(m_text1->length() > 0);
+    ASSERT(m_text2->length() > 0);
+}
+
+void JoinTextNodesCommand::doApply()
+{
+    if (m_text1->nextSibling() != m_text2)
+        return;
+
+    ContainerNode* parent = m_text2->parentNode();
+    if (!parent || !parent->isContentEditable())
+        return;
+    
+    ExceptionCode ec = 0;
+    m_text2->insertData(0, m_text1->data(), ec);
+    if (ec)
+        return;
+
+    m_text1->remove(ec);
+}
+
+void JoinTextNodesCommand::doUnapply()
+{
+    if (m_text1->parentNode())
+        return;
+
+    ContainerNode* parent = m_text2->parentNode();
+    if (!parent || !parent->isContentEditable())
+        return;
+
+    ExceptionCode ec = 0;
+
+    parent->insertBefore(m_text1.get(), m_text2.get(), ec);
+    if (ec)
+        return;
+
+    m_text2->deleteData(0, m_text1->length(), ec);
+}
+
+} // namespace WebCore
-- 
cgit v1.1