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 /tools | |
| 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 'tools')
| -rw-r--r-- | tools/sk_tool_utils_font.cpp | 2 | ||||
| -rw-r--r-- | tools/skpdiff/SkDiffContext.h | 12 |
2 files changed, 7 insertions, 7 deletions
diff --git a/tools/sk_tool_utils_font.cpp b/tools/sk_tool_utils_font.cpp index 925bd7dc76..7b95fb04e0 100644 --- a/tools/sk_tool_utils_font.cpp +++ b/tools/sk_tool_utils_font.cpp @@ -7,9 +7,9 @@ #include "Resources.h" #include "SkFontMgr.h" +#include "SkMutex.h" #include "SkOSFile.h" #include "SkTestScalerContext.h" -#include "SkThread.h" #include "SkUtils.h" #include "sk_tool_utils.h" diff --git a/tools/skpdiff/SkDiffContext.h b/tools/skpdiff/SkDiffContext.h index 8f4789fea6..9347d2651f 100644 --- a/tools/skpdiff/SkDiffContext.h +++ b/tools/skpdiff/SkDiffContext.h @@ -9,11 +9,11 @@ #define SkDiffContext_DEFINED #include "SkImageDiffer.h" +#include "SkMutex.h" #include "SkString.h" #include "SkTArray.h" #include "SkTDArray.h" #include "SkTLList.h" -#include "SkThread.h" class SkWStream; @@ -52,7 +52,7 @@ public: void setWhiteDiffDir(const SkString& directory); /** - * Modify the pattern used to generate commonName (= the + * Modify the pattern used to generate commonName (= the * basename of rgb/white diff files). * * - true: basename is a combination of the input file names. @@ -61,10 +61,10 @@ public: * For example, for: * baselinePath=/tmp/dir/image-before.png * testPath=/tmp/dir/image-after.png - * + * * If setLongNames(true), commonName would be: * image-before-png-vs-image-after-png.png - * + * * If setLongNames(false), commonName would be: * image-.png */ @@ -104,8 +104,8 @@ public: * * The format of the JSON document is one top level array named "records". * Each record in the array is an object with the following values: - * "commonName" : string containing the output filename (basename) - * depending on the value of 'longNames'. + * "commonName" : string containing the output filename (basename) + * depending on the value of 'longNames'. * (see 'setLongNames' for an explanation and example). * "baselinePath" : string containing the path to the baseline image * "testPath" : string containing the path to the test image |