skia/ext/platform_surface.h - Issue 2041113002: skia/ext: do not assume Skia's headers include windows.h

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: skia/ext/platform_surface.h

Issue 2041113002: skia/ext: do not assume Skia's headers include windows.h (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: 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 // Copyright (c) 2015 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2015 The Chromium Authors. All rights reserved.

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

3 // found in the LICENSE file.	3 // found in the LICENSE file.

4	4

5 #ifndef SKIA_EXT_PLATFORM_SURFACE_H_	5 #ifndef SKIA_EXT_PLATFORM_SURFACE_H_

6 #define SKIA_EXT_PLATFORM_SURFACE_H_	6 #define SKIA_EXT_PLATFORM_SURFACE_H_

7	7

8 #include "build/build_config.h"	8 #include "build/build_config.h"

9	9

	10 #if defined(OS_WIN)

	11 #include <windows.h>
	bungeman-skia 2016/06/06 20:04:50 Does this work if moved below the Skia includes to Does this work if moved below the Skia includes to the platform ifdef block below with USE_CAIRO and OS_MACOSX. It should probably come first there so it looks like the one inside the 'skia' namespace. hal.canary 2016/06/06 20:07:04 Done. Show quoted text On 2016/06/06 20:04:50, bungeman-skia wrote: > Does this work if moved below the Skia includes to the platform ifdef block > below with USE_CAIRO and OS_MACOSX. It should probably come first there so it > looks like the one inside the 'skia' namespace. Done.
	12 #endif

	13

10 #include "third_party/skia/include/core/SkTypes.h"	14 #include "third_party/skia/include/core/SkTypes.h"

11 #include "third_party/skia/include/core/SkRect.h"	15 #include "third_party/skia/include/core/SkRect.h"

12	16

13 #if defined(USE_CAIRO)	17 #if defined(USE_CAIRO)

14 typedef struct _cairo cairo_t;	18 typedef struct _cairo cairo_t;

15 typedef struct _cairo_rectangle cairo_rectangle_t;	19 typedef struct _cairo_rectangle cairo_rectangle_t;

16 #elif defined(OS_MACOSX)	20 #elif defined(OS_MACOSX)

17 typedef struct CGContext* CGContextRef;	21 typedef struct CGContext* CGContextRef;

18 typedef struct CGRect CGRect;	22 typedef struct CGRect CGRect;

19 #endif	23 #endif

(...skipping 10 matching lines...) Expand all Loading...
30 typedef CGContextRef PlatformSurface;	34 typedef CGContextRef PlatformSurface;

31 typedef CGRect PlatformRect;	35 typedef CGRect PlatformRect;

32 #else	36 #else

33 typedef void* PlatformSurface;	37 typedef void* PlatformSurface;

34 typedef SkIRect* PlatformRect;	38 typedef SkIRect* PlatformRect;

35 #endif	39 #endif

36	40

37 } // namespace skia	41 } // namespace skia

38	42

39 #endif // SKIA_EXT_PLATFORM_SURFACE_H_	43 #endif // SKIA_EXT_PLATFORM_SURFACE_H_

OLD	NEW

« no previous file with comments | « no previous file | no next file » | no next file with comments »