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, 100 insertions, 0 deletions

diff --git a/Source/WebCore/rendering/svg/SVGTextLayoutAttributes.cpp b/Source/WebCore/rendering/svg/SVGTextLayoutAttributes.cpp
new file mode 100644
index 0000000..3037b77
--- /dev/null
+++ b/Source/WebCore/rendering/svg/SVGTextLayoutAttributes.cpp
@@ -0,0 +1,100 @@
+/*
+ * Copyright (C) Research In Motion Limited 2010. All rights reserved.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB.  If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#include "config.h"
+
+#if ENABLE(SVG)
+#include "SVGTextLayoutAttributes.h"
+
+#include <stdio.h>
+#include <wtf/text/CString.h>
+
+namespace WebCore {
+
+SVGTextLayoutAttributes::SVGTextLayoutAttributes()
+{
+}
+
+void SVGTextLayoutAttributes::reserveCapacity(unsigned length)
+{
+    m_xValues.reserveCapacity(length);
+    m_yValues.reserveCapacity(length);
+    m_dxValues.reserveCapacity(length);
+    m_dyValues.reserveCapacity(length);
+    m_rotateValues.reserveCapacity(length);
+}
+
+float SVGTextLayoutAttributes::emptyValue()
+{
+    static float s_emptyValue = std::numeric_limits<float>::max() - 1;
+    return s_emptyValue;
+}
+
+static inline void dumpLayoutVector(const Vector<float>& values)
+{
+    if (values.isEmpty()) {
+        fprintf(stderr, "empty");
+        return;
+    }
+
+    unsigned size = values.size();
+    for (unsigned i = 0; i < size; ++i) {
+        float value = values.at(i);
+        if (value == SVGTextLayoutAttributes::emptyValue())
+            fprintf(stderr, "x ");
+        else
+            fprintf(stderr, "%lf ", value);
+    }
+}
+
+void SVGTextLayoutAttributes::dump() const
+{
+    fprintf(stderr, "x values: ");
+    dumpLayoutVector(m_xValues);
+    fprintf(stderr, "\n");
+
+    fprintf(stderr, "y values: ");
+    dumpLayoutVector(m_yValues);
+    fprintf(stderr, "\n");
+
+    fprintf(stderr, "dx values: ");
+    dumpLayoutVector(m_dxValues);
+    fprintf(stderr, "\n");
+
+    fprintf(stderr, "dy values: ");
+    dumpLayoutVector(m_dyValues);
+    fprintf(stderr, "\n");
+
+    fprintf(stderr, "rotate values: ");
+    dumpLayoutVector(m_rotateValues);
+    fprintf(stderr, "\n");
+
+    fprintf(stderr, "character data values:\n");
+    unsigned textMetricsSize = m_textMetricsValues.size();
+    for (unsigned i = 0; i < textMetricsSize; ++i) {
+        const SVGTextMetrics& metrics = m_textMetricsValues.at(i);
+        fprintf(stderr, "| {length=%i, glyphName='%s', unicodeString='%s', width=%lf, height=%lf}\n",
+                metrics.length(), metrics.glyph().name.utf8().data(), metrics.glyph().unicodeString.utf8().data(), metrics.width(), metrics.height());
+    }
+    fprintf(stderr, "\n");
+}
+
+}
+
+#endif // ENABLE(SVG)