Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(103)

Side by Side Diff: include/core/SkTypeface.h

Issue 113543005: Fix race on creating the default typeface. (Closed) Base URL: http://skia.googlecode.com/svn/trunk/
Patch Set: Remove unwanted whitespace. Created 6 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | src/core/SkTypeface.cpp » ('j') | src/core/SkTypeface.cpp » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 1
2 /* 2 /*
3 * Copyright 2006 The Android Open Source Project 3 * Copyright 2006 The Android Open Source Project
4 * 4 *
5 * Use of this source code is governed by a BSD-style license that can be 5 * Use of this source code is governed by a BSD-style license that can be
6 * found in the LICENSE file. 6 * found in the LICENSE file.
7 */ 7 */
8 8
9 9
10 #ifndef SkTypeface_DEFINED 10 #ifndef SkTypeface_DEFINED
(...skipping 316 matching lines...) Expand 10 before | Expand all | Expand 10 after
327 virtual bool onGetKerningPairAdjustments(const uint16_t glyphs[], int count, 327 virtual bool onGetKerningPairAdjustments(const uint16_t glyphs[], int count,
328 int32_t adjustments[]) const; 328 int32_t adjustments[]) const;
329 329
330 virtual LocalizedStrings* onCreateFamilyNameIterator() const = 0; 330 virtual LocalizedStrings* onCreateFamilyNameIterator() const = 0;
331 331
332 virtual int onGetTableTags(SkFontTableTag tags[]) const = 0; 332 virtual int onGetTableTags(SkFontTableTag tags[]) const = 0;
333 virtual size_t onGetTableData(SkFontTableTag, size_t offset, 333 virtual size_t onGetTableData(SkFontTableTag, size_t offset,
334 size_t length, void* data) const = 0; 334 size_t length, void* data) const = 0;
335 335
336 private: 336 private:
337 static void create_default_typeface(Style style);
338
337 SkFontID fUniqueID; 339 SkFontID fUniqueID;
338 Style fStyle; 340 Style fStyle;
339 bool fIsFixedPitch; 341 bool fIsFixedPitch;
340 342
341 friend class SkPaint; 343 friend class SkPaint;
342 friend class SkGlyphCache; // GetDefaultTypeface 344 friend class SkGlyphCache; // GetDefaultTypeface
343 // just so deprecated fonthost can call protected methods 345 // just so deprecated fonthost can call protected methods
344 friend class SkFontHost; 346 friend class SkFontHost;
345 347
346 typedef SkWeakRefCnt INHERITED; 348 typedef SkWeakRefCnt INHERITED;
347 }; 349 };
348 350
349 #endif 351 #endif
OLDNEW
« no previous file with comments | « no previous file | src/core/SkTypeface.cpp » ('j') | src/core/SkTypeface.cpp » ('J')

Powered by Google App Engine
This is Rietveld 408576698