b=333613, misc canvas stuff for 1.8 branch, updating trunk for parity

git-svn-id: svn://10.0.0.236/trunk@196028 18797224-902f-48f8-a5cc-f745e15eee43

mozilla/content/canvas/src/nsCanvasRenderingContext2D.cpp

@@ -115,6 +115,16 @@
 
 #ifdef XP_WIN
 #include "cairo-win32.h"
+
+#ifdef MOZILLA_1_8_BRANCH
+extern "C" {
+cairo_surface_t *
+_cairo_win32_surface_create_dib (cairo_format_t format,
+                                 int	        width,
+                                 int	        height);
+}
+#endif
+
 #ifndef M_PI
 #define M_PI		3.14159265358979323846
 #define M_PI_2		1.57079632679489661923
@@ -724,6 +734,9 @@ nsCanvasRenderingContext2D::SetDimensions(PRInt32 width, PRInt32 height)
 #ifndef MOZILLA_1_8_BRANCH
     mSurface = cairo_win32_surface_create_with_dib (CAIRO_FORMAT_ARGB32,
                                                     mWidth, mHeight);
+#else
+    mSurface = _cairo_win32_surface_create_dib (CAIRO_FORMAT_ARGB32,
+                                                mWidth, mHeight);
 #endif
 #elif MOZ_WIDGET_GTK2
     // On most current X servers, using the software-only surface