Changeset 88967 in webkit

Timestamp:

Jun 15, 2011 12:50:30 PM (13 years ago)

Author:

andersca@apple.com

Message:

2011-06-15 Anders Carlsson <​andersca@apple.com>

Reviewed by Darin Adler.

Add ShareableBitmap::createImage and get rid of WebCoreArgumentCodersCG.cpp
​https://bugs.webkit.org/show_bug.cgi?id=62742

• Shared/ShareableBitmap.h: Move createImage out of the #if PLATFORM(QT) section.

• Shared/WebCoreArgumentCoders.cpp: (CoreIPC::decodeImage): Call ShareableBitmap::createImage.

• Shared/WebCoreArgumentCoders.h: remove createImage function declaration.

• Shared/cairo/ShareableBitmapCairo.cpp: (WebKit::ShareableBitmap::createImage): Add implementation.

• Shared/cg/ShareableBitmapCG.cpp: (WebKit::ShareableBitmap::createGraphicsContext): (WebKit::ShareableBitmap::createImage): Move createImage implementation from WebCoreArgumentCodersCG.cpp here.

• WebKit2.xcodeproj/project.pbxproj:
• win/WebKit2.vcproj: Update projects.

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• Shared/ShareableBitmap.h (modified) (4 diffs)
• Shared/WebCoreArgumentCoders.cpp (modified) (1 diff)
• Shared/WebCoreArgumentCoders.h (modified) (1 diff)
• Shared/cairo/ShareableBitmapCairo.cpp (modified) (2 diffs)
• Shared/cg/ShareableBitmapCG.cpp (modified) (3 diffs)
• Shared/cg/WebCoreArgumentCodersCG.cpp (deleted)
• WebKit2.xcodeproj/project.pbxproj (modified) (4 diffs)
• win/WebKit2.vcproj (modified) (1 diff)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2011-06-15  Anders Carlsson  <andersca@apple.com>
+
+        Reviewed by Darin Adler.
+
+        Add ShareableBitmap::createImage and get rid of WebCoreArgumentCodersCG.cpp
+        https://bugs.webkit.org/show_bug.cgi?id=62742
+
+        * Shared/ShareableBitmap.h:
+        Move createImage out of the #if PLATFORM(QT) section.
+
+        * Shared/WebCoreArgumentCoders.cpp:
+        (CoreIPC::decodeImage):
+        Call ShareableBitmap::createImage.
+
+        * Shared/WebCoreArgumentCoders.h:
+        remove createImage function declaration.
+
+        * Shared/cairo/ShareableBitmapCairo.cpp:
+        (WebKit::ShareableBitmap::createImage):
+        Add implementation.
+
+        * Shared/cg/ShareableBitmapCG.cpp:
+        (WebKit::ShareableBitmap::createGraphicsContext):
+        (WebKit::ShareableBitmap::createImage):
+        Move createImage implementation from WebCoreArgumentCodersCG.cpp here.
+
+        * WebKit2.xcodeproj/project.pbxproj:
+        * win/WebKit2.vcproj:
+        Update projects.
+
 2011-06-15  Anders Carlsson  <andersca@apple.com>
 

trunk/Source/WebKit2/Shared/ShareableBitmap.h

@@ -28 +28 @@
 
 #include "SharedMemory.h"
-#include <WebCore/Image.h>
 #include <WebCore/IntRect.h>
 #include <wtf/PassOwnPtr.h>
@@ -48 +47 @@
 
 namespace WebCore {
+    class Image;
     class GraphicsContext;
 }
@@ -108 +108 @@
     bool isBackedBySharedMemory() const { return m_sharedMemory; }
 
+    // This creates a bitmap image 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.
+    PassRefPtr<WebCore::Image> createImage();
+
 #if USE(CG)
     // This creates a copied CGImageRef (most likely a copy-on-write) of the shareable bitmap.
@@ -123 +127 @@
     // This is only safe to use when we know that the contents of the shareable bitmap won't change.
     QImage createQImage();
-    PassRefPtr<WebCore::Image> createImage();
 #endif
 

trunk/Source/WebKit2/Shared/WebCoreArgumentCoders.cpp

@@ -182 +182 @@
     if (!bitmap)
         return false;
-    image = createImage(bitmap.get());
+    image = bitmap->createImage();
     if (!image)
         return false;

trunk/Source/WebKit2/Shared/WebCoreArgumentCoders.h

@@ -142 +142 @@
 void encodeImage(ArgumentEncoder*, WebCore::Image*);
 bool decodeImage(ArgumentDecoder*, RefPtr<WebCore::Image>&);
-RefPtr<WebCore::Image> createImage(WebKit::ShareableBitmap*);
 
 template<> struct ArgumentCoder<WebCore::Cursor> {

trunk/Source/WebKit2/Shared/cairo/ShareableBitmapCairo.cpp

@@ -29 +29 @@
 #include "ShareableBitmap.h"
 
+#include <WebCore/BitmapImage.h>
 #include <WebCore/CairoUtilities.h>
 #include <WebCore/GraphicsContext.h>
-#include <WebCore/NotImplemented.h>
 #include <WebCore/PlatformContextCairo.h>
 
@@ -73 +73 @@
 }
 
+PassRefPtr<Image> ShareableBitmap::createImage()
+{
+    RefPtr<cairo_surface_t> surface = createCairoSurface();
+    if (!surface)
+        return 0;
+
+    // BitmapImage::create adopts the cairo_surface_t that's passed in, which is why we need to leakRef here.
+    return BitmapImage::create(surface.release().leakRef());
+}
+
 } // namespace WebKit

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

@@ -27 +27 @@
 #include "ShareableBitmap.h"
 
+#include <WebCore/BitmapImage.h>
 #include <WebCore/GraphicsContext.h>
 #include <wtf/RetainPtr.h>
@@ -49 +50 @@
 {
     RetainPtr<CGColorSpaceRef> colorSpace(AdoptCF, CGColorSpaceCreateDeviceRGB());
-
 
     ref(); // Balanced by deref in releaseBitmapContextData.
@@ -107 +107 @@
 }
 
+PassRefPtr<Image> ShareableBitmap::createImage()
+{
+    RetainPtr<CGImageRef> platformImage = makeCGImage();
+    if (!platformImage)
+        return 0;
+
+    // BitmapImage::create adopts the CGImageRef that's passed in, which is why we need to leakRef here.
+    return BitmapImage::create(platformImage.leakRef());
+}
+
 } // namespace WebKit

trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj

@@ -413 +413 @@
                 9391F2CB121B67AD00EBF7E8 /* WebFrameNetworkingContext.h in Headers */ = {isa = PBXBuildFile; fileRef = 9391F283121B38F500EBF7E8 /* WebFrameNetworkingContext.h */; };
                 939AE7661316E99C00AE06A6 /* WebCoreArgumentCoders.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 939AE7651316E99C00AE06A6 /* WebCoreArgumentCoders.cpp */; };
-                939AE7681316E9AD00AE06A6 /* WebCoreArgumentCodersCG.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 939AE7671316E9AD00AE06A6 /* WebCoreArgumentCodersCG.cpp */; };
                 93C01DAC139AC91700ED51D7 /* CoreIPCClientRunLoop.h in Headers */ = {isa = PBXBuildFile; fileRef = 93C01DAA139AC91700ED51D7 /* CoreIPCClientRunLoop.h */; };
                 93C01DAD139AC91700ED51D7 /* CoreIPCClientRunLoop.mm in Sources */ = {isa = PBXBuildFile; fileRef = 93C01DAB139AC91700ED51D7 /* CoreIPCClientRunLoop.mm */; };
@@ -1352 +1351 @@
                 9391F284121B38F500EBF7E8 /* WebFrameNetworkingContext.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebFrameNetworkingContext.mm; sourceTree = "<group>"; };
                 939AE7651316E99C00AE06A6 /* WebCoreArgumentCoders.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebCoreArgumentCoders.cpp; sourceTree = "<group>"; };
-                939AE7671316E9AD00AE06A6 /* WebCoreArgumentCodersCG.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebCoreArgumentCodersCG.cpp; sourceTree = "<group>"; };
                 93C01DAA139AC91700ED51D7 /* CoreIPCClientRunLoop.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CoreIPCClientRunLoop.h; sourceTree = "<group>"; };
                 93C01DAB139AC91700ED51D7 /* CoreIPCClientRunLoop.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = CoreIPCClientRunLoop.mm; sourceTree = "<group>"; };
@@ -3254 +3252 @@
                         children = (
                                 C01A260012662F2100C9ED55 /* ShareableBitmapCG.cpp */,
-                                939AE7671316E9AD00AE06A6 /* WebCoreArgumentCodersCG.cpp */,
                         );
                         path = cg;
@@ -4441 +4438 @@
                                 51A9E12A1315ED35009E7031 /* WebKeyValueStorageManagerProxyMessageReceiver.cpp in Sources */,
                                 939AE7661316E99C00AE06A6 /* WebCoreArgumentCoders.cpp in Sources */,
-                                939AE7681316E9AD00AE06A6 /* WebCoreArgumentCodersCG.cpp in Sources */,
                                 330934471315B9220097A7BC /* WebCookieManagerMessageReceiver.cpp in Sources */,
                                 330934491315B9220097A7BC /* WebCookieManagerProxyMessageReceiver.cpp in Sources */,

trunk/Source/WebKit2/win/WebKit2.vcproj

@@ -1306 +1306 @@
                                         </FileConfiguration>
                                 </File>
-                                <File
-                                        RelativePath="..\Shared\cg\WebCoreArgumentCodersCG.cpp"
-                                        >
-                                        <FileConfiguration
-                                                Name="Debug_Cairo_CFLite|Win32"
-                                                ExcludedFromBuild="true"
-                                                >
-                                                <Tool
-                                                        Name="VCCLCompilerTool"
-                                                />
-                                        </FileConfiguration>
-                                        <FileConfiguration
-                                                Name="Release_Cairo_CFLite|Win32"
-                                                ExcludedFromBuild="true"
-                                                >
-                                                <Tool
-                                                        Name="VCCLCompilerTool"
-                                                />
-                                        </FileConfiguration>
-                                </File>
                                 <Filter
                                         Name="win"