Unify glyph metrics to use the same Skia API

third_party/WebKit/Source/platform/fonts/SimpleFontData.h

 /*
  * This file is part of the internal font implementation.
  *
  * Copyright (C) 2006, 2008, 2010 Apple Inc. All rights reserved.
  * Copyright (C) 2007-2008 Torch Mobile, Inc.
  *
  * 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.
@@ skipping 14 matching lines @@
 #define SimpleFontData_h
 
 #include "platform/PlatformExport.h"
 #include "platform/fonts/CustomFontData.h"
 #include "platform/fonts/FontBaseline.h"
 #include "platform/fonts/FontData.h"
 #include "platform/fonts/FontMetrics.h"
 #include "platform/fonts/FontPlatformData.h"
 #include "platform/fonts/GlyphMetricsMap.h"
 #include "platform/fonts/GlyphPageTreeNode.h"
+#include "platform/fonts/SimpleFontDataInlineHeaders.h"
 #include "platform/fonts/TypesettingFeatures.h"
 #include "platform/fonts/opentype/OpenTypeVerticalData.h"
 #include "platform/geometry/FloatRect.h"
 #include "wtf/PtrUtil.h"
 #include "wtf/text/StringHash.h"
+#include <SkPaint.h>
 #include <memory>
 
 namespace blink {
 
 class FontDescription;
 
 enum FontDataVariant { AutoVariant, NormalVariant, SmallCapsVariant, EmphasisMarkVariant };
 
 class PLATFORM_EXPORT SimpleFontData : public FontData {
 public:
@@ skipping 38 matching lines @@
     float sizePerUnit() const { return platformData().size() / (getFontMetrics().unitsPerEm() ? getFontMetrics().unitsPerEm() : 1); }
     float internalLeading() const { return getFontMetrics().floatHeight() - platformData().size(); }
 
     float maxCharWidth() const { return m_maxCharWidth; }
     void setMaxCharWidth(float maxCharWidth) { m_maxCharWidth = maxCharWidth; }
 
     float avgCharWidth() const { return m_avgCharWidth; }
     void setAvgCharWidth(float avgCharWidth) { m_avgCharWidth = avgCharWidth; }
 
     FloatRect boundsForGlyph(Glyph) const;
-    float widthForGlyph(Glyph glyph) const;
     FloatRect platformBoundsForGlyph(Glyph) const;
+    float widthForGlyph(Glyph) const;
     float platformWidthForGlyph(Glyph) const;
 
     float spaceWidth() const { return m_spaceWidth; }
     void setSpaceWidth(float spaceWidth) { m_spaceWidth = spaceWidth; }
 
     Glyph spaceGlyph() const { return m_spaceGlyph; }
     void setSpaceGlyph(Glyph spaceGlyph) { m_spaceGlyph = spaceGlyph; }
     Glyph zeroGlyph() const { return m_zeroGlyph; }
     void setZeroGlyph(Glyph zeroGlyph) { m_zeroGlyph = zeroGlyph; }
 
@@ skipping 26 matching lines @@
     void platformInit();
     void platformGlyphInit();
 
     PassRefPtr<SimpleFontData> createScaledFontData(const FontDescription&, float scaleFactor) const;
 
     FontMetrics m_fontMetrics;
     float m_maxCharWidth;
     float m_avgCharWidth;
 
     FontPlatformData m_platformData;
-
     mutable std::unique_ptr<GlyphMetricsMap<FloatRect>> m_glyphToBoundsMap;
     mutable GlyphMetricsMap<float> m_glyphToWidthMap;
+    SkPaint m_paint;
 
     bool m_isTextOrientationFallback;
     RefPtr<OpenTypeVerticalData> m_verticalData;
     bool m_hasVerticalGlyphs;
 
     Glyph m_spaceGlyph;
     float m_spaceWidth;
     Glyph m_zeroGlyph;
 
     GlyphData m_missingGlyphData;
@@ skipping 16 matching lines @@
             : forCustomFont(custom)
         {
         }
     };
 
     mutable std::unique_ptr<DerivedFontData> m_derivedFontData;
 
     RefPtr<CustomFontData> m_customFontData;
 };
 
+
 ALWAYS_INLINE FloatRect SimpleFontData::boundsForGlyph(Glyph glyph) const
 {
-    FloatRect bounds;
+    if (!m_platformData.size())
+        return FloatRect();
+
+    SkASSERT(sizeof(glyph) == 2); // compile-time assert
+
+    FloatRect boundsResult;
     if (m_glyphToBoundsMap) {
-        bounds = m_glyphToBoundsMap->metricsForGlyph(glyph);
-        if (bounds.width() != cGlyphSizeUnknown)
-            return bounds;
+        boundsResult = m_glyphToBoundsMap->metricsForGlyph(glyph);
+        if (boundsResult.width() != cGlyphSizeUnknown)
+            return boundsResult;
     }
 
-    bounds = platformBoundsForGlyph(glyph);
+    boundsResult = platformBoundsForGlyph(glyph);
     if (!m_glyphToBoundsMap)
         m_glyphToBoundsMap = wrapUnique(new GlyphMetricsMap<FloatRect>);
-    m_glyphToBoundsMap->setMetricsForGlyph(glyph, bounds);
-    return bounds;
+    m_glyphToBoundsMap->setMetricsForGlyph(glyph, boundsResult);
+
+    return boundsResult;
 }
 
 ALWAYS_INLINE float SimpleFontData::widthForGlyph(Glyph glyph) const
 {
+    if (!m_platformData.size())
+        return 0;
+    SkASSERT(sizeof(glyph) == 2); // compile-time assert

[kojii, 2016/07/25 16:36:28]

Our current style guide allows the use of static_assert().

[drott, 2016/07/26 07:49:35]

Thanks, updated.

+
     float width = m_glyphToWidthMap.metricsForGlyph(glyph);
     if (width != cGlyphSizeUnknown)
         return width;
 
     width = platformWidthForGlyph(glyph);
 
     m_glyphToWidthMap.setMetricsForGlyph(glyph, width);
     return width;
 }
 
 DEFINE_FONT_DATA_TYPE_CASTS(SimpleFontData, false);
 
 } // namespace blink
 #endif // SimpleFontData_h