diff options
| author |  halcanary <halcanary@google.com> | 2016-06-07 17:21:10 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-06-07 17:21:10 -0700 |
| commit | 4dbbd04314cc0606f8d3bafe515c97e52c180f73 (patch) | |
| tree | 9c5f935ce0a61cf51d0dfe0d62f727b72f5e8481 /tests | |
| parent | 50bcb189f8785a599a3024d8eba4681c2e8ca37a (diff) | |
SkLeanWindows.h: #include "Windows.h" fewer places
$ git grep -l '<windows.h>' include src
include/private/SkLeanWindows.h
$ git grep -l SkLeanWindows.h | grep '\.h$'
include/ports/SkTypeface_win.h
include/utils/win/SkHRESULT.h
include/utils/win/SkTScopedComPtr.h
include/views/SkEvent.h
src/core/SkMathPriv.h
src/ports/SkTypeface_win_dw.h
src/utils/SkThreadUtils_win.h
src/utils/win/SkWGL.h
The same for `#include <intrin.h>` that was found in SkMath.h.
Those functions that needed it are moved to SkMathPriv.h.
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2041943002
CQ_INCLUDE_TRYBOTS=tryserver.chromium.win:win_chromium_compile_dbg_ng,win_chromium_compile_rel_ng
Review-Url: https://codereview.chromium.org/2041943002
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/ClipStackTest.cpp | 2 | ||||
| -rw-r--r-- | tests/PathCoverageTest.cpp | 2 | ||||
| -rw-r--r-- | tests/PathTest.cpp | 2 | ||||
| -rw-r--r-- | tests/SubsetPath.cpp | 1 |
4 files changed, 4 insertions, 3 deletions
diff --git a/tests/ClipStackTest.cpp b/tests/ClipStackTest.cpp index a18d1efe06..c2ad21b24d 100644 --- a/tests/ClipStackTest.cpp +++ b/tests/ClipStackTest.cpp @@ -1011,7 +1011,7 @@ static void test_reduced_clip_stack(skiatest::Reporter* reporter) { } } -#if defined(WIN32) +#ifdef SK_BUILD_FOR_WIN #define SUPPRESS_VISIBILITY_WARNING #else #define SUPPRESS_VISIBILITY_WARNING __attribute__((visibility("hidden"))) diff --git a/tests/PathCoverageTest.cpp b/tests/PathCoverageTest.cpp index 303ddcc4cb..255156394a 100644 --- a/tests/PathCoverageTest.cpp +++ b/tests/PathCoverageTest.cpp @@ -5,7 +5,7 @@ * found in the LICENSE file. */ -#include "SkMath.h" +#include "SkMathPriv.h" #include "SkPoint.h" #include "SkScalar.h" #include "Test.h" diff --git a/tests/PathTest.cpp b/tests/PathTest.cpp index 9de5f81661..5bc3d95b6f 100644 --- a/tests/PathTest.cpp +++ b/tests/PathTest.cpp @@ -180,7 +180,7 @@ static void test_path_to_region(skiatest::Reporter* reporter) { } } -#if defined(WIN32) +#ifdef SK_BUILD_FOR_WIN #define SUPPRESS_VISIBILITY_WARNING #else #define SUPPRESS_VISIBILITY_WARNING __attribute__((visibility("hidden"))) diff --git a/tests/SubsetPath.cpp b/tests/SubsetPath.cpp index e67df1210b..6a7660e527 100644 --- a/tests/SubsetPath.cpp +++ b/tests/SubsetPath.cpp @@ -6,6 +6,7 @@ */ #include "SubsetPath.h" +#include "SkMathPriv.h" SubsetPath::SubsetPath(const SkPath& path) : fPath(path) |