Changeset 82151 in webkit

Timestamp:

Mar 28, 2011 1:45:58 PM (13 years ago)

Author:

andersca@apple.com

Message:

2011-03-28 Anders Carlsson <​andersca@apple.com>

Reviewed by Sam Weinig.

CGImageRefs must hold a strong reference to underlying data
​https://bugs.webkit.org/show_bug.cgi?id=57263
<rdar://problem/9146179>

Make paintBitmapContext use CGBitmapContextCreateImage, which creates a copy-on-write copy
of the bitmap data. Also, add ShareableBitmap::makeCGImageCopy which does the same thing, and
ShareableBitmap::makeCGImage in the cases where we know that the ShareableBitmap data will never change.

• Platform/cg/CGUtilities.cpp: (WebKit::paintImage): Factor image painting code out into a separate function.

(WebKit::paintBitmapContext):
Call paintImage.

• Shared/API/c/cg/WKImageCG.cpp: (WKImagemakeCGImage): Use ShareableBitmap::makeCGImageCopy.

• Shared/ShareableBitmap.h:
• Shared/cg/ShareableBitmapCG.cpp: (WebKit::ShareableBitmap::createGraphicsContext): (WebKit::ShareableBitmap::paint): (WebKit::ShareableBitmap::makeCGImageCopy): (WebKit::ShareableBitmap::makeCGImage): (WebKit::ShareableBitmap::releaseBitmapContextData): (WebKit::ShareableBitmap::releaseDataProviderData): Add makeCGImage and makeCGImageCopy.

• Shared/cg/WebCoreArgumentCodersCG.cpp: (CoreIPC::createImage): Use ShareableBitmap::makeCGImage.

• UIProcess/API/mac/PageClientImpl.mm: (WebKit::PageClientImpl::setDragImage): Use ShareableBitmap::makeCGImage and plug a CGImageRef leak.

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• Platform/cg/CGUtilities.cpp (modified) (2 diffs)
• Platform/cg/CGUtilities.h (modified) (1 diff)
• Shared/API/c/cg/WKImageCG.cpp (modified) (1 diff)
• Shared/ShareableBitmap.h (modified) (3 diffs)
• Shared/cg/ShareableBitmapCG.cpp (modified) (3 diffs)
• Shared/cg/WebCoreArgumentCodersCG.cpp (modified) (1 diff)
• UIProcess/API/mac/PageClientImpl.mm (modified) (1 diff)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2011-03-28  Anders Carlsson  <andersca@apple.com>
+
+        Reviewed by Sam Weinig.
+
+        CGImageRefs must hold a strong reference to underlying data
+        https://bugs.webkit.org/show_bug.cgi?id=57263
+        <rdar://problem/9146179>
+
+        Make paintBitmapContext use CGBitmapContextCreateImage, which creates a copy-on-write copy
+        of the bitmap data. Also, add ShareableBitmap::makeCGImageCopy which does the same thing, and
+        ShareableBitmap::makeCGImage in the cases where we know that the ShareableBitmap data will never change.
+
+        * Platform/cg/CGUtilities.cpp:
+        (WebKit::paintImage):
+        Factor image painting code out into a separate function.
+
+        (WebKit::paintBitmapContext):
+        Call paintImage.
+
+        * Shared/API/c/cg/WKImageCG.cpp:
+        (WKImagemakeCGImage):
+        Use ShareableBitmap::makeCGImageCopy.
+
+        * Shared/ShareableBitmap.h:
+        * Shared/cg/ShareableBitmapCG.cpp:
+        (WebKit::ShareableBitmap::createGraphicsContext):
+        (WebKit::ShareableBitmap::paint):
+        (WebKit::ShareableBitmap::makeCGImageCopy):
+        (WebKit::ShareableBitmap::makeCGImage):
+        (WebKit::ShareableBitmap::releaseBitmapContextData):
+        (WebKit::ShareableBitmap::releaseDataProviderData):
+        Add makeCGImage and makeCGImageCopy.
+
+        * Shared/cg/WebCoreArgumentCodersCG.cpp:
+        (CoreIPC::createImage):
+        Use ShareableBitmap::makeCGImage.
+        
+        * UIProcess/API/mac/PageClientImpl.mm:
+        (WebKit::PageClientImpl::setDragImage):
+        Use ShareableBitmap::makeCGImage and plug a CGImageRef leak.
+
 2011-03-28  Alexey Proskuryakov  <ap@apple.com>
 

trunk/Source/WebKit2/Platform/cg/CGUtilities.cpp

@@ -30 +30 @@
 
 namespace WebKit {
-    
-void paintBitmapContext(CGContextRef context, CGContextRef bitmapContext, CGPoint destination, CGRect source)
+
+void paintImage(CGContextRef context, CGImageRef image, CGPoint destination, CGRect source)
 {
-    void* bitmapData = CGBitmapContextGetData(bitmapContext);
-    ASSERT(bitmapData);
-
-    size_t imageWidth = CGBitmapContextGetWidth(bitmapContext);
-    size_t imageHeight = CGBitmapContextGetHeight(bitmapContext);
-
-    size_t bytesPerRow = CGBitmapContextGetBytesPerRow(bitmapContext);
-
-    RetainPtr<CGDataProviderRef> dataProvider(AdoptCF, CGDataProviderCreateWithData(0, bitmapData, bytesPerRow * imageHeight, 0));
-    RetainPtr<CGImageRef> image(AdoptCF, CGImageCreate(imageWidth, imageHeight, 
-                                                       CGBitmapContextGetBitsPerComponent(bitmapContext),
-                                                       CGBitmapContextGetBitsPerPixel(bitmapContext), 
-                                                       bytesPerRow,
-                                                       CGBitmapContextGetColorSpace(bitmapContext), 
-                                                       CGBitmapContextGetBitmapInfo(bitmapContext), 
-                                                       dataProvider.get(), 0, false, kCGRenderingIntentDefault));
-
     CGContextSaveGState(context);
 
@@ -55 +38 @@
     CGContextScaleCTM(context, 1, -1);
 
+    size_t imageHeight = CGImageGetHeight(image);
+    size_t imageWidth = CGImageGetWidth(image);
+
     CGFloat destX = destination.x - source.origin.x;
     CGFloat destY = -static_cast<CGFloat>(imageHeight) - destination.y + source.origin.y;
 
-    CGContextDrawImage(context, CGRectMake(destX, destY, imageWidth, imageHeight), image.get());
+    CGContextDrawImage(context, CGRectMake(destX, destY, imageWidth, imageHeight), image);
     CGContextRestoreGState(context);
 }
-    
+
+void paintBitmapContext(CGContextRef context, CGContextRef bitmapContext, CGPoint destination, CGRect source)
+{
+    RetainPtr<CGImageRef> image(AdoptCF, CGBitmapContextCreateImage(bitmapContext));
+    paintImage(context, image.get(), destination, source);
+}
+
 } // namespace WebKit
 

trunk/Source/WebKit2/Platform/cg/CGUtilities.h

@@ -29 +29 @@
 namespace WebKit {
 
+void paintImage(CGContextRef, CGImageRef, CGPoint destination, CGRect source);
 void paintBitmapContext(CGContextRef, CGContextRef bitmapContext, CGPoint destination, CGRect source);
 

trunk/Source/WebKit2/Shared/API/c/cg/WKImageCG.cpp

@@ -37 +37 @@
 CGImageRef WKImageCreateCGImage(WKImageRef imageRef)
 {
-    OwnPtr<GraphicsContext> sourceContext = toImpl(imageRef)->bitmap()->createGraphicsContext();
-    return CGBitmapContextCreateImage(sourceContext->platformContext());
+    return toImpl(imageRef)->bitmap()->makeCGImageCopy().leakRef();
 }
 

trunk/Source/WebKit2/Shared/ShareableBitmap.h

@@ -33 +33 @@
 #include <wtf/RefCounted.h>
 #include <wtf/RefPtr.h>
+
+#if PLATFORM(MAC)
+#include <wtf/RetainPtr.h>
+#endif
 
 namespace WebCore {
@@ -72 +76 @@
     bool isBackedBySharedMemory() const { return m_sharedMemory; }
 
+#if PLATFORM(CG)
+    // This creates a copied CGImageRef (most likely a copy-on-write) of the shareable bitmap.
+    RetainPtr<CGImageRef> makeCGImageCopy();
+
+    // This creates a CGImageRef that directly references the shared bitmap data.
+    // This is only safe to use when we know that the contents of the shareable bitmap won't change.
+    RetainPtr<CGImageRef> makeCGImage();
+#endif
+
 private:
     ShareableBitmap(const WebCore::IntSize&, void*);
@@ -78 +91 @@
     static size_t numBytesForSize(const WebCore::IntSize& size) { return size.width() * size.height() * 4; }
 
-    static void releaseData(void* typelessBitmap, void* typelessData);
-    
+#if PLATFORM(CG)
+    static void releaseBitmapContextData(void* typelessBitmap, void* typelessData);
+    static void releaseDataProviderData(void* typelessBitmap, const void* typelessData, size_t);
+#endif
+
     void* data() const;
     size_t sizeInBytes() const { return numBytesForSize(m_size); }

trunk/Source/WebKit2/Shared/cg/ShareableBitmapCG.cpp

@@ -39 +39 @@
     RetainPtr<CGColorSpaceRef> colorSpace(AdoptCF, CGColorSpaceCreateDeviceRGB());
 
-    ref(); // Balanced by deref in releaseData.
+    ref(); // Balanced by deref in releaseBitmapContextData.
     RetainPtr<CGContextRef> bitmapContext(AdoptCF, CGBitmapContextCreateWithData(data(),
         m_size.width(), m_size.height(), 8, m_size.width() * 4, colorSpace.get(),
-        kCGImageAlphaPremultipliedFirst | kCGBitmapByteOrder32Host, releaseData, this));
+        kCGImageAlphaPremultipliedFirst | kCGBitmapByteOrder32Host, releaseBitmapContextData, this));
 
     // We want the origin to be in the top left corner so we flip the backing store context.
@@ -53 +53 @@
 void ShareableBitmap::paint(WebCore::GraphicsContext& context, const IntPoint& dstPoint, const IntRect& srcRect)
 {
-    paintBitmapContext(context.platformContext(), createGraphicsContext()->platformContext(), dstPoint, srcRect);
+    paintImage(context.platformContext(), makeCGImageCopy().get(), dstPoint, srcRect);
 }
 
-void ShareableBitmap::releaseData(void* typelessBitmap, void* typelessData)
+RetainPtr<CGImageRef> ShareableBitmap::makeCGImageCopy()
+{
+    OwnPtr<GraphicsContext> graphicsContext = createGraphicsContext();
+    RetainPtr<CGImageRef> image(AdoptCF, CGBitmapContextCreateImage(graphicsContext->platformContext()));
+    return image;
+}
+
+RetainPtr<CGImageRef> ShareableBitmap::makeCGImage()
+{
+    ref(); // Balanced by deref in releaseDataProviderData.
+    RetainPtr<CGDataProvider> dataProvider(AdoptCF, CGDataProviderCreateWithData(this, data(), sizeInBytes(), releaseDataProviderData));
+
+    RetainPtr<CGColorSpaceRef> colorSpace(AdoptCF, CGColorSpaceCreateDeviceRGB());
+    RetainPtr<CGImageRef> image(AdoptCF, CGImageCreate(m_size.width(), m_size.height(), 8, 32, m_size.width() * 4, colorSpace.get(), kCGImageAlphaPremultipliedFirst | kCGBitmapByteOrder32Host, dataProvider.get(), 0, false, kCGRenderingIntentDefault));
+    return image;
+}
+
+void ShareableBitmap::releaseBitmapContextData(void* typelessBitmap, void* typelessData)
 {
     ShareableBitmap* bitmap = static_cast<ShareableBitmap*>(typelessBitmap);
@@ -63 +80 @@
 }
 
+void ShareableBitmap::releaseDataProviderData(void* typelessBitmap, const void* typelessData, size_t)
+{
+    ShareableBitmap* bitmap = static_cast<ShareableBitmap*>(typelessBitmap);
+    ASSERT_UNUSED(typelessData, bitmap->data() == typelessData);
+    bitmap->deref(); // Balanced by ref in createCGImage.
+}
+
 } // namespace WebKit

trunk/Source/WebKit2/Shared/cg/WebCoreArgumentCodersCG.cpp

@@ -37 +37 @@
 RefPtr<Image> createImage(ShareableBitmap* bitmap)
 {
-    RetainPtr<CGImageRef> platformImage(AdoptCF, CGBitmapContextCreateImage(bitmap->createGraphicsContext()->platformContext()));
+    RetainPtr<CGImageRef> platformImage = bitmap->makeCGImage();
     if (!platformImage)
         return 0;

trunk/Source/WebKit2/UIProcess/API/mac/PageClientImpl.mm

@@ -300 +300 @@
 void PageClientImpl::setDragImage(const IntPoint& clientPosition, const IntSize& imageSize, PassRefPtr<ShareableBitmap> dragImage, bool isLinkDrag)
 {
-    OwnPtr<GraphicsContext> graphicsContext = dragImage->createGraphicsContext();
-    RetainPtr<NSImage> dragNSImage(AdoptNS, [[NSImage alloc] initWithCGImage:CGBitmapContextCreateImage(graphicsContext->platformContext()) size:imageSize]);
+    RetainPtr<CGImageRef> dragCGImage = dragImage->makeCGImage();
+    RetainPtr<NSImage> dragNSImage(AdoptNS, [[NSImage alloc] initWithCGImage:dragCGImage.get() size:imageSize]);
+
     [m_wkView _setDragImage:dragNSImage.get() at:clientPosition linkDrag:isLinkDrag];
 }