Changeset 106804 in webkit

Timestamp:

Feb 6, 2012 6:18:14 AM (12 years ago)

Author:

noam.rosenthal@nokia.com

Message:

[Qt] Implement ImageBuffer::copyImage(ImageBuffer::DontCopyBackingStore)
​https://bugs.webkit.org/show_bug.cgi?id=77689

Reviewed by Kenneth Rohde Christiansen.

Use StillImageQt::createForRendering when using DontCopyBackingStore.
Enable DontCopyBackingStore in TextureMapperNode.
This removes deep copies resulting from the use of ImageBuffer.

Instrumentation shows that deep image copies resulted from ImageBuffer are eliminated.

• platform/graphics/qt/ImageBufferQt.cpp:

(WebCore::ImageBuffer::copyImage):

• platform/graphics/texmap/TextureMapperNode.cpp:

(WebCore::TextureMapperNode::renderContent):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/qt/ImageBufferQt.cpp (modified) (1 diff)
• platform/graphics/texmap/TextureMapperNode.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-02-06  No'am Rosenthal  <noam.rosenthal@nokia.com>
+
+        [Qt] Implement ImageBuffer::copyImage(ImageBuffer::DontCopyBackingStore)
+        https://bugs.webkit.org/show_bug.cgi?id=77689
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        Use StillImageQt::createForRendering when using DontCopyBackingStore.
+        Enable DontCopyBackingStore in TextureMapperNode.
+        This removes deep copies resulting from the use of ImageBuffer.
+
+        Instrumentation shows that deep image copies resulted from ImageBuffer are eliminated.
+
+        * platform/graphics/qt/ImageBufferQt.cpp:
+        (WebCore::ImageBuffer::copyImage):
+        * platform/graphics/texmap/TextureMapperNode.cpp:
+        (WebCore::TextureMapperNode::renderContent):
+
 2012-02-06  Allan Sandfeld Jensen  <allan.jensen@nokia.com>
 

trunk/Source/WebCore/platform/graphics/qt/ImageBufferQt.cpp

@@ -124 +124 @@
 PassRefPtr<Image> ImageBuffer::copyImage(BackingStoreCopy copyBehavior) const
 {
-    ASSERT(copyBehavior == CopyBackingStore);
-    return StillImage::create(m_data.m_pixmap);
+    if (copyBehavior == CopyBackingStore)
+        return StillImage::create(m_data.m_pixmap);
+
+    return StillImage::createForRendering(&m_data.m_pixmap);
 }
 

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

@@ -187 +187 @@
         context->drawImage(m_currentContent.image.get(), ColorSpaceDeviceRGB, m_state.contentsRect);
 
-    // FIXME: Implement ImageBuffer::DontCopyBackingStore in Qt/GTK ports, and then change this.
-    // See https://bugs.webkit.org/show_bug.cgi?id=77689
-    RefPtr<Image> image = imageBuffer->copyImage(CopyBackingStore);
+    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
 
     // Divide the image to tiles.