| Index: third_party/WebKit/Source/platform/fonts/SimpleFontData.h
|
| diff --git a/third_party/WebKit/Source/platform/fonts/SimpleFontData.h b/third_party/WebKit/Source/platform/fonts/SimpleFontData.h
|
| index 67b194ce87b398f6b859d5ebf7e6629d8a6cca13..b66bc807b5b0d6816bd51ba8ca1d36146b2d98dd 100644
|
| --- a/third_party/WebKit/Source/platform/fonts/SimpleFontData.h
|
| +++ b/third_party/WebKit/Source/platform/fonts/SimpleFontData.h
|
| @@ -69,11 +69,9 @@ class PLATFORM_EXPORT SimpleFontData : public FontData {
|
| static PassRefPtr<SimpleFontData> create(
|
| const FontPlatformData& platformData,
|
| PassRefPtr<CustomFontData> customData = nullptr,
|
| - bool isTextOrientationFallback = false,
|
| - bool subpixelAscentDescent = false) {
|
| + bool isTextOrientationFallback = false) {
|
| return adoptRef(new SimpleFontData(platformData, std::move(customData),
|
| - isTextOrientationFallback,
|
| - subpixelAscentDescent));
|
| + isTextOrientationFallback));
|
| }
|
|
|
| const FontPlatformData& platformData() const { return m_platformData; }
|
| @@ -161,14 +159,13 @@ class PLATFORM_EXPORT SimpleFontData : public FontData {
|
| protected:
|
| SimpleFontData(const FontPlatformData&,
|
| PassRefPtr<CustomFontData> customData,
|
| - bool isTextOrientationFallback = false,
|
| - bool subpixelAscentDescent = false);
|
| + bool isTextOrientationFallback = false);
|
|
|
| // Only used for testing.
|
| SimpleFontData(const FontPlatformData&, PassRefPtr<OpenTypeVerticalData>);
|
|
|
| private:
|
| - void platformInit(bool subpixelAscentDescent);
|
| + void platformInit();
|
| void platformGlyphInit();
|
|
|
| PassRefPtr<SimpleFontData> createScaledFontData(const FontDescription&,
|
|
|