src/fonts/SkFontMgr_fontconfig.cpp - Issue 1214603003: Revert of Remove SkThread.h, include SkMutex.h or SkAtomics.h as appropriate.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: src/fonts/SkFontMgr_fontconfig.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, 6 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 side-by-side diff with in-line comments

Download patch

Index: src/fonts/SkFontMgr_fontconfig.cpp

diff --git a/src/fonts/SkFontMgr_fontconfig.cpp b/src/fonts/SkFontMgr_fontconfig.cpp

index 0873aa105b5d40c1fb46a2eb29f4faec84b0092f..9294990c980c00e35283016140b61e15b29acfce 100644

--- a/src/fonts/SkFontMgr_fontconfig.cpp

+++ b/src/fonts/SkFontMgr_fontconfig.cpp

@@ -5,14 +5,14 @@

* found in the LICENSE file.

+#include "SkFontMgr.h"

+#include "SkFontStyle.h"

#include "SkFontConfigInterface.h"

#include "SkFontConfigTypeface.h"

-#include "SkFontMgr.h"

-#include "SkFontStyle.h"

#include "SkMath.h"

-#include "SkMutex.h"

#include "SkString.h"

#include "SkTDArray.h"

+#include "SkThread.h"

// for now we pull these in directly. eventually we will solely rely on the

// SkFontConfigInterface instance.

« no previous file with comments | « src/core/SkTypefaceCache.cpp ('k') | src/fonts/SkTestScalerContext.cpp » ('j') | no next file with comments »