Upstream the rest of skia diff

skia/ext/platform_device.h

Index: skia/ext/platform_device.h
diff --git a/skia/ext/platform_device.h b/skia/ext/platform_device.h
index dc1655a2f053793779a0370c42b8b82fb67b0e83..77e10d2df8dffa1c23a073ebc76e08831091683e 100644
--- a/skia/ext/platform_device.h
+++ b/skia/ext/platform_device.h
@@ -37,6 +37,9 @@ class PlatformDevice;
 #if defined(OS_WIN)
 typedef HDC PlatformSurface;
 typedef RECT PlatformRect;
+#elif defined(ANDROID)
+typedef void* PlatformSurface;
+typedef SkIRect* PlatformRect;
 #elif defined(OS_LINUX) || defined(OS_OPENBSD) || defined(OS_FREEBSD) \
     || defined(OS_SUN)
 typedef cairo_t* PlatformSurface;
@@ -44,10 +47,6 @@ typedef cairo_rectangle_t PlatformRect;
 #elif defined(OS_MACOSX)
 typedef CGContextRef PlatformSurface;
 typedef CGRect PlatformRect;
-#elif defined(ANDROID)
-// TODO(tonyg): FIX TYPES!
-typedef void* PlatformSurface;
-typedef void* PlatformRect;
 #endif
 
 // The following routines provide accessor points for the functionality