src/utils/win/SkIStream.cpp - Issue 2041943002: SkLeanWindows.h: #include "Windows.h" fewer places

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: src/utils/win/SkIStream.cpp

Issue 2041943002: SkLeanWindows.h: #include "Windows.h" fewer places (Closed) Base URL: https://skia.googlesource.com/skia.git@master

Patch Set: 2016-06-06 (Monday) 14:22:16 EDT Created 4 years, 6 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View unified diff | Download patch

OLD	NEW
1 /*	1 /*

2 * Copyright 2011 Google Inc.	2 * Copyright 2011 Google Inc.

3 *	3 *

4 * Use of this source code is governed by a BSD-style license that can be	4 * Use of this source code is governed by a BSD-style license that can be

5 * found in the LICENSE file.	5 * found in the LICENSE file.

6 */	6 */

7	7

8 #include "SkTypes.h"	8 #include "SkTypes.h"

9 #if defined(SK_BUILD_FOR_WIN32)	9 #if defined(SK_BUILD_FOR_WIN32)

10	10

11 #define WIN32_LEAN_AND_MEAN

12 #include <windows.h>

13 #include <ole2.h>	11 #include <ole2.h>
	bungeman-skia 2016/06/06 18:56:27 nit: same here, I think we can get away with SkLea 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:28 Done. Show quoted text 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.
14 #include "SkIStream.h"	12 #include "SkIStream.h"

15 #include "SkStream.h"	13 #include "SkStream.h"

16	14

17 /**	15 /**

18 * SkBaseIStream	16 * SkBaseIStream

19 */	17 */

20 SkBaseIStream::SkBaseIStream() : _refcount(1) { }	18 SkBaseIStream::SkBaseIStream() : _refcount(1) { }

21 SkBaseIStream::~SkBaseIStream() { }	19 SkBaseIStream::~SkBaseIStream() { }

22	20

23 HRESULT STDMETHODCALLTYPE SkBaseIStream::QueryInterface(REFIID iid	21 HRESULT STDMETHODCALLTYPE SkBaseIStream::QueryInterface(REFIID iid

(...skipping 246 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
270 return STG_E_INVALIDFLAG;	268 return STG_E_INVALIDFLAG;

271 }	269 }

272 pStatstg->pwcsName = nullptr;	270 pStatstg->pwcsName = nullptr;

273 pStatstg->cbSize.QuadPart = 0;	271 pStatstg->cbSize.QuadPart = 0;

274 pStatstg->clsid = CLSID_NULL;	272 pStatstg->clsid = CLSID_NULL;

275 pStatstg->type = STGTY_STREAM;	273 pStatstg->type = STGTY_STREAM;

276 pStatstg->grfMode = STGM_WRITE;	274 pStatstg->grfMode = STGM_WRITE;

277 return S_OK;	275 return S_OK;

278 }	276 }

279 #endif//defined(SK_BUILD_FOR_WIN32)	277 #endif//defined(SK_BUILD_FOR_WIN32)

OLD	NEW

« src/utils/win/SkAutoCoInitialize.cpp ('K') | « src/utils/win/SkAutoCoInitialize.cpp ('k') | src/utils/win/SkWGL.h » ('j') | no next file with comments »