Merge changes Ide388898,Ic49f367c,I1158a808,Iacb6ca5d,I2100dd3a,I5c1abe54,Ib0ef9902,I31dbc523,I570314b3

* changes:
  Merge WebKit at r75315: Update WebKit version
  Merge WebKit at r75315: Add FrameLoaderClient PageCache stubs
  Merge WebKit at r75315: Stub out AXObjectCache::remove()
  Merge WebKit at r75315: Fix ImageBuffer
  Merge WebKit at r75315: Fix PluginData::initPlugins()
  Merge WebKit at r75315: Fix conflicts
  Merge WebKit at r75315: Fix Makefiles
  Merge WebKit at r75315: Move Android-specific WebCore files to Source
  Merge WebKit at r75315: Initial merge by git.

1 files changed, 112 insertions, 0 deletions

diff --git a/Source/WebCore/editing/HTMLInterchange.cpp b/Source/WebCore/editing/HTMLInterchange.cpp
new file mode 100644
index 0000000..16b330d
--- /dev/null
+++ b/Source/WebCore/editing/HTMLInterchange.cpp
@@ -0,0 +1,112 @@
+/*
+ * Copyright (C) 2004, 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 "HTMLInterchange.h"
+
+#include "CharacterNames.h"
+#include "Text.h"
+#include "TextIterator.h"
+#include <wtf/StdLibExtras.h>
+
+namespace WebCore {
+
+namespace {
+
+String convertedSpaceString()
+{
+    DEFINE_STATIC_LOCAL(String, convertedSpaceString, ());
+    if (convertedSpaceString.isNull()) {
+        convertedSpaceString = "<span class=\"";
+        convertedSpaceString += AppleConvertedSpace;
+        convertedSpaceString += "\">";
+        convertedSpaceString.append(noBreakSpace);
+        convertedSpaceString += "</span>";
+    }
+    return convertedSpaceString;
+}
+
+} // end anonymous namespace
+
+String convertHTMLTextToInterchangeFormat(const String& in, const Text* node)
+{
+    // Assume all the text comes from node.
+    if (node->renderer() && node->renderer()->style()->preserveNewline())
+        return in;
+
+    Vector<UChar> s;
+
+    unsigned i = 0;
+    unsigned consumed = 0;
+    while (i < in.length()) {
+        consumed = 1;
+        if (isCollapsibleWhitespace(in[i])) {
+            // count number of adjoining spaces
+            unsigned j = i + 1;
+            while (j < in.length() && isCollapsibleWhitespace(in[j]))
+                j++;
+            unsigned count = j - i;
+            consumed = count;
+            while (count) {
+                unsigned add = count % 3;
+                switch (add) {
+                    case 0:
+                        append(s, convertedSpaceString());
+                        s.append(' ');
+                        append(s, convertedSpaceString());
+                        add = 3;
+                        break;
+                    case 1:
+                        if (i == 0 || i + 1 == in.length()) // at start or end of string
+                            append(s, convertedSpaceString());
+                        else
+                            s.append(' ');
+                        break;
+                    case 2:
+                        if (i == 0) {
+                             // at start of string
+                            append(s, convertedSpaceString());
+                            s.append(' ');
+                        } else if (i + 2 == in.length()) {
+                             // at end of string
+                            append(s, convertedSpaceString());
+                            append(s, convertedSpaceString());
+                        } else {
+                            append(s, convertedSpaceString());
+                            s.append(' ');
+                        }
+                        break;
+                }
+                count -= add;
+            }
+        } else
+            s.append(in[i]);
+        i += consumed;
+    }
+
+    return String::adopt(s);
+}
+
+} // namespace WebCore