Changeset 21415 in webkit

Timestamp:

May 11, 2007 1:27:19 PM (17 years ago)

Author:

bdash

Message:

2007-05-11 Holger Hans Peter Freyther <​zecke@selfish.org>

Reviewed by Maciej.

Bug 13676: [cairo/gdk] Provide implementation for ImageBufferCairo
​http://bugs.webkit.org/show_bug.cgi?id=13676

There are no test cases that explicitly cover platform/graphics at present.

• platform/graphics/ImageBuffer.h: Add cairo bits
• platform/graphics/cairo/ImageBufferCairo.cpp: Untested implementation of the ImagerBuffer using the image_surface (WebCore::ImageBuffer::create): Create a reasonable sized surface (WebCore::ImageBuffer::ImageBuffer): Use a cairo_surface and create a GraphicsContext. GraphicsContext takes the cairo_t ownership (WebCore::ImageBuffer::~ImageBuffer): Unref the surface (WebCore::ImageBuffer::context): simply return the GraphicsContext, it should be possible to directly draw on it.

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/ImageBuffer.h (modified) (2 diffs)
• platform/graphics/cairo/ImageBufferCairo.cpp (modified) (2 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2007-05-11  Holger Hans Peter Freyther  <zecke@selfish.org>
+
+        Reviewed by Maciej.
+
+        Bug 13676: [cairo/gdk] Provide implementation for ImageBufferCairo
+        http://bugs.webkit.org/show_bug.cgi?id=13676
+
+        There are no test cases that explicitly cover platform/graphics at present.
+
+        * platform/graphics/ImageBuffer.h: Add cairo bits
+        * platform/graphics/cairo/ImageBufferCairo.cpp: Untested implementation of the ImagerBuffer using the image_surface
+        (WebCore::ImageBuffer::create): Create a reasonable sized surface
+        (WebCore::ImageBuffer::ImageBuffer): Use a cairo_surface and create a GraphicsContext. GraphicsContext takes the cairo_t ownership
+        (WebCore::ImageBuffer::~ImageBuffer): Unref the surface
+        (WebCore::ImageBuffer::context): simply return the GraphicsContext, it should be possible to directly draw on it.
+
 2007-05-11  Mitz Pettel  <mitz@webkit.org>
 

trunk/WebCore/platform/graphics/ImageBuffer.h

@@ -40 +40 @@
 #endif
 
+#if PLATFORM(CAIRO)
+struct _cairo_surface;
+#endif
+
 namespace WebCore {
 
@@ -78 +82 @@
         mutable QPixmap m_pixmap;
         mutable QPainter* m_painter;
+#elif PLATFORM(CAIRO)
+        ImageBuffer(_cairo_surface* surface);
+        mutable _cairo_surface *m_surface;
 #endif
     };

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

@@ -29 +29 @@
 
 #include "GraphicsContext.h"
+#include <cairo.h>
 
 #define notImplemented() do { fprintf(stderr, "FIXME: UNIMPLEMENTED %s %s:%d\n", __PRETTY_FUNCTION__, __FILE__, __LINE__); } while(0)
@@ -36 +37 @@
 namespace WebCore {
 
-auto_ptr<ImageBuffer> ImageBuffer::create(const IntSize& size, bool grayScale)
+auto_ptr<ImageBuffer> ImageBuffer::create(const IntSize& size, bool)
 {
-    return auto_ptr<ImageBuffer>();
+    cairo_surface_t* surface = cairo_image_surface_create(CAIRO_FORMAT_ARGB32,
+                                                          size.width(), size.height());
+    if (cairo_surface_status(surface) != CAIRO_STATUS_SUCCESS)
+        return auto_ptr<ImageBuffer>();
+
+    return auto_ptr<ImageBuffer>(new ImageBuffer(surface));
 }
 
+ImageBuffer::ImageBuffer(_cairo_surface* surface)
+    : m_surface(surface)
+{
+    cairo_t* context = cairo_create(m_surface);
+    m_context.set(new GraphicsContext(context));
+
+    /*
+     * The context is now owned by the GraphicsContext
+     */
+    cairo_destroy(context);
+}
 
 ImageBuffer::~ImageBuffer()
 {
+    cairo_surface_destroy(m_surface);
 }
 
 GraphicsContext* ImageBuffer::context() const
 {
-    return 0;
+    return m_context.get();
 }