Changeset 131805 in webkit

Timestamp:

Oct 18, 2012, 2:28:02 PM (13 years ago)

Author:

reed@google.com

Message:

Handle if we fail to allocate nonPlatformCanvas in ImageBuffer constructor
​https://bugs.webkit.org/show_bug.cgi?id=99752

Reviewed by Stephen White.

Current code does not check if we were able to allocate the pixels, but still returns the canvas.
However, the caller explicitly is checking for null on failure, so it will continue (and possibly
crash later on).
This change brings the nonPlatformCanvas behavior inline with createAcceleratedCanvas and
TryCreateBitmapCanvas, both of which are also called by ImageBuffer's constructor.

No new tests. Existing tests exercise ImageBuffer constructor.

• platform/graphics/skia/ImageBufferSkia.cpp:

(WebCore::createNonPlatformCanvas):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/skia/ImageBufferSkia.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-10-18  Mike Reed  <reed@google.com>
+
+        Handle if we fail to allocate nonPlatformCanvas in ImageBuffer constructor
+        https://bugs.webkit.org/show_bug.cgi?id=99752
+
+        Reviewed by Stephen White.
+
+        Current code does not check if we were able to allocate the pixels, but still returns the canvas.
+        However, the caller explicitly is checking for null on failure, so it will continue (and possibly
+        crash later on).
+        This change brings the nonPlatformCanvas behavior inline with createAcceleratedCanvas and
+        TryCreateBitmapCanvas, both of which are also called by ImageBuffer's constructor.
+
+        No new tests. Existing tests exercise ImageBuffer constructor.
+
+        * platform/graphics/skia/ImageBufferSkia.cpp:
+        (WebCore::createNonPlatformCanvas):
+
 2012-10-18  Beth Dakin  <bdakin@apple.com>
 

trunk/Source/WebCore/platform/graphics/skia/ImageBufferSkia.cpp

@@ -105 +105 @@
 static SkCanvas* createNonPlatformCanvas(const IntSize& size)
 {
-    SkCanvas* canvas = new SkCanvas();
-    canvas->setDevice(new SkDevice(SkBitmap::kARGB_8888_Config, size.width(), size.height()))->unref();
-    return canvas;
+    SkAutoTUnref<SkDevice> device(new SkDevice(SkBitmap::kARGB_8888_Config, size.width(), size.height()));
+    SkPixelRef* pixelRef = device->accessBitmap(false).pixelRef();
+    return pixelRef ? new SkCanvas(device) : 0;
 }