[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[paroga at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit f25decbe6e05805d747ddadb9c7482a9470c6715
Author: paroga at webkit.org <paroga at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Nov 15 16:24:38 2010 +0000

    2010-11-15  Patrick Gansterer  <paroga at webkit.org>
    
            Reviewed by Martin Robinson.
    
            Make ContextShadow compile on all platforms
            https://bugs.webkit.org/show_bug.cgi?id=49535
    
            Add a void* typedef for PlatformImage and PlatformContext for unsupported platforms
            and move them into the WebCore namespace like all other Platform* typedefs.
    
            * platform/graphics/ContextShadow.h:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@72007 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 8d2f077..07d464d 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,15 @@
+2010-11-15  Patrick Gansterer  <paroga at webkit.org>
+
+        Reviewed by Martin Robinson.
+
+        Make ContextShadow compile on all platforms
+        https://bugs.webkit.org/show_bug.cgi?id=49535
+
+        Add a void* typedef for PlatformImage and PlatformContext for unsupported platforms
+        and move them into the WebCore namespace like all other Platform* typedefs.
+
+        * platform/graphics/ContextShadow.h:
+
 2010-11-15  Renata Hodovan  <reni at webkit.org>
 
         Reviewed by Andreas Kling.
diff --git a/WebCore/platform/graphics/ContextShadow.h b/WebCore/platform/graphics/ContextShadow.h
index 0160f8a..2b779f7 100644
--- a/WebCore/platform/graphics/ContextShadow.h
+++ b/WebCore/platform/graphics/ContextShadow.h
@@ -38,17 +38,24 @@
 #if PLATFORM(CAIRO)
 typedef struct _cairo cairo_t;
 typedef struct _cairo_surface cairo_surface_t;
-typedef cairo_surface_t* PlatformImage;
-typedef cairo_t* PlatformContext;
 #elif PLATFORM(QT)
 #include <QImage>
 class QPainter;
-typedef QImage PlatformImage;
-typedef QPainter* PlatformContext;
 #endif
 
 namespace WebCore {
 
+#if PLATFORM(CAIRO)
+typedef cairo_surface_t* PlatformImage;
+typedef cairo_t* PlatformContext;
+#elif PLATFORM(QT)
+typedef QImage PlatformImage;
+typedef QPainter* PlatformContext;
+#else
+typedef void* PlatformImage;
+typedef void* PlatformContext;
+#endif
+
 // This is to track and keep the shadow state. We use this rather than
 // using GraphicsContextState to allow possible optimizations (right now
 // only to determine the shadow type, but in future it might covers things

-- 
WebKit Debian packaging