commit 4dbbd04314cc0606f8d3bafe515c97e52c180f73
author halcanary <halcanary@google.com> Tue Jun 07 17:21:10 2016 -0700
committer Commit bot <commit-bot@chromium.org> Tue Jun 07 17:21:10 2016 -0700
tree 9c5f935ce0a61cf51d0dfe0d62f727b72f5e8481
parent 50bcb189f8785a599a3024d8eba4681c2e8ca37a

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

src/ports/SkDebug_win.cpp

diff --git a/src/ports/SkDebug_win.cpp b/src/ports/SkDebug_win.cpp
index b0c5725..da1e2b5 100644
--- a/src/ports/SkDebug_win.cpp
+++ b/src/ports/SkDebug_win.cpp
@@ -5,16 +5,16 @@
  * found in the LICENSE file.
  */
 
-
-
 #include "SkTypes.h"
+
 #if defined(SK_BUILD_FOR_WIN32)
 
-static const size_t kBufferSize = 2048;
+#include "SkLeanWindows.h"
 
 #include <stdarg.h>
 #include <stdio.h>
-#include <windows.h>
+
+static const size_t kBufferSize = 2048;
 
 void SkDebugf(const char format[], ...) {
     char    buffer[kBufferSize + 1];

src/ports/SkFontHost_mac.cpp

diff --git a/src/ports/SkFontHost_mac.cpp b/src/ports/SkFontHost_mac.cpp
index 0cc436f..c129a6b 100644
--- a/src/ports/SkFontHost_mac.cpp
+++ b/src/ports/SkFontHost_mac.cpp
@@ -29,6 +29,7 @@
 #include "SkFontMgr.h"
 #include "SkGlyph.h"
 #include "SkMaskGamma.h"
+#include "SkMathPriv.h"
 #include "SkMutex.h"
 #include "SkOTTable_glyf.h"
 #include "SkOTTable_head.h"

src/ports/SkOSFile_win.cpp

diff --git a/src/ports/SkOSFile_win.cpp b/src/ports/SkOSFile_win.cpp
index 6bdf9ab..cf46cea 100644
--- a/src/ports/SkOSFile_win.cpp
+++ b/src/ports/SkOSFile_win.cpp
@@ -8,8 +8,8 @@
 #include "SkTypes.h"
 #if defined(SK_BUILD_FOR_WIN32)
 
+#include "SkLeanWindows.h"
 #include "SkOSFile.h"
-
 #include "SkTFitsIn.h"
 
 #include <io.h>

src/ports/SkOSLibrary_win.cpp

diff --git a/src/ports/SkOSLibrary_win.cpp b/src/ports/SkOSLibrary_win.cpp
index 63d8d2d..b6d8dd3 100644
--- a/src/ports/SkOSLibrary_win.cpp
+++ b/src/ports/SkOSLibrary_win.cpp
@@ -8,7 +8,7 @@
 #if defined(SK_BUILD_FOR_WIN32)
 
 #include "SkOSLibrary.h"
-#include <windows.h>
+#include "SkLeanWindows.h"
 
 void* DynamicLoadLibrary(const char* libraryName) {
     return LoadLibraryA(libraryName);

src/ports/SkTLS_win.cpp

diff --git a/src/ports/SkTLS_win.cpp b/src/ports/SkTLS_win.cpp
index 8bc55a0..c349ad9 100644
--- a/src/ports/SkTLS_win.cpp
+++ b/src/ports/SkTLS_win.cpp
@@ -7,8 +7,9 @@
 #include "SkTypes.h"
 #if defined(SK_BUILD_FOR_WIN32)
 
-#include "SkTLS.h"
+#include "SkLeanWindows.h"
 #include "SkMutex.h"
+#include "SkTLS.h"
 
 static bool gOnce = false;
 static DWORD gTlsIndex;

src/ports/SkTypeface_win_dw.h

diff --git a/src/ports/SkTypeface_win_dw.h b/src/ports/SkTypeface_win_dw.h
index 3e429f4..11b3fb5 100644
--- a/src/ports/SkTypeface_win_dw.h
+++ b/src/ports/SkTypeface_win_dw.h
@@ -11,10 +11,10 @@
 #include "SkAdvancedTypefaceMetrics.h"
 #include "SkDWrite.h"
 #include "SkHRESULT.h"
+#include "SkLeanWindows.h"
 #include "SkTScopedComPtr.h"
 #include "SkTypeface.h"
 #include "SkTypefaceCache.h"
-#include "SkTypes.h"
 
 #include <dwrite.h>
 #if SK_HAS_DWRITE_1_H