diff options
| author |  Ben Wagner <bungeman@google.com> | 2016-11-07 18:05:29 -0500 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2016-11-08 20:20:15 +0000 |
| commit | bf111d7bc9ba3857433e30eae27f0272c34ed0fb (patch) | |
| tree | 878660f011e2513791d588b621bc16fa047484da /tools | |
| parent | fa2c4788ce04f80ff7a5887613d93a4053cd174b (diff) | |
Move SkOSPath out of include/core.
It is moved to src/utils. It is almost a tool, but has two uses in
src/ports.
The existing SkOSFile.cpp is left empty for the time being since it is
mentioned in Chromium's BUILD.gn for Skia.
Change-Id: I3bb7f7c4214359eb6ab906bfe76737d20bf1d6c7
Reviewed-on: https://skia-review.googlesource.com/4536
Reviewed-by: Mike Klein <mtklein@chromium.org>
Commit-Queue: Ben Wagner <bungeman@google.com>
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/Resources.cpp | 1 | ||||
| -rw-r--r-- | tools/flags/SkCommonFlags.cpp | 1 | ||||
| -rw-r--r-- | tools/get_images_from_skps.cpp | 1 | ||||
| -rw-r--r-- | tools/picture_utils.cpp | 1 | ||||
| -rw-r--r-- | tools/skdiff/skdiff_main.cpp | 3 | ||||
| -rw-r--r-- | tools/skpbench/skpbench.cpp | 1 | ||||
| -rw-r--r-- | tools/viewer/Viewer.cpp | 1 |
7 files changed, 8 insertions, 1 deletions
diff --git a/tools/Resources.cpp b/tools/Resources.cpp index dcca202e42..3a9bb58c4e 100644 --- a/tools/Resources.cpp +++ b/tools/Resources.cpp @@ -12,6 +12,7 @@ #include "SkImage.h" #include "SkImageGenerator.h" #include "SkOSFile.h" +#include "SkOSPath.h" #include "SkStream.h" #include "SkTypeface.h" diff --git a/tools/flags/SkCommonFlags.cpp b/tools/flags/SkCommonFlags.cpp index a0aa94bdc0..02d8054f23 100644 --- a/tools/flags/SkCommonFlags.cpp +++ b/tools/flags/SkCommonFlags.cpp @@ -7,6 +7,7 @@ #include "SkCommonFlags.h" #include "SkOSFile.h" +#include "SkOSPath.h" DEFINE_bool(cpu, true, "master switch for running CPU-bound work."); diff --git a/tools/get_images_from_skps.cpp b/tools/get_images_from_skps.cpp index b8a893001b..6cd35122ad 100644 --- a/tools/get_images_from_skps.cpp +++ b/tools/get_images_from_skps.cpp @@ -12,6 +12,7 @@ #include "SkJSONCPP.h" #include "SkMD5.h" #include "SkOSFile.h" +#include "SkOSPath.h" #include "SkPicture.h" #include "SkPixelSerializer.h" #include "SkStream.h" diff --git a/tools/picture_utils.cpp b/tools/picture_utils.cpp index b252f8da62..43ca2f07bf 100644 --- a/tools/picture_utils.cpp +++ b/tools/picture_utils.cpp @@ -11,6 +11,7 @@ #include "SkHalf.h" #include "SkImageEncoder.h" #include "SkOSFile.h" +#include "SkOSPath.h" #include "SkPM4fPriv.h" #include "SkPicture.h" #include "SkStream.h" diff --git a/tools/skdiff/skdiff_main.cpp b/tools/skdiff/skdiff_main.cpp index c51cd28d78..b4e560729c 100644 --- a/tools/skdiff/skdiff_main.cpp +++ b/tools/skdiff/skdiff_main.cpp @@ -12,6 +12,7 @@ #include "SkForceLinking.h" #include "SkImageEncoder.h" #include "SkOSFile.h" +#include "SkOSPath.h" #include "SkStream.h" #include "../private/SkTDArray.h" #include "../private/SkTSearch.h" @@ -40,7 +41,7 @@ typedef StringArray FileArray; static void add_unique_basename(StringArray* array, const SkString& filename) { // trim off dirs const char* src = filename.c_str(); - const char* trimmed = strrchr(src, SkPATH_SEPARATOR); + const char* trimmed = strrchr(src, SkOSPath::SEPARATOR); if (trimmed) { trimmed += 1; // skip the separator } else { diff --git a/tools/skpbench/skpbench.cpp b/tools/skpbench/skpbench.cpp index f452d9d025..897878e27d 100644 --- a/tools/skpbench/skpbench.cpp +++ b/tools/skpbench/skpbench.cpp @@ -9,6 +9,7 @@ #include "GrContextFactory.h" #include "SkCanvas.h" #include "SkOSFile.h" +#include "SkOSPath.h" #include "SkPerlinNoiseShader.h" #include "SkPicture.h" #include "SkPictureRecorder.h" diff --git a/tools/viewer/Viewer.cpp b/tools/viewer/Viewer.cpp index d92b80139d..3db858a02d 100644 --- a/tools/viewer/Viewer.cpp +++ b/tools/viewer/Viewer.cpp @@ -19,6 +19,7 @@ #include "SkGraphics.h" #include "SkMetaData.h" #include "SkOSFile.h" +#include "SkOSPath.h" #include "SkRandom.h" #include "SkStream.h" #include "SkSurface.h" |