Revert of Revert of Revert of Change device creation to see the (optional) layer-paint

include/core/SkBitmapDevice.h

Index: include/core/SkBitmapDevice.h
diff --git a/include/core/SkBitmapDevice.h b/include/core/SkBitmapDevice.h
index caff6857da08341185884f89de13efa0e462d324..8ca6a523be9d3b2412635616ff02f82fff6a11fa 100644
--- a/include/core/SkBitmapDevice.h
+++ b/include/core/SkBitmapDevice.h
@@ -98,7 +98,11 @@
                               const SkColor colors[], SkXfermode* xmode,
                               const uint16_t indices[], int indexCount,
                               const SkPaint& paint) SK_OVERRIDE;
-    virtual void drawDevice(const SkDraw&, SkBaseDevice*, int x, int y, const SkPaint&) SK_OVERRIDE;
+    /** The SkBaseDevice passed will be an SkBaseDevice which was returned by a call to
+        onCreateCompatibleDevice on this device with kSaveLayer_Usage.
+     */
+    virtual void drawDevice(const SkDraw&, SkBaseDevice*, int x, int y,
+                            const SkPaint&) SK_OVERRIDE;
 
     ///////////////////////////////////////////////////////////////////////////
 
@@ -141,7 +145,7 @@
     // any clip information.
     void replaceBitmapBackendForRasterSurface(const SkBitmap&) SK_OVERRIDE;
 
-    SkBaseDevice* onCreateDevice(const CreateInfo&, const SkPaint*) SK_OVERRIDE;
+    SkBaseDevice* onCreateCompatibleDevice(const CreateInfo&) SK_OVERRIDE;
 
     SkSurface* newSurface(const SkImageInfo&, const SkSurfaceProps&) SK_OVERRIDE;
     const void* peekPixels(SkImageInfo*, size_t* rowBytes) SK_OVERRIDE;