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 /include/utils | |
| 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 'include/utils')
| -rw-r--r-- | include/utils/win/SkAutoCoInitialize.h | 2 | ||||
| -rw-r--r-- | include/utils/win/SkHRESULT.h | 2 | ||||
| -rw-r--r-- | include/utils/win/SkIStream.h | 3 | ||||
| -rw-r--r-- | include/utils/win/SkTScopedComPtr.h | 2 |
4 files changed, 6 insertions, 3 deletions
diff --git a/include/utils/win/SkAutoCoInitialize.h b/include/utils/win/SkAutoCoInitialize.h index 35fcce5b13..04709782ee 100644 --- a/include/utils/win/SkAutoCoInitialize.h +++ b/include/utils/win/SkAutoCoInitialize.h @@ -12,6 +12,8 @@ #ifdef SK_BUILD_FOR_WIN +#include "../../private/SkLeanWindows.h" + /** * An instance of this class initializes COM on creation * and closes the COM library on destruction. diff --git a/include/utils/win/SkHRESULT.h b/include/utils/win/SkHRESULT.h index a0ffd5935c..69a7118940 100644 --- a/include/utils/win/SkHRESULT.h +++ b/include/utils/win/SkHRESULT.h @@ -11,6 +11,8 @@ #include "SkTypes.h" #ifdef SK_BUILD_FOR_WIN +#include "../../private/SkLeanWindows.h" + void SkTraceHR(const char* file, unsigned long line, HRESULT hr, const char* msg); diff --git a/include/utils/win/SkIStream.h b/include/utils/win/SkIStream.h index 4a72f5b729..28a59f9a02 100644 --- a/include/utils/win/SkIStream.h +++ b/include/utils/win/SkIStream.h @@ -14,8 +14,7 @@ #ifdef SK_BUILD_FOR_WIN -#define WIN32_LEAN_AND_MEAN -#include <windows.h> +#include "../../private/SkLeanWindows.h" #include <ole2.h> class SkStream; diff --git a/include/utils/win/SkTScopedComPtr.h b/include/utils/win/SkTScopedComPtr.h index d2d925c56f..6fb6143adc 100644 --- a/include/utils/win/SkTScopedComPtr.h +++ b/include/utils/win/SkTScopedComPtr.h @@ -8,7 +8,7 @@ #ifndef SkTScopedComPtr_DEFINED #define SkTScopedComPtr_DEFINED -#include "SkTypes.h" +#include "../../private/SkLeanWindows.h" #ifdef SK_BUILD_FOR_WIN |