[patch] ugly and incomplete patch, not even compile tested

moz-svg-renderer_newer_cairo.diff (text/plain), 4.90 KB, created by Stephane Loeuillet on 2005-08-03 20:18:21 UTC

Les sous-répertoires ./CVS et ../fir-1.0.6-cairo/CVS sont identiques.
diff -u ./nsSVGCairoCanvas.cpp ../fir-1.0.6-cairo/nsSVGCairoCanvas.cpp
--- ./nsSVGCairoCanvas.cpp	2005-08-04 07:08:58.000000000 +0200
+++ ../fir-1.0.6-cairo/nsSVGCairoCanvas.cpp	2005-08-04 07:08:46.000000000 +0200
@@ -115,10 +115,14 @@
   surface->GetSize(&mWidth, &mHeight);
   GdkDrawable *drawable = surface->GetDrawable();
 
-  mCR = cairo_create();
-  cairo_set_target_drawable(mCR,
-                            GDK_WINDOW_XDISPLAY(drawable),
-                            GDK_WINDOW_XWINDOW(drawable));
+  cairo_surface_t *target =
+	cairo_xlib_surface_create(GDK_WINDOW_XDISPLAY(drawable),
+				  drawable,
+				  GDK_WINDOW_XWINDOW(drawable),
+				  mWidth,
+				  mHeight);
+
+  mCR = cairo_create(target);
 
   // get the translation set on the rendering context. It will be in
   // displayunits (i.e. pixels*scale), *not* pixels:
@@ -201,10 +205,11 @@
 NS_IMETHODIMP
 nsSVGCairoCanvas::Clear(nscolor color)
 {
-  cairo_set_rgb_color(mCR,
-                      NS_GET_R(color)/255.0,
-                      NS_GET_G(color)/255.0,
-                      NS_GET_B(color)/255.0);
+  cairo_set_source_rgb(mCR,
+                       NS_GET_R(color)/255.0,
+                       NS_GET_G(color)/255.0,
+                       NS_GET_B(color)/255.0);
+
   cairo_rectangle(mCR, 0, 0, mWidth, mHeight);
   cairo_fill(mCR);
 
diff -u ./nsSVGCairoGlyphGeometry.cpp ../fir-1.0.6-cairo/nsSVGCairoGlyphGeometry.cpp
--- ./nsSVGCairoGlyphGeometry.cpp	2005-08-04 07:08:58.000000000 +0200
+++ ../fir-1.0.6-cairo/nsSVGCairoGlyphGeometry.cpp	2005-08-04 07:08:46.000000000 +0200
@@ -204,11 +204,11 @@
       float opacity;
       mSource->GetFillOpacity(&opacity);
       
-      cairo_set_rgb_color(ctx,
-			  NS_GET_R(rgb)/255.0,
-			  NS_GET_G(rgb)/255.0,
-			  NS_GET_B(rgb)/255.0);
-      cairo_set_alpha(ctx, double(opacity));
+      cairo_set_source_rgba(ctx,
+			    NS_GET_R(rgb)/255.0,
+			    NS_GET_G(rgb)/255.0,
+			    NS_GET_B(rgb)/255.0,
+			    double(opacity));
       
       nsAutoString text;
       mSource->GetCharacterData(text);
@@ -220,11 +220,11 @@
     mSource->GetStrokePaint(&rgb);
     float opacity;
     mSource->GetStrokeOpacity(&opacity);
-    cairo_set_rgb_color(ctx,
-                        NS_GET_R(rgb)/255.0,
-                        NS_GET_G(rgb)/255.0,
-                        NS_GET_B(rgb)/255.0);
-    cairo_set_alpha(ctx, double(opacity));
+    cairo_set_source_rgba(ctx,
+                          NS_GET_R(rgb)/255.0,
+                          NS_GET_G(rgb)/255.0,
+                          NS_GET_B(rgb)/255.0,
+			  double(opacity));
 
     float width;
     mSource->GetStrokeWidth(&width);
diff -u ./nsSVGCairoGlyphMetrics.cpp ../fir-1.0.6-cairo/nsSVGCairoGlyphMetrics.cpp
--- ./nsSVGCairoGlyphMetrics.cpp	2005-08-04 07:08:58.000000000 +0200
+++ ../fir-1.0.6-cairo/nsSVGCairoGlyphMetrics.cpp	2005-08-04 07:08:46.000000000 +0200
@@ -322,7 +322,7 @@
     char *f = ToNewCString(family);
     cairo_select_font(mCT, f, slant, weight);
     free(f);
-    mFont = cairo_current_font(mCT);
+    mFont = cairo_get_font(mCT);
 
     nsCOMPtr<nsIPresContext> presContext;
     mSource->GetPresContext(getter_AddRefs(presContext));
diff -u ./nsSVGCairoPathBuilder.cpp ../fir-1.0.6-cairo/nsSVGCairoPathBuilder.cpp
--- ./nsSVGCairoPathBuilder.cpp	2005-08-04 07:08:58.000000000 +0200
+++ ../fir-1.0.6-cairo/nsSVGCairoPathBuilder.cpp	2005-08-04 07:08:46.000000000 +0200
@@ -154,7 +154,7 @@
   const double radPerDeg = pi/180.0;
 
   double x1=0.0, y1=0.0;
-  cairo_current_point(mCR, &x1, &y1);
+  cairo_get_point(mCR, &x1, &y1);
 
   // 1. Treat out-of-range parameters as described in
   // http://www.w3.org/TR/SVG/implnote.html#ArcImplementationNotes
diff -u ./nsSVGCairoPathGeometry.cpp ../fir-1.0.6-cairo/nsSVGCairoPathGeometry.cpp
--- ./nsSVGCairoPathGeometry.cpp	2005-08-04 07:08:58.000000000 +0200
+++ ../fir-1.0.6-cairo/nsSVGCairoPathGeometry.cpp	2005-08-04 07:08:46.000000000 +0200
@@ -212,11 +212,11 @@
     float opacity;
     mSource->GetFillOpacity(&opacity);
 
-    cairo_set_rgb_color(ctx,
-                        NS_GET_R(rgb)/255.0,
-                        NS_GET_G(rgb)/255.0,
-                        NS_GET_B(rgb)/255.0);
-    cairo_set_alpha(ctx, double(opacity));
+    cairo_set_source_rgba(ctx,
+			  NS_GET_R(rgb)/255.0,
+			  NS_GET_G(rgb)/255.0,
+			  NS_GET_B(rgb)/255.0,
+			  double(opacity));
 
     PRUint16 rule;
     mSource->GetFillRule(&rule);
@@ -236,11 +236,12 @@
     mSource->GetStrokePaint(&rgb);
     float opacity;
     mSource->GetStrokeOpacity(&opacity);
-    cairo_set_rgb_color(ctx,
-                        NS_GET_R(rgb)/255.0,
-                        NS_GET_G(rgb)/255.0,
-                        NS_GET_B(rgb)/255.0);
-    cairo_set_alpha(ctx, double(opacity));
+
+    cairo_set_source_rgba(ctx,
+			  NS_GET_R(rgb)/255.0,
+			  NS_GET_G(rgb)/255.0,
+			  NS_GET_B(rgb)/255.0,
+			  double(opacity));
 
     float width;
     mSource->GetStrokeWidth(&width);