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/utils/win/SkAutoCoInitialize.cpp

diff --git a/src/utils/win/SkAutoCoInitialize.cpp b/src/utils/win/SkAutoCoInitialize.cpp
index 3b7b42b..f6da67d 100644
--- a/src/utils/win/SkAutoCoInitialize.cpp
+++ b/src/utils/win/SkAutoCoInitialize.cpp
@@ -8,12 +8,11 @@
 #include "SkTypes.h"
 #if defined(SK_BUILD_FOR_WIN32)
 
-
-#define WIN32_LEAN_AND_MEAN
-#include <windows.h>
-#include <ole2.h>
 #include "SkAutoCoInitialize.h"
 
+#include <objbase.h>
+#include <winerror.h>
+
 SkAutoCoInitialize::SkAutoCoInitialize() :
     fHR(
         CoInitializeEx(nullptr, COINIT_APARTMENTTHREADED | COINIT_DISABLE_OLE1DDE)