Changeset 64374 in webkit

Timestamp:

Jul 30, 2010 2:20:03 PM (14 years ago)

Author:

jamesr@google.com

Message:

2010-07-30 James Robinson <​jamesr@chromium.org>

Reviewed by Darin Fisher.

[chromium] Make the GLES2 texture map generic and teach ImageSkia and ImageBufferSkia about GLES2
​https://bugs.webkit.org/show_bug.cgi?id=43218

This makes the GLES2Canvas' TextureHashMap key on void* instead of NativeImagePtr
to make it easier to use with other backends. It also teaches ImageSkia how
to draw to a GLES2Canvas instead of a skia buffer.

No change in functionality (yet), no new tests.

• platform/graphics/chromium/GLES2Canvas.cpp: (WebCore::GLES2Canvas::GLES2Canvas): (WebCore::GLES2Canvas::createTexture): (WebCore::GLES2Canvas::getTexture):
• platform/graphics/chromium/GLES2Canvas.h:
• platform/graphics/skia/ImageBufferSkia.cpp: (WebCore::ImageBuffer::getUnmultipliedImageData): (WebCore::ImageBuffer::getPremultipliedImageData):
• platform/graphics/skia/ImageSkia.cpp: (WebCore::drawBitmapGLES2): (WebCore::BitmapImage::draw): (WebCore::BitmapImageSingleFrameSkia::draw):

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/chromium/GLES2Canvas.cpp (modified) (1 diff)
• platform/graphics/chromium/GLES2Canvas.h (modified) (1 diff)
• platform/graphics/skia/ImageBufferSkia.cpp (modified) (2 diffs)
• platform/graphics/skia/ImageSkia.cpp (modified) (6 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-07-30  James Robinson  <jamesr@chromium.org>
+
+        Reviewed by Darin Fisher.
+
+        [chromium] Make the GLES2 texture map generic and teach ImageSkia and ImageBufferSkia about GLES2
+        https://bugs.webkit.org/show_bug.cgi?id=43218
+
+        This makes the GLES2Canvas' TextureHashMap key on void* instead of NativeImagePtr
+        to make it easier to use with other backends.  It also teaches ImageSkia how
+        to draw to a GLES2Canvas instead of a skia buffer.
+
+        No change in functionality (yet), no new tests.
+
+        * platform/graphics/chromium/GLES2Canvas.cpp:
+        (WebCore::GLES2Canvas::GLES2Canvas):
+        (WebCore::GLES2Canvas::createTexture):
+        (WebCore::GLES2Canvas::getTexture):
+        * platform/graphics/chromium/GLES2Canvas.h:
+        * platform/graphics/skia/ImageBufferSkia.cpp:
+        (WebCore::ImageBuffer::getUnmultipliedImageData):
+        (WebCore::ImageBuffer::getPremultipliedImageData):
+        * platform/graphics/skia/ImageSkia.cpp:
+        (WebCore::drawBitmapGLES2):
+        (WebCore::BitmapImage::draw):
+        (WebCore::BitmapImageSingleFrameSkia::draw):
+
 2010-07-30  Yong Li  <yoli@rim.com>
 

trunk/WebCore/platform/graphics/chromium/GLES2Canvas.cpp

@@ -100 +100 @@
     m_stateStack.append(State());
     m_state = &m_stateStack.last();
+
+    // Force the source over composite mode to be applied.
+    m_lastCompositeOp = CompositeClear;
+    applyCompositeOperator(CompositeSourceOver);
 }
 

trunk/WebCore/platform/graphics/chromium/GLES2Canvas.h

@@ -43 +43 @@
 #include <wtf/HashMap.h>
 #include <wtf/Noncopyable.h>
+#include <wtf/Vector.h>
 
 namespace WebCore {

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

@@ -199 +199 @@
 PassRefPtr<ImageData> ImageBuffer::getUnmultipliedImageData(const IntRect& rect) const
 {
+    context()->platformContext()->syncSoftwareCanvas();
     return getImageData<Unmultiplied>(rect, *context()->platformContext()->bitmap(), m_size);
 }
@@ -204 +205 @@
 PassRefPtr<ImageData> ImageBuffer::getPremultipliedImageData(const IntRect& rect) const
 {
+    context()->platformContext()->syncSoftwareCanvas();
     return getImageData<Premultiplied>(rect, *context()->platformContext()->bitmap(), m_size);
 }

trunk/WebCore/platform/graphics/skia/ImageSkia.cpp

@@ -48 +48 @@
 #include "skia/ext/image_operations.h"
 #include "skia/ext/platform_canvas.h"
+#if USE(GLES2_RENDERING)
+#include "GLES2Canvas.h"
+#include "GLES2Context.h"
+#include "SkPixelRef.h"
+#endif
 
 namespace WebCore {
@@ -405 +410 @@
 }
 
+#if USE(GLES2_RENDERING)
+static void drawBitmapGLES2(GraphicsContext* ctxt, NativeImageSkia* bitmap, const FloatRect& srcRect, const FloatRect& dstRect, ColorSpace styleColorSpace, CompositeOperator compositeOp)
+{
+    ctxt->platformContext()->prepareForHardwareDraw();
+    GLES2Canvas* gpuCanvas = ctxt->platformContext()->gpuCanvas();
+    gpuCanvas->gles2Context()->makeCurrent();
+    GLES2Texture* texture = gpuCanvas->getTexture(bitmap);
+    if (!texture) {
+        ASSERT(bitmap->config() == SkBitmap::kARGB_8888_Config);
+        ASSERT(bitmap->rowBytes() == bitmap->width() * 4);
+        texture = gpuCanvas->createTexture(bitmap, GLES2Texture::BGRA8, bitmap->width(), bitmap->height());
+        ASSERT(bitmap->pixelRef());
+        texture->load(bitmap->pixelRef()->pixels());
+    }
+    gpuCanvas->drawTexturedRect(texture, srcRect, dstRect, styleColorSpace, compositeOp);
+}
+#endif
+
 // ================================================
 // BitmapImage Class
@@ -430 +453 @@
 
 void BitmapImage::draw(GraphicsContext* ctxt, const FloatRect& dstRect,
-                       const FloatRect& srcRect, ColorSpace, CompositeOperator compositeOp)
+                       const FloatRect& srcRect, ColorSpace colorSpace, CompositeOperator compositeOp)
 {
     if (!m_source.initialized())
@@ -440 +463 @@
     startAnimation();
 
-    const NativeImageSkia* bm = nativeImageForCurrentFrame();
+    NativeImageSkia* bm = nativeImageForCurrentFrame();
     if (!bm)
         return;  // It's too early and we don't have an image yet.
 
+#if  USE(GLES2_RENDERING)
+    if (ctxt->platformContext()->useGPU()) {
+        drawBitmapGLES2(ctxt, bm, srcRect, dstRect, colorSpace, compositeOp);
+        return;
+    }
+#endif
     FloatRect normDstRect = normalizeRect(dstRect);
     FloatRect normSrcRect = normalizeRect(srcRect);
@@ -449 +478 @@
     if (normSrcRect.isEmpty() || normDstRect.isEmpty())
         return;  // Nothing to draw.
+
+    ctxt->platformContext()->prepareForSoftwareDraw();
 
     paintSkBitmap(ctxt->platformContext(),
@@ -471 +502 @@
         return;  // Nothing to draw.
 
+#if  USE(GLES2_RENDERING)
+    if (ctxt->platformContext()->useGPU()) {
+        drawBitmapGLES2(ctxt, &m_nativeImage, srcRect, dstRect, styleColorSpace, compositeOp);
+        return;
+    }
+#endif
+
+    ctxt->platformContext()->prepareForSoftwareDraw();
+
     paintSkBitmap(ctxt->platformContext(),
                   m_nativeImage,