Changeset 92227 in webkit

Timestamp:

Aug 2, 2011 2:06:10 PM (13 years ago)

Author:

senorblanco@chromium.org

Message:

[Chromium] Remove an unnecessary readback during accelerated
canvas-to-canvas draws.
​https://bugs.webkit.org/show_bug.cgi?id=65560

Reviewed by James Robinson.

No new tests. (Printing has few tests, sadly.)

• platform/graphics/skia/ImageBufferSkia.cpp:

(WebCore::ImageBuffer::draw):
Revert most of the changes to this file from
​http://trac.webkit.org/changeset/91870, except for the call which makes
the source context current, so that the readPixels() still works.

Location:

trunk/Source/WebCore

Files:

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

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-08-02  Stephen White  <senorblanco@chromium.org>
+
+        [Chromium] Remove an unnecessary readback during accelerated 
+        canvas-to-canvas draws.
+        https://bugs.webkit.org/show_bug.cgi?id=65560
+
+        Reviewed by James Robinson.
+
+        No new tests.  (Printing has few tests, sadly.)
+
+        * platform/graphics/skia/ImageBufferSkia.cpp:
+        (WebCore::ImageBuffer::draw):
+        Revert most of the changes to this file from
+        http://trac.webkit.org/changeset/91870, except for the call which makes
+        the source context current, so that the readPixels() still works.
+
+
 2011-08-02  Filip Pizlo  <fpizlo@apple.com>
 

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

@@ -113 +113 @@
                        CompositeOperator op, bool useLowQualityScale)
 {
-    m_context->platformContext()->makeGrContextCurrent();
-    SkDevice* srcDevice = m_context->platformContext()->canvas()->getDevice();
-    SkBitmap bitmap = srcDevice->accessBitmap(false);
-    SkAutoLockPixels bitmapLock(bitmap);
+    // Set both graphics contexts current. This looks a little weird, but is
+    // necessary since we may be drawing from an accelerated to
+    // non-accelerated context (e.g., printing), or vice versa. Note that it
+    // only works because the context is actually the same underlying context
+    // (or null), since we use one context for accelerated drawing. If that
+    // assumption changes, we'll have to revisit this code.
     context->platformContext()->makeGrContextCurrent();
-    RefPtr<Image> image = BitmapImageSingleFrameSkia::create(bitmap, context == m_context);
+    m_context->platformContext()->makeGrContextCurrent();
+    RefPtr<Image> image = BitmapImageSingleFrameSkia::create(*m_data.m_platformContext.bitmap(), context == m_context);
     context->drawImage(image.get(), styleColorSpace, destRect, srcRect, op, useLowQualityScale);
 }