Changeset 73318 in webkit

Timestamp:

Dec 3, 2010 4:04:49 PM (13 years ago)

Author:

andersca@apple.com

Message:

Clean up the BackingStore implementation
​https://bugs.webkit.org/show_bug.cgi?id=50498

Reviewed by Sam Weinig and Dan Bernstein.

• Shared/BackingStore.cpp:

(WebKit::BackingStore::create):
(WebKit::BackingStore::createSharable):
(WebKit::BackingStore::resize):
Use new numBytesForSize helper function.

(WebKit::BackingStore::createFlippedGraphicsContext):
Make this function platform independent.

• Shared/BackingStore.h:

(WebKit::BackingStore::numBytesForSize):
Given a size, return the number of bytes needed for it.

(WebKit::BackingStore::sizeInBytes):
Implement.

• Shared/cg/BackingStoreCG.cpp:

(WebKit::BackingStore::paint):
Don't use CGBitmapContextCreateImage; it creates an extra copy of the image data.

• Shared/qt/BackingStoreQt.cpp:

Remove createFlippedGraphicsContext.

Location:

trunk/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• Shared/BackingStore.cpp (modified) (6 diffs)
• Shared/BackingStore.h (modified) (1 diff)
• Shared/cg/BackingStoreCG.cpp (modified) (1 diff)
• Shared/qt/BackingStoreQt.cpp (modified) (1 diff)

trunk/WebKit2/ChangeLog

@@ +1 @@
+2010-12-03  Anders Carlsson  <andersca@apple.com>
+
+        Reviewed by Sam Weinig and Dan Bernstein.
+
+        Clean up the BackingStore implementation
+        https://bugs.webkit.org/show_bug.cgi?id=50498
+
+        * Shared/BackingStore.cpp:
+        (WebKit::BackingStore::create):
+        (WebKit::BackingStore::createSharable):
+        (WebKit::BackingStore::resize):
+        Use new numBytesForSize helper function.
+
+        (WebKit::BackingStore::createFlippedGraphicsContext):
+        Make this function platform independent.
+
+        * Shared/BackingStore.h:
+        (WebKit::BackingStore::numBytesForSize):
+        Given a size, return the number of bytes needed for it.
+
+        (WebKit::BackingStore::sizeInBytes):
+        Implement.
+
+        * Shared/cg/BackingStoreCG.cpp:
+        (WebKit::BackingStore::paint):
+        Don't use CGBitmapContextCreateImage; it creates an extra copy of the image data.
+
+        * Shared/qt/BackingStoreQt.cpp:
+        Remove createFlippedGraphicsContext.
+
 2010-12-03  Siddharth Mathur  <siddharth.mathur@nokia.com>
 

trunk/WebKit2/Shared/BackingStore.cpp

@@ -27 +27 @@
 
 #include "SharedMemory.h"
+#include <WebCore/GraphicsContext.h>
 
 using namespace WebCore;
@@ -34 +35 @@
 PassRefPtr<BackingStore> BackingStore::create(const WebCore::IntSize& size)
 {
-    size_t numBytes = size.width() * size.height() * 4;
+    size_t numBytes = numBytesForSize(size);
     
     void* data = 0;
@@ -45 +46 @@
 PassRefPtr<BackingStore> BackingStore::createSharable(const IntSize& size)
 {
-    size_t numBytes = size.width() * size.height() * 4;
+    size_t numBytes = numBytesForSize(size);
     
     RefPtr<SharedMemory> sharedMemory = SharedMemory::create(numBytes);
@@ -61 +62 @@
         return 0;
 
-    size_t numBytes = size.width() * size.height() * 4;
+    size_t numBytes = numBytesForSize(size);
     ASSERT_UNUSED(numBytes, sharedMemory->size() >= numBytes);
 
@@ -101 +102 @@
         return true;
 
-    size_t newNumBytes = size.width() * size.height() * 4;
+    size_t newNumBytes = numBytesForSize(size);
     
     // Try to resize.
@@ -125 +126 @@
 }
 
+PassOwnPtr<GraphicsContext> BackingStore::createFlippedGraphicsContext()
+{
+    OwnPtr<GraphicsContext> graphicsContext = createGraphicsContext();
+
+    // Flip the coordinate system.
+    graphicsContext->translate(0, m_size.height());
+    graphicsContext->scale(FloatSize(1, -1));
+
+    return graphicsContext.release();
+}
+    
 } // namespace WebKit

trunk/WebKit2/Shared/BackingStore.h

@@ -73 +73 @@
 
     bool isBackedBySharedMemory() const { return m_sharedMemory; }
+    static size_t numBytesForSize(const WebCore::IntSize& size) { return size.width() * size.height() * 4; }
+
     void* data() const;
+    size_t sizeInBytes() const { return numBytesForSize(m_size); }
 
     WebCore::IntSize m_size;

trunk/WebKit2/Shared/cg/BackingStoreCG.cpp

@@ -46 +46 @@
 }
 
-PassOwnPtr<GraphicsContext> BackingStore::createFlippedGraphicsContext()
-{
-    RetainPtr<CGColorSpaceRef> colorSpace(AdoptCF, CGColorSpaceCreateDeviceRGB());
-    RetainPtr<CGContextRef> bitmapContext(AdoptCF, CGBitmapContextCreate(data(), m_size.width(), m_size.height(), 8,  m_size.width() * 4, colorSpace.get(), 
-                                                                         kCGImageAlphaPremultipliedFirst | kCGBitmapByteOrder32Host));
-
-    return adoptPtr(new GraphicsContext(bitmapContext.get()));
-}
-
 void BackingStore::paint(WebCore::GraphicsContext& context, const WebCore::IntPoint& dstPoint, const WebCore::IntRect& srcRect)
 {
     OwnPtr<GraphicsContext> sourceContext(createGraphicsContext());
 
-    // FIXME: This creates an extra copy.
-    RetainPtr<CGImageRef> image(AdoptCF, CGBitmapContextCreateImage(sourceContext->platformContext()));
+    CGContextRef sourceCGContext = sourceContext->platformContext();
+
+    RetainPtr<CGDataProviderRef> dataProvider(AdoptCF, CGDataProviderCreateWithData(0, data(), sizeInBytes(), 0));
+    RetainPtr<CGImageRef> image(AdoptCF, CGImageCreate(CGBitmapContextGetWidth(sourceCGContext), 
+                                                       CGBitmapContextGetHeight(sourceCGContext),
+                                                       CGBitmapContextGetBitsPerComponent(sourceCGContext),
+                                                       CGBitmapContextGetBitsPerPixel(sourceCGContext),
+                                                       CGBitmapContextGetBytesPerRow(sourceCGContext),
+                                                       CGBitmapContextGetColorSpace(sourceCGContext),
+                                                       CGBitmapContextGetBitmapInfo(sourceCGContext),
+                                                       dataProvider.get(), 0, false, kCGRenderingIntentDefault));
 
     CGContextRef cgContext = context.platformContext();

trunk/WebKit2/Shared/qt/BackingStoreQt.cpp

@@ -47 +47 @@
 }
 
-PassOwnPtr<GraphicsContext> BackingStore::createFlippedGraphicsContext()
-{
-    // This is CG specific so we should not use it.
-    ASSERT_NOT_REACHED();
-    return 0;
-}
-
 void BackingStore::paint(GraphicsContext& context, const IntPoint& dstPoint, const IntRect& srcRect)
 {