Upstream the rest of skia diff

skia/ext/platform_device.h

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef SKIA_EXT_PLATFORM_DEVICE_H_
 #define SKIA_EXT_PLATFORM_DEVICE_H_
 
 #include "build/build_config.h"
 
 #if defined(OS_WIN)
@@ skipping 19 matching lines @@
 typedef struct CGRect CGRect;
 #endif
 
 namespace skia {
 
 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;
 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
 // exported by the various PlatformDevice ports.  The PlatformDevice, and
 // BitmapPlatformDevice classes inherit directly from SkDevice, which is no
 // longer a supported usage-pattern for skia.  In preparation of the removal of
 // these classes, all calls to PlatformDevice::* should be routed through these
 // helper functions.
 
 // Bind a PlatformDevice instance, |platform_device| to |device|.  Subsequent
@@ skipping 109 matching lines @@
 #elif defined(OS_MACOSX)
   // Loads the specified Skia transform into the device context
   static void LoadTransformToCGContext(CGContextRef context,
                                        const SkMatrix& matrix);
 #endif
 };
 
 }  // namespace skia
 
 #endif  // SKIA_EXT_PLATFORM_DEVICE_H_