Merge 77766

Source/WebCore/svg/SVGFont.cpp

 /*
  * Copyright (C) 2007, 2008 Nikolas Zimmermann <zimmermann@kde.org>
  * 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,
@@ skipping 225 matching lines @@
         , m_walkerData(data)
         , m_walkerCallback(callback)
         , m_walkerMissingGlyphCallback(missingGlyphCallback)
     {
     }
 
     void walk(const TextRun& run, bool isVerticalText, const String& language, int from, int to)
     {
         ASSERT(0 <= from && from <= to && to - from <= run.length());
 
-        const String text = Font::normalizeSpaces(String(run.data(from), run.length()));
+        const String text = Font::normalizeSpaces(String(run.data(from), to - from));
         Vector<SVGGlyphIdentifier::ArabicForm> chars(charactersWithArabicForm(text, run.rtl()));
 
         SVGGlyphIdentifier identifier;
         bool foundGlyph = false;
         int characterLookupRange;
         int endOfScanRange = to + m_walkerData.extraCharsAvailable;
 
         bool haveAltGlyph = false;
         SVGGlyphIdentifier altGlyphIdentifier;
         if (RenderObject* renderObject = run.referencingRenderObject()) {
@@ skipping 325 matching lines @@
 {
     // TODO: Fix text selection when HTML text is drawn using a SVG Font
     // We need to integrate the SVG text selection code in the offsetForPosition() framework.
     // This will also fix a major issue, that SVG Text code can't select arabic strings properly.
     return 0;
 }
 
 }
 
 #endif