Changeset 116365 in webkit

Timestamp:

May 7, 2012 4:07:54 PM (12 years ago)

Author:

Martin Robinson

Message:

[Cairo] Implement ImageBuffer::copyImage for BackingStoreCopy == DontCopyBackingStore
​https://bugs.webkit.org/show_bug.cgi?id=85728

Reviewed by Alejandro G. Castro.

No new tests. This should not change functionality, only increase performance.

• platform/graphics/cairo/ImageBufferCairo.cpp:

(WebCore::ImageBuffer::copyImage): Add an implementation that knows how to avoid copying the backing store.
(WebCore::ImageBuffer::draw): Use the copyImage constructor now that it knows how to
avoid copying the backing store.
(WebCore::ImageBuffer::drawPattern): Ditto.

• platform/graphics/texmap/TextureMapperLayer.cpp:

(WebCore::TextureMapperLayer::updateBackingStore): Use DontCopyBackingStore for Cairo
as well.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/cairo/ImageBufferCairo.cpp (modified) (3 diffs)
• platform/graphics/texmap/TextureMapperLayer.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-05-06  Martin Robinson  <mrobinson@igalia.com>
+
+        [Cairo] Implement ImageBuffer::copyImage for BackingStoreCopy == DontCopyBackingStore
+        https://bugs.webkit.org/show_bug.cgi?id=85728
+
+        Reviewed by Alejandro G. Castro.
+
+        No new tests. This should not change functionality, only increase performance.
+
+        * platform/graphics/cairo/ImageBufferCairo.cpp:
+        (WebCore::ImageBuffer::copyImage): Add an implementation that knows how to avoid copying the backing store.
+        (WebCore::ImageBuffer::draw): Use the copyImage constructor now that it knows how to
+        avoid copying the backing store.
+        (WebCore::ImageBuffer::drawPattern): Ditto.
+        * platform/graphics/texmap/TextureMapperLayer.cpp:
+        (WebCore::TextureMapperLayer::updateBackingStore): Use DontCopyBackingStore for Cairo
+        as well.
+
 2012-05-07  Noel Gordon  <noel.gordon@gmail.com>
 

trunk/Source/WebCore/platform/graphics/cairo/ImageBufferCairo.cpp

@@ -85 +85 @@
 PassRefPtr<Image> ImageBuffer::copyImage(BackingStoreCopy copyBehavior) const
 {
-    ASSERT(copyBehavior == CopyBackingStore);
+    if (copyBehavior == CopyBackingStore)
+        return BitmapImage::create(copyCairoImageSurface(m_data.m_surface).leakRef());
+
     // BitmapImage will release the passed in surface on destruction
-    return BitmapImage::create(copyCairoImageSurface(m_data.m_surface).leakRef());
+    return BitmapImage::create(cairo_surface_reference(m_data.m_surface));
 }
 
@@ -98 +100 @@
                        CompositeOperator op , bool useLowQualityScale)
 {
-    // BitmapImage will release the passed in surface on destruction
-    RefPtr<Image> image = BitmapImage::create(cairo_surface_reference(m_data.m_surface));
+    RefPtr<Image> image = copyImage(DontCopyBackingStore);
     context->drawImage(image.get(), styleColorSpace, destRect, srcRect, op, DoNotRespectImageOrientation, useLowQualityScale);
 }
@@ -106 +107 @@
                               const FloatPoint& phase, ColorSpace styleColorSpace, CompositeOperator op, const FloatRect& destRect)
 {
-    // BitmapImage will release the passed in surface on destruction
-    RefPtr<Image> image = BitmapImage::create(cairo_surface_reference(m_data.m_surface));
+    RefPtr<Image> image = copyImage(DontCopyBackingStore);
     image->drawPattern(context, srcRect, patternTransform, phase, styleColorSpace, op, destRect);
 }

trunk/Source/WebCore/platform/graphics/texmap/TextureMapperLayer.cpp

@@ -123 +123 @@
     layer->paintGraphicsLayerContents(*context, dirtyRect);
 
-    RefPtr<Image> image;
-
-#if PLATFORM(QT)
-    image = imageBuffer->copyImage(DontCopyBackingStore);
-#else
-    // FIXME: support DontCopyBackingStore in non-Qt ports that use TextureMapper.
-    image = imageBuffer->copyImage(CopyBackingStore);
-#endif
-
+    RefPtr<Image> image = imageBuffer->copyImage(DontCopyBackingStore);
     static_cast<TextureMapperTiledBackingStore*>(m_backingStore.get())->updateContents(textureMapper, image.get(), m_size, dirtyRect);
     m_state.needsDisplay = false;