Merge 104501 - [chromium win] Creating lots of temporary canvas contexts will crash.

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

 /*
  * Copyright (c) 2008, Google Inc. All rights reserved.
  * Copyright (C) 2009 Dirk Schulze <krit@webkit.org>
  * Copyright (C) 2010 Torch Mobile (Beijing) Co. Ltd. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
@@ skipping 75 matching lines @@
     SkCanvas* canvas = new SkCanvas();
     canvas->setDevice(new SkGpuDevice(gr, texture.get()))->unref();
     data->m_platformContext.setGraphicsContext3D(context3D);
 #if USE(ACCELERATED_COMPOSITING)
     data->m_platformLayer = Canvas2DLayerChromium::create(context3D);
     data->m_platformLayer->setTextureId(texture.get()->getTextureHandle());
 #endif
     return canvas;
 }
 
+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;
+}
+
 ImageBuffer::ImageBuffer(const IntSize& size, ColorSpace, RenderingMode renderingMode, bool& success)
     : m_data(size)
     , m_size(size)
 {
     OwnPtr<SkCanvas> canvas;
 
     if (renderingMode == Accelerated)
         canvas = adoptPtr(createAcceleratedCanvas(size, &m_data));
+    else if (renderingMode == UnacceleratedNonPlatformBuffer)
+        canvas = adoptPtr(createNonPlatformCanvas(size));
 
     if (!canvas)
         canvas = adoptPtr(skia::TryCreateBitmapCanvas(size.width(), size.height(), false));
 
     if (!canvas) {
         success = false;
         return;
     }
 
     m_data.m_canvas = canvas.release();
@@ skipping 298 matching lines @@
 
     Vector<char> encodedImage, base64Data;
     if (!encodeImage(imageData, mimeType, quality, &encodedImage))
         return "data:,";
 
     base64Encode(encodedImage, base64Data);
     return "data:" + mimeType + ";base64," + base64Data;
 }
 
 } // namespace WebCore