Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(64)

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: 2016-06-06 (Monday) 16:06:28 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 #include "third_party/skia/include/core/SkTypes.h" 10 #include "third_party/skia/include/core/SkTypes.h"
11 #include "third_party/skia/include/core/SkRect.h" 11 #include "third_party/skia/include/core/SkRect.h"
12 12
13 #if defined(USE_CAIRO) 13 #if defined(OS_WIN)
14 #include <windows.h>
15 #elif defined(USE_CAIRO)
14 typedef struct _cairo cairo_t; 16 typedef struct _cairo cairo_t;
15 typedef struct _cairo_rectangle cairo_rectangle_t; 17 typedef struct _cairo_rectangle cairo_rectangle_t;
16 #elif defined(OS_MACOSX) 18 #elif defined(OS_MACOSX)
17 typedef struct CGContext* CGContextRef; 19 typedef struct CGContext* CGContextRef;
18 typedef struct CGRect CGRect; 20 typedef struct CGRect CGRect;
19 #endif 21 #endif
20 22
21 namespace skia { 23 namespace skia {
22 24
23 #if defined(OS_WIN) 25 #if defined(OS_WIN)
24 typedef HDC PlatformSurface; 26 typedef HDC PlatformSurface;
25 typedef RECT PlatformRect; 27 typedef RECT PlatformRect;
26 #elif defined(USE_CAIRO) 28 #elif defined(USE_CAIRO)
27 typedef cairo_t* PlatformSurface; 29 typedef cairo_t* PlatformSurface;
28 typedef cairo_rectangle_t PlatformRect; 30 typedef cairo_rectangle_t PlatformRect;
29 #elif defined(OS_MACOSX) 31 #elif defined(OS_MACOSX)
30 typedef CGContextRef PlatformSurface; 32 typedef CGContextRef PlatformSurface;
31 typedef CGRect PlatformRect; 33 typedef CGRect PlatformRect;
32 #else 34 #else
33 typedef void* PlatformSurface; 35 typedef void* PlatformSurface;
34 typedef SkIRect* PlatformRect; 36 typedef SkIRect* PlatformRect;
35 #endif 37 #endif
36 38
37 } // namespace skia 39 } // namespace skia
38 40
39 #endif // SKIA_EXT_PLATFORM_SURFACE_H_ 41 #endif // SKIA_EXT_PLATFORM_SURFACE_H_
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698