src/ports/SkFontHost_mac.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/ports/SkFontHost_mac.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/ports/SkFontHost_mac.cpp

diff --git a/src/ports/SkFontHost_mac.cpp b/src/ports/SkFontHost_mac.cpp

index 5ad1c2fb5ea5ca0b0211df61fe723f0ad4a767fe..22e295470507fda645e6a747adbe762de9e530bb 100755

--- a/src/ports/SkFontHost_mac.cpp

+++ b/src/ports/SkFontHost_mac.cpp

@@ -24,13 +24,12 @@

#include "SkColorPriv.h"

#include "SkDescriptor.h"

#include "SkEndian.h"

+#include "SkFontDescriptor.h"

#include "SkFloatingPoint.h"

-#include "SkFontDescriptor.h"

-#include "SkFontMgr.h"

#include "SkGlyph.h"

#include "SkLazyFnPtr.h"

#include "SkMaskGamma.h"

-#include "SkMutex.h"

+#include "SkSFNTHeader.h"

#include "SkOTTable_glyf.h"

#include "SkOTTable_head.h"

#include "SkOTTable_hhea.h"

@@ -38,12 +37,13 @@

#include "SkOTUtils.h"

#include "SkPaint.h"

#include "SkPath.h"

-#include "SkSFNTHeader.h"

+#include "SkString.h"

#include "SkStream.h"

-#include "SkString.h"

-#include "SkTypefaceCache.h"

+#include "SkThread.h"

#include "SkTypeface_mac.h"

#include "SkUtils.h"

+#include "SkTypefaceCache.h"

+#include "SkFontMgr.h"

#include "SkUtils.h"

#include <dlfcn.h>

« no previous file with comments | « src/ports/SkFontHost_FreeType_common.h ('k') | src/ports/SkFontHost_win.cpp » ('j') | no next file with comments »