diff options
author | 2015-07-07 12:21:21 -0700 | |
---|---|---|
committer | 2015-07-07 12:21:22 -0700 | |
commit | 1b24933e52f50773de29332387a12721811f3012 (patch) | |
tree | 29850b1ed406ec73c69178aa87426e002170a986 /src/views | |
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/views')
-rw-r--r-- | src/views/SkEvent.cpp | 2 | ||||
-rw-r--r-- | src/views/SkEventSink.cpp | 6 | ||||
-rw-r--r-- | src/views/SkOSMenu.cpp | 4 |
3 files changed, 5 insertions, 7 deletions
diff --git a/src/views/SkEvent.cpp b/src/views/SkEvent.cpp index 52a0c4dd7f..5f204c0f0f 100644 --- a/src/views/SkEvent.cpp +++ b/src/views/SkEvent.cpp @@ -265,7 +265,7 @@ void SkEvent::inflate(const SkDOM& dom, const SkDOM::Node* node) #define EVENT_LOGN(s, n) #endif -#include "SkThread.h" +#include "SkMutex.h" #include "SkTime.h" class SkEvent_Globals { diff --git a/src/views/SkEventSink.cpp b/src/views/SkEventSink.cpp index 7763adef54..42c1ceb062 100644 --- a/src/views/SkEventSink.cpp +++ b/src/views/SkEventSink.cpp @@ -8,10 +8,8 @@ #include "SkEventSink.h" +#include "SkMutex.h" #include "SkTagList.h" -#include "SkThread.h" - -#include "SkThread.h" #include "SkTime.h" class SkEventSink_Globals { @@ -256,7 +254,7 @@ SkEventSink* SkEventSink::FindSink(SkEventSinkID sinkID) #if 0 // experimental, not tested -#include "SkThread.h" +#include "SkMutex.h" #include "SkTDict.h" #define kMinStringBufferSize 128 diff --git a/src/views/SkOSMenu.cpp b/src/views/SkOSMenu.cpp index ad0c73f80d..8c2e47602f 100644 --- a/src/views/SkOSMenu.cpp +++ b/src/views/SkOSMenu.cpp @@ -4,9 +4,9 @@ * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ -#include <stdarg.h> +#include "SkAtomics.h" #include "SkOSMenu.h" -#include "SkThread.h" +#include <stdarg.h> static int gOSMenuCmd = 7000; |