Adjust glyph positions in RTL runs in SVGTextQuery

Source/core/layout/svg/SVGTextQuery.cpp

 /*
  * Copyright (C) Research In Motion Limited 2010-2012. 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
@@ skipping 265 matching lines @@
     }
 
     unsigned position;
     FloatPoint startPosition;
 };
 
 static FloatPoint calculateGlyphPositionWithoutTransform(const SVGTextQuery::Data* queryData, const SVGTextFragment& fragment, int offsetInFragment)
 {
     float glyphOffsetInDirection = 0;
     if (offsetInFragment) {
-        SVGTextMetrics metrics = SVGTextMetrics::measureCharacterRange(queryData->textLayoutObject, fragment.characterOffset, offsetInFragment, queryData->textLayoutObject->styleRef().direction());
+        SVGTextMetrics metrics = SVGTextMetrics::measureCharacterRange(queryData->textLayoutObject, fragment.characterOffset, offsetInFragment, queryData->textBox->direction());
         if (queryData->isVerticalText)
             glyphOffsetInDirection = metrics.height();
         else
             glyphOffsetInDirection = metrics.width();
     }
 
+    if (!queryData->textBox->isLeftToRightDirection()) {
+        float fragmentExtent = queryData->isVerticalText ? fragment.height : fragment.width;
+        glyphOffsetInDirection = fragmentExtent - glyphOffsetInDirection;
+    }
+
     FloatPoint glyphPosition(fragment.x, fragment.y);
     if (queryData->isVerticalText)
         glyphPosition.move(0, glyphOffsetInDirection);
     else
         glyphPosition.move(glyphOffsetInDirection, 0);
 
     return glyphPosition;
 }
 
 static FloatPoint calculateGlyphPosition(const SVGTextQuery::Data* queryData, const SVGTextFragment& fragment, int offsetInFragment)
@@ skipping 114 matching lines @@
 
 static inline void calculateGlyphBoundaries(SVGTextQuery::Data* queryData, const SVGTextFragment& fragment, int startPosition, FloatRect& extent)
 {
     float scalingFactor = queryData->textLayoutObject->scalingFactor();
     ASSERT(scalingFactor);
 
     FloatPoint glyphPosition = calculateGlyphPositionWithoutTransform(queryData, fragment, startPosition);
     glyphPosition.move(0, -queryData->textLayoutObject->scaledFont().fontMetrics().floatAscent() / scalingFactor);
     extent.setLocation(glyphPosition);
 
-    SVGTextMetrics metrics = SVGTextMetrics::measureCharacterRange(queryData->textLayoutObject, fragment.characterOffset + startPosition, 1, queryData->textLayoutObject->styleRef().direction());
-    extent.setSize(FloatSize(metrics.width(), metrics.height()));
+    // Use the SVGTextMetrics computed by SVGTextMetricsBuilder (which spends
+    // time attempting to compute more correct glyph bounds already, handling
+    // cursive scripts to some degree.)
+    Vector<SVGTextMetrics>& textMetricsValues = queryData->textLayoutObject->layoutAttributes()->textMetricsValues();
+    const SVGTextMetrics& metrics = textMetricsValues[fragment.characterOffset + startPosition];

[fs, 2015/03/30 12:01:19]

This was missing a piece... =/ - Uploaded it as
https://codereview.chromium.org/1045793002

+
+    // TODO(fs): Negative glyph extents seems kind of weird to have, but
+    // presently it can occur in some cases (like Arabic.)
+    FloatSize glyphSize(std::max<float>(metrics.width(), 0), std::max<float>(metrics.height(), 0));
+    extent.setSize(glyphSize);
+
+    // If RTL, adjust the starting point to align with the LHS of the glyph bounding box.
+    if (!queryData->textBox->isLeftToRightDirection()) {
+        if (queryData->isVerticalText)
+            extent.move(0, -glyphSize.height());
+        else
+            extent.move(-glyphSize.width(), 0);
+    }
 
     AffineTransform fragmentTransform;
     fragment.buildFragmentTransform(fragmentTransform, SVGTextFragment::TransformIgnoringTextLength);
 
     extent = fragmentTransform.mapRect(extent);
 }
 
 static inline FloatRect calculateFragmentBoundaries(const LayoutSVGInlineText& textLayoutObject, const SVGTextFragment& fragment)
 {
     float scalingFactor = textLayoutObject.scalingFactor();
@@ skipping 69 matching lines @@
 int SVGTextQuery::characterNumberAtPosition(const FloatPoint& position) const
 {
     CharacterNumberAtPositionData data(position);
     if (!executeQuery(&data, &SVGTextQuery::characterNumberAtPositionCallback))
         return -1;
 
     return data.processedCharacters;
 }
 
 }