Changeset 437 for trunk/BAL/WKAL/Concretizations/Graphics/Cairo/BCImageBufferCairo.h

Timestamp:

08/15/08 13:25:16 (5 months ago)

Author:

mbensi

Message:

merge with webkit revision 35774

Files:

• trunk/BAL/WKAL/Concretizations/Graphics/Cairo/BCImageBufferCairo.h (modified) (4 diffs)

trunk/BAL/WKAL/Concretizations/Graphics/Cairo/BCImageBufferCairo.h

@@ -34 +34 @@
-#include <memory>
-
-#if !PLATFORM(CG)
-#include "NotImplemented.h"
-#endif
-
-#if PLATFORM(CG)
-typedef struct CGImage* CGImageRef;
-#endif
-
-#if PLATFORM(QT)
-#include <QPixmap>
-QT_BEGIN_NAMESPACE
-class QPainter;
-QT_END_NAMESPACE
-#endif
-
-#if PLATFORM(CAIRO)
-typedef struct _cairo_surface cairo_surface_t;
-#endif
-
-namespace WKAL {
-
@@ -70 +51 @@
-        GraphicsContext* context() const;
-
-#if PLATFORM(CG)
-        CGImageRef cgImage() const { return image()->getCGImageRef(); }
-#elif PLATFORM(QT)
-        QPixmap* pixmap() const;
-#elif PLATFORM(CAIRO)
-        cairo_surface_t* surface() const;
-#endif
-
-#if PLATFORM(CG) || PLATFORM(CAIRO) || PLATFORM(QT)
-        Image* image() const;
-#else
-        Image* image() const { notImplemented(); return 0; }
-#endif
-
-        void clearImage() { m_image.clear(); }
@@ -91 +60 @@
-        String toDataURL(const String& mimeType) const;
-
-        
-
-    private:
-        void* m_data;
@@ -98 +65 @@
-
-        OwnPtr<GraphicsContext> m_context;
-Own
+Ref
-    
-#if PLATFORM(CG)
-        ImageBuffer(void* imageData, const IntSize&, std::auto_ptr<GraphicsContext>);
-#elif PLATFORM(QT)
- &px
+&
-        mutable QPixmap m_pixmap;
-        mutable QPainter* m_painter;
-#elif PLATFORM(CAIRO)
- surface
+
-        mutable cairo_surface_t* m_surface;
-#endif