Changeset 95658 in webkit

Timestamp:

Sep 21, 2011 12:11:40 PM (13 years ago)

Author:

senorblanco@chromium.org

Message:

[chromium] Optimize ImageBuffer constructor when accelerated
​https://bugs.webkit.org/show_bug.cgi?id=68501

If the accelerated rendering mode is passed in to ImageBuffer, instead
of creating a bitmap PlatformCanvas and subsequently replacing its
device with an SkGpuDevice, create an SkCanvas and SkGpuDevice first,
and fall back to raster creation only failure. This saves on system
RAM for the backing store (and possibly GDI resources).

Reviewed by James Robinson.

Covered by existing tests.

• platform/graphics/gpu/SharedGraphicsContext3D.cpp:

(WebCore::SharedGraphicsContext3D::get):

• platform/graphics/gpu/SharedGraphicsContext3D.h:

Rename "SharedGraphicsContext3D::create()" to "get()" to more
accurately reflect its function.

• platform/graphics/skia/ImageBufferSkia.cpp:

(WebCore::createAcceleratedCanvas):
Refactor creation of accelerated ImageBuffer.
(WebCore::ImageBuffer::ImageBuffer):
Attempt creation of accelerated ImageBuffer first, and only fall back
to bitmap-backed canvas creation if it fails.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/gpu/SharedGraphicsContext3D.cpp (modified) (2 diffs)
• platform/graphics/gpu/SharedGraphicsContext3D.h (modified) (1 diff)
• platform/graphics/skia/ImageBufferSkia.cpp (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-09-21  Stephen White  <senorblanco@chromium.org>
+
+        [chromium] Optimize ImageBuffer constructor when accelerated
+        https://bugs.webkit.org/show_bug.cgi?id=68501
+
+        If the accelerated rendering mode is passed in to ImageBuffer, instead
+        of creating a bitmap PlatformCanvas and subsequently replacing its
+        device with an SkGpuDevice, create an SkCanvas and SkGpuDevice first,
+        and fall back to raster creation only failure.  This saves on system
+        RAM for the backing store (and possibly GDI resources).
+
+        Reviewed by James Robinson.
+
+        Covered by existing tests.
+
+        * platform/graphics/gpu/SharedGraphicsContext3D.cpp:
+        (WebCore::SharedGraphicsContext3D::get):
+        * platform/graphics/gpu/SharedGraphicsContext3D.h:
+        Rename "SharedGraphicsContext3D::create()" to "get()" to more
+        accurately reflect its function.
+        * platform/graphics/skia/ImageBufferSkia.cpp:
+        (WebCore::createAcceleratedCanvas):
+        Refactor creation of accelerated ImageBuffer.
+        (WebCore::ImageBuffer::ImageBuffer):
+        Attempt creation of accelerated ImageBuffer first, and only fall back
+        to bitmap-backed canvas creation if it fails.
+
 2011-09-21  Dan Bernstein  <mitz@apple.com>
 

trunk/Source/WebCore/platform/graphics/gpu/SharedGraphicsContext3D.cpp

@@ -31 +31 @@
 namespace WebCore {
 
-GraphicsContext3D* SharedGraphicsContext3D::create(HostWindow* window)
+GraphicsContext3D* SharedGraphicsContext3D::get()
 {
     GraphicsContext3D::Attributes attributes;
@@ -39 +39 @@
     attributes.canRecoverFromContextLoss = false; // Canvas contexts can not handle lost contexts.
     attributes.shareResources = true;
-    static RefPtr<GraphicsContext3D> context = GraphicsContext3D::create(attributes, window);
+    static RefPtr<GraphicsContext3D> context = GraphicsContext3D::create(attributes, 0);
     return context.get();
 }

trunk/Source/WebCore/platform/graphics/gpu/SharedGraphicsContext3D.h

@@ -35 +35 @@
 class SharedGraphicsContext3D {
 public:
-    static GraphicsContext3D* create(HostWindow*);
+    static GraphicsContext3D* get();
 };
 

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

@@ -65 +65 @@
 }
 
+static SkCanvas* createAcceleratedCanvas(const IntSize& size, ImageBufferData* data)
+{
+    GraphicsContext3D* context3D = SharedGraphicsContext3D::get();
+    if (!context3D)
+        return 0;
+    GrContext* gr = context3D->grContext();
+    if (!gr)
+        return 0;
+    gr->resetContext();
+    GrTextureDesc desc;
+    desc.fFlags = kRenderTarget_GrTextureFlagBit;
+    desc.fAALevel = kNone_GrAALevel;
+    desc.fWidth = size.width();
+    desc.fHeight = size.height();
+    desc.fFormat = kRGBA_8888_GrPixelConfig;
+    SkAutoTUnref<GrTexture> texture(gr->createUncachedTexture(desc, 0, 0));
+    if (!texture.get())
+        return 0;
+    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;
+}
+
 ImageBuffer::ImageBuffer(const IntSize& size, ColorSpace, RenderingMode renderingMode, bool& success)
     : m_data(size)
     , m_size(size)
 {
-    OwnPtr<SkCanvas> canvas = adoptPtr(skia::TryCreateBitmapCanvas(size.width(), size.height(), false));
+    OwnPtr<SkCanvas> canvas;
+
+    if (renderingMode == Accelerated)
+        canvas = adoptPtr(createAcceleratedCanvas(size, &m_data));
+
+    if (!canvas)
+        canvas = adoptPtr(skia::TryCreateBitmapCanvas(size.width(), size.height(), false));
+
     if (!canvas) {
         success = false;
@@ -84 +119 @@
     // color. Can we have another way to manage this?
     m_data.m_canvas->drawARGB(0, 0, 0, 0, SkXfermode::kClear_Mode);
-    if (renderingMode == Accelerated) {
-        GraphicsContext3D* context3D = SharedGraphicsContext3D::create(0);
-        if (context3D) {
-            GrContext* gr = context3D->grContext();
-            if (gr) {
-                gr->resetContext();
-                GrTextureDesc desc;
-                desc.fFlags = kRenderTarget_GrTextureFlagBit;
-                desc.fAALevel = kNone_GrAALevel;
-                desc.fWidth = size.width();
-                desc.fHeight = size.height();
-                desc.fFormat = kRGBA_8888_GrPixelConfig;
-                SkAutoTUnref<GrTexture> texture(gr->createUncachedTexture(desc, 0, 0));
-                if (texture.get()) {
-                    m_data.m_canvas->setDevice(new SkGpuDevice(gr, texture.get()))->unref();
-                    m_context->platformContext()->setGraphicsContext3D(context3D);
-#if USE(ACCELERATED_COMPOSITING)
-                    m_data.m_platformLayer = Canvas2DLayerChromium::create(context3D);
-                    m_data.m_platformLayer->setTextureId(texture.get()->getTextureHandle());
-#endif
-                }
-            }
-        }
-    }
 
     success = true;