| Index: skia/ext/platform_device.h
|
| diff --git a/skia/ext/platform_device.h b/skia/ext/platform_device.h
|
| index c903c87c08e816c1be7fd1cec3659d9242b9380e..464652de92c165945eca7a621e4bcfaa5802a8e1 100644
|
| --- a/skia/ext/platform_device.h
|
| +++ b/skia/ext/platform_device.h
|
| @@ -21,10 +21,7 @@ class SkMetaData;
|
| class SkPath;
|
| class SkRegion;
|
|
|
| -#if defined(USE_CAIRO)
|
| -typedef struct _cairo cairo_t;
|
| -typedef struct _cairo_rectangle cairo_rectangle_t;
|
| -#elif defined(OS_MACOSX)
|
| +#if defined(OS_MACOSX)
|
| typedef struct CGContext* CGContextRef;
|
| typedef struct CGRect CGRect;
|
| #endif
|
| @@ -36,9 +33,6 @@ class PlatformDevice;
|
| #if defined(OS_WIN)
|
| typedef HDC PlatformSurface;
|
| typedef RECT PlatformRect;
|
| -#elif defined(USE_CAIRO)
|
| -typedef cairo_t* PlatformSurface;
|
| -typedef cairo_rectangle_t PlatformRect;
|
| #elif defined(OS_MACOSX)
|
| typedef CGContextRef PlatformSurface;
|
| typedef CGRect PlatformRect;
|
|
|