Reapply http://codereview.chromium.org/11225

This was lost by Brett's move this morning.

Review URL: http://codereview.chromium.org/11605


git-svn-id: svn://svn.chromium.org/chrome/trunk/src@5713 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 6 insertions, 3 deletions

diff --git a/webkit/port/platform/graphics/skia/public/PlatformCanvasLinux.cpp b/webkit/port/platform/graphics/skia/public/PlatformCanvasLinux.cpp
index 5ebeb27..b579536 100644
--- a/webkit/port/platform/graphics/skia/public/PlatformCanvasLinux.cpp
+++ b/webkit/port/platform/graphics/skia/public/PlatformCanvasLinux.cpp
@@ -38,8 +38,11 @@ PlatformDeviceLinux& PlatformCanvasLinux::getTopPlatformDevice() const {
   return *static_cast<PlatformDeviceLinux*>(iter.device());
 }
 
-SkDevice* PlatformCanvasLinux::createDevice(SkBitmap::Config, int width,
-                                            int height, bool is_opaque) {
+SkDevice* PlatformCanvasLinux::createDevice(SkBitmap::Config config,
+                                            int width,
+                                            int height,
+                                            bool is_opaque, bool isForLayer) {
+  DCHECK(config == SkBitmap::kARGB_8888_Config);
   return createPlatformDevice(width, height, is_opaque);
 }
 
diff --git a/webkit/port/platform/graphics/skia/public/PlatformCanvasLinux.h b/webkit/port/platform/graphics/skia/public/PlatformCanvasLinux.h
index 6c92ad5..6eefee8 100644
--- a/webkit/port/platform/graphics/skia/public/PlatformCanvasLinux.h
+++ b/webkit/port/platform/graphics/skia/public/PlatformCanvasLinux.h
@@ -36,7 +36,7 @@ class PlatformCanvasLinux : public SkCanvas {
   // the device is always our own so we know that we can use GDI operations
   // on it. Simply calls into createPlatformDevice().
   virtual SkDevice* createDevice(SkBitmap::Config, int width, int height,
-                                 bool is_opaque);
+                                 bool is_opaque, bool isForLayer);
 
   // Creates a device store for use by the canvas. By default, it creates a
   // BitmapPlatformDevice object. Can be overridden to change the object type.