summaryrefslogtreecommitdiffstats
path: root/skia
diff options
context:
space:
mode:
authorreed@google.com <reed@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2013-03-21 12:30:27 +0000
committerreed@google.com <reed@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2013-03-21 12:30:27 +0000
commit21ac2fddbc3b73496fb050b5e60a9cd108769625 (patch)
tree3c001485c6da9237b225829f91c20e24deececa1 /skia
parent03d5af59a72bae05de0840fb883ed13e9a1de279 (diff)
downloadchromium_src-21ac2fddbc3b73496fb050b5e60a9cd108769625.zip
chromium_src-21ac2fddbc3b73496fb050b5e60a9cd108769625.tar.gz
chromium_src-21ac2fddbc3b73496fb050b5e60a9cd108769625.tar.bz2
Pass our logfont-accessible function-ptr directly to skia, in preparation for
deprecating (removing) SkFontHost::EnsureTypefaceAccessible() Review URL: https://codereview.chromium.org/12690016 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@189583 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'skia')
-rw-r--r--skia/ext/skia_sandbox_support_win.cc6
1 files changed, 6 insertions, 0 deletions
diff --git a/skia/ext/skia_sandbox_support_win.cc b/skia/ext/skia_sandbox_support_win.cc
index 13efb80..0c1bf7b 100644
--- a/skia/ext/skia_sandbox_support_win.cc
+++ b/skia/ext/skia_sandbox_support_win.cc
@@ -12,6 +12,12 @@ SK_API void SetSkiaEnsureTypefaceAccessible(SkiaEnsureTypefaceAccessible func) {
// This function is supposed to be called once in process life time.
SkASSERT(g_skia_ensure_typeface_accessible == NULL);
g_skia_ensure_typeface_accessible = func;
+
+ // This is not hooked up in skia (yet), but soon it will replace having
+ // SkFontHost::EnsureTypefaceAccessible(). So for now we do both, but after
+ // the next skia DEPS roll, we will remove our global and our impl of
+ // SkFontHost::EnsureTypefaceAccessible().
+ SkTypeface_SetEnsureLOGFONTAccessibleProc(func);
}
// static