SkLeanWindows.h: #include "Windows.h" fewer places

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

Committed: https://skia.googlesource.com/skia/+/4dbbd04314cc0606f8d3bafe515c97e52c180f73

[hal.canary, 2016-06-06 17:35:26]

Description was changed from

==========
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
==========

to

==========
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
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2041943002
==========

[hal.canary, 2016-06-06 17:35:32]

The CQ bit was checked by halcanary@google.com to run a CQ dry run

[commit-bot: I haz the power, 2016-06-06 17:35:37]

Dry run: CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/2041943002/1

[hal.canary, 2016-06-06 17:35:37]

The CQ bit was unchecked by halcanary@google.com

[hal.canary, 2016-06-06 17:36:07]

The CQ bit was checked by halcanary@google.com to run a CQ dry run

[commit-bot: I haz the power, 2016-06-06 17:36:16]

Dry run: CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/2041943002/1

[hal.canary, 2016-06-06 17:37:16]

halcanary@google.com changed reviewers:
+ bungeman@google.com

[hal.canary, 2016-06-06 17:37:17]

PTAL

[commit-bot: I haz the power, 2016-06-06 17:43:16]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2016-06-06 17:43:17]

Dry run: Try jobs failed on following builders:
  Build-Mac-Clang-x86_64-Release-Trybot on client.skia.compile (JOB_FAILED,
http://build.chromium.org/p/client.skia.compile/builders/Build-Mac-Clang-x86_...)

[hal.canary, 2016-06-06 17:55:57]

The CQ bit was checked by halcanary@google.com to run a CQ dry run

[commit-bot: I haz the power, 2016-06-06 17:56:07]

Dry run: CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/2041943002/60001

[hal.canary, 2016-06-06 18:00:08]

The CQ bit was unchecked by halcanary@google.com

[hal.canary, 2016-06-06 18:03:42]

Description was changed from

==========
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
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2041943002
==========

to

==========
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
==========

[bungeman-skia, 2016-06-06 18:11:59]

Mostly nits here, I'll have to take a look at which headers things are supposed
to come from. Microsoft has documentation on which headers are needed for what,
because they're moved some stuff around in the past and reserve the right to do
so in the future.

https://codereview.chromium.org/2041943002/diff/60001/dm/DM.cpp
File dm/DM.cpp (right):

https://codereview.chromium.org/2041943002/diff/60001/dm/DM.cpp#newcode26
dm/DM.cpp:26: #include "SkLeanWindows.h"
nit: Needs to go up one line.

https://codereview.chromium.org/2041943002/diff/60001/include/private/SkRecor...
File include/private/SkRecords.h (right):

https://codereview.chromium.org/2041943002/diff/60001/include/private/SkRecor...
include/private/SkRecords.h:26: #ifdef DrawText
We should put a short comment here that windows.h defines DrawText to DrawTextA
or DrawTextW and we want to avoid that. Just so someone in the future doesn't
wonder too hard why this is here.

See comment at the top of src/ports/SkTypeface_win_dw.cpp for a similar issue.

https://codereview.chromium.org/2041943002/diff/60001/src/core/SkSemaphore.cpp
File src/core/SkSemaphore.cpp (right):

https://codereview.chromium.org/2041943002/diff/60001/src/core/SkSemaphore.cp...
src/core/SkSemaphore.cpp:9: #include "../private/SkLeanWindows.h"
nit: up one line

https://codereview.chromium.org/2041943002/diff/60001/src/core/SkTaskGroup.cpp
File src/core/SkTaskGroup.cpp (right):

https://codereview.chromium.org/2041943002/diff/60001/src/core/SkTaskGroup.cp...
src/core/SkTaskGroup.cpp:15: #include "SkLeanWindows.h"
nit: alphabetize

https://codereview.chromium.org/2041943002/diff/60001/src/core/SkThreadID.cpp
File src/core/SkThreadID.cpp (right):

https://codereview.chromium.org/2041943002/diff/60001/src/core/SkThreadID.cpp...
src/core/SkThreadID.cpp:9: #include "SkLeanWindows.h"
nit: alphabetize

https://codereview.chromium.org/2041943002/diff/60001/src/gpu/GrPathUtils.cpp
File src/gpu/GrPathUtils.cpp (right):

https://codereview.chromium.org/2041943002/diff/60001/src/gpu/GrPathUtils.cpp...
src/gpu/GrPathUtils.cpp:11: #include "SkMathPriv.h"
nit: down one line

https://codereview.chromium.org/2041943002/diff/60001/src/ports/SkTLS_win.cpp
File src/ports/SkTLS_win.cpp (right):

https://codereview.chromium.org/2041943002/diff/60001/src/ports/SkTLS_win.cpp...
src/ports/SkTLS_win.cpp:12: #include "SkLeanWindows.h"
nit: eck, we should alphabetize these... but ascending

https://codereview.chromium.org/2041943002/diff/60001/src/ports/SkTypeface_wi...
File src/ports/SkTypeface_win_dw.h (right):

https://codereview.chromium.org/2041943002/diff/60001/src/ports/SkTypeface_wi...
src/ports/SkTypeface_win_dw.h:17: 
nit: extra line, alphabetize

https://codereview.chromium.org/2041943002/diff/60001/src/utils/SkThreadUtils...
File src/utils/SkThreadUtils_win.h (right):

https://codereview.chromium.org/2041943002/diff/60001/src/utils/SkThreadUtils...
src/utils/SkThreadUtils_win.h:14: #include "SkLeanWindows.h"
nit: up one line

https://codereview.chromium.org/2041943002/diff/60001/tools/gpu/GrTest.cpp
File tools/gpu/GrTest.cpp (right):

https://codereview.chromium.org/2041943002/diff/60001/tools/gpu/GrTest.cpp#ne...
tools/gpu/GrTest.cpp:20: #include "SkMathPriv.h"
nit: up one line

[hal.canary, 2016-06-06 18:22:33]

done.

https://codereview.chromium.org/2041943002/diff/60001/dm/DM.cpp
File dm/DM.cpp (right):

https://codereview.chromium.org/2041943002/diff/60001/dm/DM.cpp#newcode26
dm/DM.cpp:26: #include "SkLeanWindows.h"
On 2016/06/06 18:11:59, bungeman-skia wrote:
> nit: Needs to go up one line.

Done.

https://codereview.chromium.org/2041943002/diff/60001/include/private/SkRecor...
File include/private/SkRecords.h (right):

https://codereview.chromium.org/2041943002/diff/60001/include/private/SkRecor...
include/private/SkRecords.h:26: #ifdef DrawText
On 2016/06/06 18:11:59, bungeman-skia wrote:
> We should put a short comment here that windows.h defines DrawText to
DrawTextA
> or DrawTextW and we want to avoid that. Just so someone in the future doesn't
> wonder too hard why this is here.
> 
> See comment at the top of src/ports/SkTypeface_win_dw.cpp for a similar issue.

Done.

https://codereview.chromium.org/2041943002/diff/60001/src/core/SkSemaphore.cpp
File src/core/SkSemaphore.cpp (right):

https://codereview.chromium.org/2041943002/diff/60001/src/core/SkSemaphore.cp...
src/core/SkSemaphore.cpp:9: #include "../private/SkLeanWindows.h"
On 2016/06/06 18:11:59, bungeman-skia wrote:
> nit: up one line

Done.

https://codereview.chromium.org/2041943002/diff/60001/src/core/SkTaskGroup.cpp
File src/core/SkTaskGroup.cpp (right):

https://codereview.chromium.org/2041943002/diff/60001/src/core/SkTaskGroup.cp...
src/core/SkTaskGroup.cpp:15: #include "SkLeanWindows.h"
On 2016/06/06 18:11:59, bungeman-skia wrote:
> nit: alphabetize

Done.

https://codereview.chromium.org/2041943002/diff/60001/src/core/SkThreadID.cpp
File src/core/SkThreadID.cpp (right):

https://codereview.chromium.org/2041943002/diff/60001/src/core/SkThreadID.cpp...
src/core/SkThreadID.cpp:9: #include "SkLeanWindows.h"
On 2016/06/06 18:11:59, bungeman-skia wrote:
> nit: alphabetize

Done.

https://codereview.chromium.org/2041943002/diff/60001/src/gpu/GrPathUtils.cpp
File src/gpu/GrPathUtils.cpp (right):

https://codereview.chromium.org/2041943002/diff/60001/src/gpu/GrPathUtils.cpp...
src/gpu/GrPathUtils.cpp:11: #include "SkMathPriv.h"
On 2016/06/06 18:11:59, bungeman-skia wrote:
> nit: down one line

Done.

https://codereview.chromium.org/2041943002/diff/60001/src/ports/SkTLS_win.cpp
File src/ports/SkTLS_win.cpp (right):

https://codereview.chromium.org/2041943002/diff/60001/src/ports/SkTLS_win.cpp...
src/ports/SkTLS_win.cpp:12: #include "SkLeanWindows.h"
On 2016/06/06 18:11:59, bungeman-skia wrote:
> nit: eck, we should alphabetize these... but ascending

Done.

https://codereview.chromium.org/2041943002/diff/60001/src/ports/SkTypeface_wi...
File src/ports/SkTypeface_win_dw.h (right):

https://codereview.chromium.org/2041943002/diff/60001/src/ports/SkTypeface_wi...
src/ports/SkTypeface_win_dw.h:17: 
On 2016/06/06 18:11:59, bungeman-skia wrote:
> nit: extra line, alphabetize

Done.

https://codereview.chromium.org/2041943002/diff/60001/src/utils/SkThreadUtils...
File src/utils/SkThreadUtils_win.h (right):

https://codereview.chromium.org/2041943002/diff/60001/src/utils/SkThreadUtils...
src/utils/SkThreadUtils_win.h:14: #include "SkLeanWindows.h"
On 2016/06/06 18:11:59, bungeman-skia wrote:
> nit: up one line

Done.

https://codereview.chromium.org/2041943002/diff/60001/tools/gpu/GrTest.cpp
File tools/gpu/GrTest.cpp (right):

https://codereview.chromium.org/2041943002/diff/60001/tools/gpu/GrTest.cpp#ne...
tools/gpu/GrTest.cpp:20: #include "SkMathPriv.h"
On 2016/06/06 18:11:59, bungeman-skia wrote:
> nit: up one line

Done.

[hal.canary, 2016-06-06 18:32:02]

On 2016/06/06 18:11:59, bungeman-skia wrote:
> Mostly nits here, I'll have to take a look at which headers things are
supposed
> to come from. Microsoft has documentation on which headers are needed for
what,
> because they're moved some stuff around in the past and reserve the right to
do
> so in the future.

Nah. Let's cross that bridge later.  We're agile.

[bungeman-skia, 2016-06-06 18:45:56]

https://codereview.chromium.org/2041943002/diff/60001/include/utils/win/SkISt...
File include/utils/win/SkIStream.h (right):

https://codereview.chromium.org/2041943002/diff/60001/include/utils/win/SkISt...
include/utils/win/SkIStream.h:17: #include <ole2.h>
I think we still need SkLeanWindows here because HRESULT and others. I think
this might be 'working' because all of the includers end up getting windows.h
first accidentally.

https://codereview.chromium.org/2041943002/diff/80001/src/utils/win/SkAutoCoI...
File src/utils/win/SkAutoCoInitialize.cpp (right):

https://codereview.chromium.org/2041943002/diff/80001/src/utils/win/SkAutoCoI...
src/utils/win/SkAutoCoInitialize.cpp:11: #include <ole2.h>
This should probably just be objbase.h and winerror.h

On the other hand, I think we also need to add back SkLeanWindows.h to get
windows.h. We're currently getting it accidentally through OAIdl.h through a
chin of includes starting with ole2.h. (There's magic with COM_NO_WINDOWS_H, but
let's not go there.)

[bungeman-skia, 2016-06-06 18:56:27]

Windows headers  ¯\_(ツ)_/¯

https://codereview.chromium.org/2041943002/diff/80001/src/utils/win/SkIStream...
File src/utils/win/SkIStream.cpp (right):

https://codereview.chromium.org/2041943002/diff/80001/src/utils/win/SkIStream...
src/utils/win/SkIStream.cpp:11: #include <ole2.h>
nit: same here, I think we can get away with SkLeanWindows.h, objbase.h,
winerror.h, and ObjIdl.h. On the other hand, ObjIdl.h is going to drag in ole2.h
anyway I think, so I would just say leave it and just also include
SkLeanWindows.h,.

[hal.canary, 2016-06-06 19:38:20]

The CQ bit was checked by halcanary@google.com to run a CQ dry run

[commit-bot: I haz the power, 2016-06-06 19:38:25]

Dry run: CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/2041943002/100001

[hal.canary, 2016-06-06 19:38:28]

https://codereview.chromium.org/2041943002/diff/60001/include/utils/win/SkISt...
File include/utils/win/SkIStream.h (right):

https://codereview.chromium.org/2041943002/diff/60001/include/utils/win/SkISt...
include/utils/win/SkIStream.h:17: #include <ole2.h>
On 2016/06/06 18:45:56, bungeman-skia wrote:
> I think we still need SkLeanWindows here because HRESULT and others. I think
> this might be 'working' because all of the includers end up getting windows.h
> first accidentally.

Done.

https://codereview.chromium.org/2041943002/diff/80001/src/utils/win/SkAutoCoI...
File src/utils/win/SkAutoCoInitialize.cpp (right):

https://codereview.chromium.org/2041943002/diff/80001/src/utils/win/SkAutoCoI...
src/utils/win/SkAutoCoInitialize.cpp:11: #include <ole2.h>
On 2016/06/06 18:45:56, bungeman-skia wrote:
> This should probably just be objbase.h and winerror.h
> 
> On the other hand, I think we also need to add back SkLeanWindows.h to get
> windows.h. We're currently getting it accidentally through OAIdl.h through a
> chin of includes starting with ole2.h. (There's magic with COM_NO_WINDOWS_H,
but
> let's not go there.)

Done.

https://codereview.chromium.org/2041943002/diff/80001/src/utils/win/SkIStream...
File src/utils/win/SkIStream.cpp (right):

https://codereview.chromium.org/2041943002/diff/80001/src/utils/win/SkIStream...
src/utils/win/SkIStream.cpp:11: #include <ole2.h>
On 2016/06/06 18:56:27, bungeman-skia wrote:
> nit: same here, I think we can get away with SkLeanWindows.h, objbase.h,
> winerror.h, and ObjIdl.h. On the other hand, ObjIdl.h is going to drag in
ole2.h
> anyway I think, so I would just say leave it and just also include
> SkLeanWindows.h,.

Done.

[hal.canary, 2016-06-06 19:58:37]

Patchset #1 (id:1) has been deleted

[hal.canary, 2016-06-06 19:58:48]

Patchset #1 (id:20001) has been deleted

[hal.canary, 2016-06-06 19:59:00]

Patchset #1 (id:40001) has been deleted

[commit-bot: I haz the power, 2016-06-06 19:59:34]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2016-06-06 19:59:35]

Dry run: This issue passed the CQ dry run.

[hal.canary, 2016-06-07 15:29:43]

The CQ bit was checked by halcanary@google.com to run a CQ dry run

[commit-bot: I haz the power, 2016-06-07 15:29:52]

Dry run: CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/2041943002/120001

[commit-bot: I haz the power, 2016-06-07 15:45:06]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2016-06-07 15:45:07]

Dry run: This issue passed the CQ dry run.

[hal.canary, 2016-06-07 15:55:46]

halcanary@google.com changed reviewers:
+ reed@google.com

[hal.canary, 2016-06-07 15:55:47]

adding reed@ for API changes.

I pulled some functions out of SkMath.h; moved to SkMathPriv.h

I removed `#include <windows.h>` from SkPostConfig.h

Everything else is minor.

[reed1, 2016-06-07 16:04:08]

automatic API lgtm for removing public code

[bungeman-skia, 2016-06-07 22:28:50]

I say this lgtm when the Chromium Windows bots are happy.

[hal.canary, 2016-06-07 22:35:30]

Description was changed from

==========
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
==========

to

==========
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

CQ_INCLUDE_TRYBOTS=tryserver.chromium.win:win_chromium_compile_rel_ng
==========

[hal.canary, 2016-06-07 22:36:34]

The CQ bit was checked by halcanary@google.com to run a CQ dry run

[commit-bot: I haz the power, 2016-06-07 22:36:37]

Dry run: CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/2041943002/120001

[hal.canary, 2016-06-07 22:37:45]

Description was changed from

==========
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

CQ_INCLUDE_TRYBOTS=tryserver.chromium.win:win_chromium_compile_rel_ng
==========

to

==========
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
==========

[hal.canary, 2016-06-07 22:37:51]

The CQ bit was unchecked by halcanary@google.com

[hal.canary, 2016-06-07 22:37:58]

The CQ bit was checked by halcanary@google.com to run a CQ dry run

[commit-bot: I haz the power, 2016-06-07 22:38:07]

Dry run: CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/2041943002/120001

[hal.canary, 2016-06-07 22:41:18]

Description was changed from

==========
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
==========

to

==========
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
==========

[commit-bot: I haz the power, 2016-06-08 00:18:48]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2016-06-08 00:18:51]

Dry run: This issue passed the CQ dry run.

[hal.canary, 2016-06-08 00:19:44]

The CQ bit was checked by halcanary@google.com

[commit-bot: I haz the power, 2016-06-08 00:19:49]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/2041943002/120001

[commit-bot: I haz the power, 2016-06-08 00:21:14]

Description was changed from

==========
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
==========

to

==========
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

Committed:
https://skia.googlesource.com/skia/+/4dbbd04314cc0606f8d3bafe515c97e52c180f73
==========

[commit-bot: I haz the power, 2016-06-08 00:21:15]

Committed patchset #4 (id:120001) as
https://skia.googlesource.com/skia/+/4dbbd04314cc0606f8d3bafe515c97e52c180f73