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

Side by Side Diff: src/core/SkTypeface.cpp

Issue 1214603003: Revert of Remove SkThread.h, include SkMutex.h or SkAtomics.h as appropriate. (Closed) Base URL: https://skia.googlesource.com/skia@master
Patch Set: Created 5 years, 5 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
« no previous file with comments | « src/core/SkTLS.cpp ('k') | src/core/SkTypefaceCache.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright 2011 The Android Open Source Project 2 * Copyright 2011 The Android Open Source Project
3 * 3 *
4 * Use of this source code is governed by a BSD-style license that can be 4 * Use of this source code is governed by a BSD-style license that can be
5 * found in the LICENSE file. 5 * found in the LICENSE file.
6 */ 6 */
7 7
8 #include "SkAdvancedTypefaceMetrics.h" 8 #include "SkAdvancedTypefaceMetrics.h"
9 #include "SkEndian.h" 9 #include "SkEndian.h"
10 #include "SkFontDescriptor.h" 10 #include "SkFontDescriptor.h"
11 #include "SkFontMgr.h" 11 #include "SkFontMgr.h"
12 #include "SkLazyPtr.h" 12 #include "SkLazyPtr.h"
13 #include "SkMutex.h"
14 #include "SkOTTable_OS_2.h" 13 #include "SkOTTable_OS_2.h"
15 #include "SkStream.h" 14 #include "SkStream.h"
16 #include "SkTypeface.h" 15 #include "SkTypeface.h"
17 16
18 SkTypeface::SkTypeface(const SkFontStyle& style, SkFontID fontID, bool isFixedPi tch) 17 SkTypeface::SkTypeface(const SkFontStyle& style, SkFontID fontID, bool isFixedPi tch)
19 : fUniqueID(fontID), fStyle(style), fIsFixedPitch(isFixedPitch) { } 18 : fUniqueID(fontID), fStyle(style), fIsFixedPitch(isFixedPitch) { }
20 19
21 SkTypeface::~SkTypeface() { } 20 SkTypeface::~SkTypeface() { }
22 21
23 22
(...skipping 341 matching lines...) Expand 10 before | Expand all | Expand 10 after
365 if (ctx.get()) { 364 if (ctx.get()) {
366 SkPaint::FontMetrics fm; 365 SkPaint::FontMetrics fm;
367 ctx->getFontMetrics(&fm); 366 ctx->getFontMetrics(&fm);
368 bounds->set(fm.fXMin * invTextSize, fm.fTop * invTextSize, 367 bounds->set(fm.fXMin * invTextSize, fm.fTop * invTextSize,
369 fm.fXMax * invTextSize, fm.fBottom * invTextSize); 368 fm.fXMax * invTextSize, fm.fBottom * invTextSize);
370 return true; 369 return true;
371 } 370 }
372 return false; 371 return false;
373 } 372 }
374 373
OLDNEW
« no previous file with comments | « src/core/SkTLS.cpp ('k') | src/core/SkTypefaceCache.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698