Fix a proto-type mismatch on a virtual override.

This was causing us to create a SkDevice instead of creating our special platform device type instead.  This fixes one of the main Linux crashes.

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

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

2 files changed, 6 insertions, 3 deletions

diff --git a/base/gfx/platform_canvas_linux.cc b/base/gfx/platform_canvas_linux.cc
index 5ebeb27..b579536 100644
--- a/base/gfx/platform_canvas_linux.cc
+++ b/base/gfx/platform_canvas_linux.cc
@@ -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/base/gfx/platform_canvas_linux.h b/base/gfx/platform_canvas_linux.h
index e13207e..804c6b6 100644
--- a/base/gfx/platform_canvas_linux.h
+++ b/base/gfx/platform_canvas_linux.h
@@ -37,7 +37,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.