Change SimpleFontData::platformBoundsForGlyph to use getTextPath

Source/core/platform/graphics/skia/SimpleFontDataSkia.cpp

 /*
  * Copyright (c) 2008, 2009, Google 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:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 15 matching lines @@
  * 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 "core/platform/graphics/SimpleFontData.h"
 
 #include <unicode/normlzr.h>
 #include "SkPaint.h"
+#include "SkPath.h"
 #include "SkTypeface.h"
 #include "SkTypes.h"
 #include "core/platform/graphics/FloatRect.h"
 #include "core/platform/graphics/FontDescription.h"
 #include "core/platform/graphics/chromium/VDMXParser.h"
 #include "wtf/unicode/Unicode.h"
 
 #if OS(WIN)
 #include "core/platform/win/HWndDC.h"
 #endif
@@ skipping 160 matching lines @@
     }
 
     return true;
 }
 
 void SimpleFontData::determinePitch()
 {
     m_treatAsFixedPitch = platformData().isFixedPitch();
 }
 
+static inline void getSkiaBoundsForGlyph(SkPaint& paint, Glyph glyph, SkRect& bounds)
+{
+    paint.setTextEncoding(SkPaint::kGlyphID_TextEncoding);
+
+    SkPath path;
+    paint.getTextPath(&glyph, sizeof(glyph), 0, 0, &path);
+    bounds = path.getBounds();
+
+    // FIXME(eae): getBounds currently returns an empty rect for bitmap
+    // fonts so fall back on the old behavior. Once fixed in Skia this
+    // fallback can go away.

[leviw_travelin_and_unemployed, 2013/09/30 22:47:00]

Is there a crbug for this? If not please file.

+    if (bounds.isEmpty())
+        paint.measureText(&glyph, 2, &bounds);
+
+    if (!paint.isSubpixelText()) {
+        SkIRect ir;
+        bounds.round(&ir);
+        bounds.set(ir);
+    }
+}
+
 FloatRect SimpleFontData::platformBoundsForGlyph(Glyph glyph) const
 {
     if (!m_platformData.size())
         return FloatRect();
 
     SkASSERT(sizeof(glyph) == 2); // compile-time assert
 
     SkPaint paint;
-
     m_platformData.setupPaint(&paint);
 
-    paint.setTextEncoding(SkPaint::kGlyphID_TextEncoding);
     SkRect bounds;
-    paint.measureText(&glyph, 2, &bounds);
-    if (!paint.isSubpixelText()) {
-        SkIRect ir;
-        bounds.round(&ir);
-        bounds.set(ir);
-    }
+    getSkiaBoundsForGlyph(paint, glyph, bounds);
     return FloatRect(bounds);
 }
 
 float SimpleFontData::platformWidthForGlyph(Glyph glyph) const
 {
     if (!m_platformData.size())
         return 0;
 
     SkASSERT(sizeof(glyph) == 2); // compile-time assert
 
@@ skipping 30 matching lines @@
     paint.setTextEncoding(SkPaint::kUTF16_TextEncoding);
     if (paint.textToGlyphs(&normalizedCharacters[0], normalizedLength * 2, 0)) {
         addResult.iterator->value = true;
         return true;
     }
     return false;
 }
 #endif
 
 } // namespace WebCore