diff options
author | weili <weili@chromium.org> | 2016-06-20 11:41:56 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2016-06-20 11:41:56 -0700 |
commit | 4701fcddeddfef7bccbceaf0f439dee82c3639f0 (patch) | |
tree | cdad6c0635837c9ff4d4fcfa3ad192640d4dd9d2 /core/fxge/apple/fx_mac_imp.cpp | |
parent | bff506d3b5e03891c137d9fe18f65cae112ebf2a (diff) | |
download | pdfium-4701fcddeddfef7bccbceaf0f439dee82c3639f0.tar.xz |
Fix clang_use_chrome_plugin for Mac and Skia builds
These changes are specific to Mac and Skia builds. They are
needed for these builds to compile with clang_use_chrome_plugin.
BUG=pdfium:469
Review-Url: https://codereview.chromium.org/2081523002
Diffstat (limited to 'core/fxge/apple/fx_mac_imp.cpp')
-rw-r--r-- | core/fxge/apple/fx_mac_imp.cpp | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/core/fxge/apple/fx_mac_imp.cpp b/core/fxge/apple/fx_mac_imp.cpp index a0f2acb370..528b7274db 100644 --- a/core/fxge/apple/fx_mac_imp.cpp +++ b/core/fxge/apple/fx_mac_imp.cpp @@ -25,15 +25,18 @@ static const struct { {"Times-BoldItalic", "Times New Roman Bold Italic"}, {"Times-Italic", "Times New Roman Italic"}, }; + class CFX_MacFontInfo : public CFX_FolderFontInfo { public: - virtual void* MapFont(int weight, - FX_BOOL bItalic, - int charset, - int pitch_family, - const FX_CHAR* family, - int& iExact); + // CFX_FolderFontInfo + void* MapFont(int weight, + FX_BOOL bItalic, + int charset, + int pitch_family, + const FX_CHAR* family, + int& iExact) override; }; + #define JAPAN_GOTHIC "Hiragino Kaku Gothic Pro W6" #define JAPAN_MINCHO "Hiragino Mincho Pro W6" static void GetJapanesePreference(CFX_ByteString& face, |