diff options
| author |  mtklein <mtklein@chromium.org> | 2015-07-07 12:21:21 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2015-07-07 12:21:22 -0700 |
| commit | 1b24933e52f50773de29332387a12721811f3012 (patch) | |
| tree | 29850b1ed406ec73c69178aa87426e002170a986 /src/fonts | |
| parent | 8e0c1500a78f450115ce1a8de438d66e2e892cdc (diff) | |
Remove SkThread.h, include SkMutex.h or SkAtomics.h as appropriate.
SkThread.h doesn't do anything anymore execept include those two,
and thankfully, it doesn't seem to be mentioned outside Skia.
No public API changes.
TBR=reed@google.com
BUG=skia:
Committed: https://skia.googlesource.com/skia/+/c50acf2321d7a934c80d754e9cbe936dfb8eb4cc
Review URL: https://codereview.chromium.org/1215393002
Diffstat (limited to 'src/fonts')
| -rw-r--r-- | src/fonts/SkFontMgr_fontconfig.cpp | 6 | ||||
| -rw-r--r-- | src/fonts/SkTestScalerContext.cpp | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/fonts/SkFontMgr_fontconfig.cpp b/src/fonts/SkFontMgr_fontconfig.cpp index 9294990c98..0873aa105b 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. diff --git a/src/fonts/SkTestScalerContext.cpp b/src/fonts/SkTestScalerContext.cpp index 28b53b3a15..50706f66c3 100644 --- a/src/fonts/SkTestScalerContext.cpp +++ b/src/fonts/SkTestScalerContext.cpp @@ -42,7 +42,7 @@ SkTestFont::~SkTestFont() { #ifdef SK_DEBUG -#include "SkThread.h" +#include "SkMutex.h" SK_DECLARE_STATIC_MUTEX(gUsedCharsMutex); #endif |