Remove Simple Text Path

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 12 matching lines @@
 
 #ifndef SimpleFontData_h
 #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/GlyphPageTreeNode.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>
 
 #if OS(MACOSX)
 #include "platform/fonts/GlyphMetricsMap.h"
 #endif
 
 namespace blink {
 
+// Holds the glyph index and the corresponding SimpleFontData information for a
+// given
+// character.
+struct GlyphData {
+  GlyphData(Glyph g = 0, const SimpleFontData* f = 0) : glyph(g), fontData(f) {}
+  Glyph glyph;
+  const SimpleFontData* fontData;
+};
+
 class FontDescription;
 
 enum FontDataVariant {
   AutoVariant,
   NormalVariant,
   SmallCapsVariant,
   EmphasisMarkVariant
 };
 
 class PLATFORM_EXPORT SimpleFontData : public FontData {
  public:
   // Used to create platform fonts.
   static PassRefPtr<SimpleFontData> create(
       const FontPlatformData& platformData,
       PassRefPtr<CustomFontData> customData = nullptr,
       bool isTextOrientationFallback = false,
       bool subpixelAscentDescent = false) {
     return adoptRef(new SimpleFontData(platformData, std::move(customData),
                                        isTextOrientationFallback,
                                        subpixelAscentDescent));
   }
 
-  ~SimpleFontData() override;
-
   const FontPlatformData& platformData() const { return m_platformData; }
   const OpenTypeVerticalData* verticalData() const {
     return m_verticalData.get();
   }
 
   PassRefPtr<SimpleFontData> smallCapsFontData(const FontDescription&) const;
   PassRefPtr<SimpleFontData> emphasisMarkFontData(const FontDescription&) const;
 
   PassRefPtr<SimpleFontData> variantFontData(const FontDescription& description,
                                              FontDataVariant variant) const {
@@ skipping 64 matching lines @@
 
   const GlyphData& missingGlyphData() const { return m_missingGlyphData; }
   void setMissingGlyphData(const GlyphData& glyphData) {
     m_missingGlyphData = glyphData;
   }
 
   bool canRenderCombiningCharacterSequence(const UChar*, size_t) const;
 
   CustomFontData* customFontData() const { return m_customFontData.get(); }
 
-  // Implemented by the platform.
-  virtual bool fillGlyphPage(GlyphPage* pageToFill,
-                             unsigned offset,
-                             unsigned length,
-                             UChar* buffer,
-                             unsigned bufferLength) const;
-
  protected:
   SimpleFontData(const FontPlatformData&,
                  PassRefPtr<CustomFontData> customData,
                  bool isTextOrientationFallback = false,
                  bool subpixelAscentDescent = false);
 
   SimpleFontData(PassRefPtr<CustomFontData> customData,
                  float fontSize,
                  bool syntheticBold,
                  bool syntheticItalic);
@@ skipping 20 matching lines @@
   float m_spaceWidth;
   Glyph m_zeroGlyph;
 
   GlyphData m_missingGlyphData;
 
   struct DerivedFontData {
     USING_FAST_MALLOC(DerivedFontData);
     WTF_MAKE_NONCOPYABLE(DerivedFontData);
 
    public:
-    static std::unique_ptr<DerivedFontData> create(bool forCustomFont);
-    ~DerivedFontData();
+    static std::unique_ptr<DerivedFontData> create();
 
-    bool forCustomFont;
     RefPtr<SimpleFontData> smallCaps;
     RefPtr<SimpleFontData> emphasisMark;
     RefPtr<SimpleFontData> verticalRightOrientation;
     RefPtr<SimpleFontData> uprightOrientation;
 
    private:
-    DerivedFontData(bool custom) : forCustomFont(custom) {}
+    DerivedFontData() {}
   };
 
   mutable std::unique_ptr<DerivedFontData> m_derivedFontData;
 
   RefPtr<CustomFontData> m_customFontData;
 
 // See discussion on crbug.com/631032 and Skiaissue
 // https://bugs.chromium.org/p/skia/issues/detail?id=5328 :
 // On Mac we're still using path based glyph metrics, and they seem to be
 // too slow to be able to remove the caching layer we have here.
@@ skipping 35 matching lines @@
 
   m_glyphToWidthMap.setMetricsForGlyph(glyph, width);
   return width;
 #endif
 }
 
 DEFINE_FONT_DATA_TYPE_CASTS(SimpleFontData, false);
 
 }  // namespace blink
 #endif  // SimpleFontData_h