diff options
| author | scottmg@chromium.org <scottmg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-06-19 01:20:12 +0000 |
|---|---|---|
| committer | scottmg@chromium.org <scottmg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-06-19 01:20:12 +0000 |
| commit | 1399f24ce315f875733ce548774a91d3f27b1f66 (patch) | |
| tree | 6b83b65bba5555bda79f239c89ffc81c5868deb3 /skia/skia_library.gypi | |
| parent | f1b75a3d17fb083d617ce6dc77b8ba8d728f9581 (diff) | |
| download | chromium_src-1399f24ce315f875733ce548774a91d3f27b1f66.zip chromium_src-1399f24ce315f875733ce548774a91d3f27b1f66.tar.gz chromium_src-1399f24ce315f875733ce548774a91d3f27b1f66.tar.bz2 | |
Customize SkFontMgr::Factory to control DirectWrite vs. GDI selection
Move SkFontMgr::Factory to skia/ext so that we can use the warmed-up
sandbox version when using DirectWrite that's created by content/. This
avoids the previous default behaviour of creating a GDI SkFontMgr which
is always wrong when DirectWrite is being used (and causes crashes
when --enable_win32k_renderer_lockdown is enabled).
R=jamesr@chromium.org,bungeman@google.com
BUG=385926,356950,385717
TEST=http://www.effectgames.com/demos/canvascycle/ http://www.w3schools.com/tags/tryit.asp?filename=tryhtml5_canvas_filltext and enabling FPS in about:flags with both --enable_win32k_renderer_lockdown and --disable-direct-write
Review URL: https://codereview.chromium.org/344653002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@278222 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'skia/skia_library.gypi')
| -rw-r--r-- | skia/skia_library.gypi | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/skia/skia_library.gypi b/skia/skia_library.gypi index b56a827..531d30b 100644 --- a/skia/skia_library.gypi +++ b/skia/skia_library.gypi @@ -52,7 +52,6 @@ '../third_party/skia/src/ports/SkFontConfigParser_android.cpp', '../third_party/skia/src/ports/SkFontHost_mac.cpp', '../third_party/skia/src/ports/SkFontHost_win.cpp', - '../third_party/skia/src/ports/SkFontMgr_default_gdi.cpp', '../third_party/skia/src/ports/SkFontMgr_win_dw.cpp', '../third_party/skia/src/ports/SkGlobalInitialization_chromium.cpp', '../third_party/skia/src/ports/SkOSFile_posix.cpp', @@ -342,7 +341,6 @@ ], },{ # not 'OS == "win"' 'sources!': [ - '../third_party/skia/src/ports/SkFontMgr_default_gdi.cpp', '../third_party/skia/src/ports/SkFontMgr_win_dw.cpp', '../third_party/skia/src/ports/SkRemotableFontMgr_win_dw.cpp', '../third_party/skia/src/ports/SkScalerContext_win_dw.cpp', |