aboutsummaryrefslogtreecommitdiffhomepage
path: root/include
diff options
context:
space:
mode:
authorGravatar bungeman@google.com <bungeman@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>2014-01-09 17:13:32 +0000
committerGravatar bungeman@google.com <bungeman@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>2014-01-09 17:13:32 +0000
commit18b75e54ab64763615e09761fcaeb3f439835f59 (patch)
tree9f4bdaff5e0fbf2fafdb59520f89281726d46d3e /include
parentff007e8ff358d9253de22291ebfd5fe7980512ed (diff)
Fix race on creating the default typeface.
BUG=skia:1906 R=mtklein@google.com, reed@google.com Review URL: https://codereview.chromium.org/113543005 git-svn-id: http://skia.googlecode.com/svn/trunk@12993 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'include')
-rw-r--r--include/core/SkTypeface.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/include/core/SkTypeface.h b/include/core/SkTypeface.h
index d873e69b9d..04838dad98 100644
--- a/include/core/SkTypeface.h
+++ b/include/core/SkTypeface.h
@@ -334,6 +334,8 @@ protected:
size_t length, void* data) const = 0;
private:
+ static void create_default_typeface(Style style);
+
SkFontID fUniqueID;
Style fStyle;
bool fIsFixedPitch;