Attachment #65040 for bug #98828




  surface->GetSize(&mWidth, &mHeight);
  GdkDrawable *drawable = surface->GetDrawable();

  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:

NS_IMETHODIMP
nsSVGCairoCanvas::Clear(nscolor color)
{
  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);





      float opacity;
      mSource->GetFillOpacity(&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);

    mSource->GetStrokePaint(&rgb);
    float opacity;
    mSource->GetStrokeOpacity(&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);

Lines 322-328 Link Here

(-)./nsSVGCairoGlyphMetrics.cpp (-1 / +1 lines)
322	char *f = ToNewCString(family);	322	char *f = ToNewCString(family);
323	cairo_select_font(mCT, f, slant, weight);	323	cairo_select_font(mCT, f, slant, weight);
324	free(f);	324	free(f);
325	mFont = cairo_current_font(mCT);	325	mFont = cairo_get_font(mCT);
326		326
327	nsCOMPtr<nsIPresContext> presContext;	327	nsCOMPtr<nsIPresContext> presContext;
328	mSource->GetPresContext(getter_AddRefs(presContext));	328	mSource->GetPresContext(getter_AddRefs(presContext));

Lines 154-160 Link Here

(-)./nsSVGCairoPathBuilder.cpp (-1 / +1 lines)
154	const double radPerDeg = pi/180.0;	154	const double radPerDeg = pi/180.0;
155		155
156	double x1=0.0, y1=0.0;	156	double x1=0.0, y1=0.0;
157	cairo_current_point(mCR, &x1, &y1);	157	cairo_get_point(mCR, &x1, &y1);
158		158
159	// 1. Treat out-of-range parameters as described in	159	// 1. Treat out-of-range parameters as described in
160	// http://www.w3.org/TR/SVG/implnote.html#ArcImplementationNotes	160	// http://www.w3.org/TR/SVG/implnote.html#ArcImplementationNotes




    float opacity;
    mSource->GetFillOpacity(&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);

    mSource->GetStrokePaint(&rgb);
    float opacity;
    mSource->GetStrokeOpacity(&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);

Return to bug 98828

Lines 115-124 Link Here

(-)./nsSVGCairoCanvas.cpp (-8 / +13 lines)
115	surface->GetSize(&mWidth, &mHeight);	115	surface->GetSize(&mWidth, &mHeight);
116	GdkDrawable *drawable = surface->GetDrawable();	116	GdkDrawable *drawable = surface->GetDrawable();
117		117
118	mCR = cairo_create();	118	cairo_surface_t *target =
119	cairo_set_target_drawable(mCR,	119	cairo_xlib_surface_create(GDK_WINDOW_XDISPLAY(drawable),
120	GDK_WINDOW_XDISPLAY(drawable),	120	drawable,
121	GDK_WINDOW_XWINDOW(drawable));	121	GDK_WINDOW_XWINDOW(drawable),
		122	mWidth,
		123	mHeight);
		124
		125	mCR = cairo_create(target);
122		126
123	// get the translation set on the rendering context. It will be in	127	// get the translation set on the rendering context. It will be in
124	// displayunits (i.e. pixelsscale), not* pixels:	128	// displayunits (i.e. pixelsscale), not* pixels:
Lines 201-210 Link Here
201	NS_IMETHODIMP	205	NS_IMETHODIMP
202	nsSVGCairoCanvas::Clear(nscolor color)	206	nsSVGCairoCanvas::Clear(nscolor color)
203	{	207	{
204	cairo_set_rgb_color(mCR,	208	cairo_set_source_rgb(mCR,
205	NS_GET_R(color)/255.0,	209	NS_GET_R(color)/255.0,
206	NS_GET_G(color)/255.0,	210	NS_GET_G(color)/255.0,
207	NS_GET_B(color)/255.0);	211	NS_GET_B(color)/255.0);
		212
208	cairo_rectangle(mCR, 0, 0, mWidth, mHeight);	213	cairo_rectangle(mCR, 0, 0, mWidth, mHeight);
209	cairo_fill(mCR);	214	cairo_fill(mCR);
210		215

Lines 204-214 Link Here

(-)./nsSVGCairoGlyphGeometry.cpp (-10 / +10 lines)
204	float opacity;	204	float opacity;
205	mSource->GetFillOpacity(&opacity);	205	mSource->GetFillOpacity(&opacity);
206		206
207	cairo_set_rgb_color(ctx,	207	cairo_set_source_rgba(ctx,
208	NS_GET_R(rgb)/255.0,	208	NS_GET_R(rgb)/255.0,
209	NS_GET_G(rgb)/255.0,	209	NS_GET_G(rgb)/255.0,
210	NS_GET_B(rgb)/255.0);	210	NS_GET_B(rgb)/255.0,
211	cairo_set_alpha(ctx, double(opacity));	211	double(opacity));
212		212
213	nsAutoString text;	213	nsAutoString text;
214	mSource->GetCharacterData(text);	214	mSource->GetCharacterData(text);
Lines 220-230 Link Here
220	mSource->GetStrokePaint(&rgb);	220	mSource->GetStrokePaint(&rgb);
221	float opacity;	221	float opacity;
222	mSource->GetStrokeOpacity(&opacity);	222	mSource->GetStrokeOpacity(&opacity);
223	cairo_set_rgb_color(ctx,	223	cairo_set_source_rgba(ctx,
224	NS_GET_R(rgb)/255.0,	224	NS_GET_R(rgb)/255.0,
225	NS_GET_G(rgb)/255.0,	225	NS_GET_G(rgb)/255.0,
226	NS_GET_B(rgb)/255.0);	226	NS_GET_B(rgb)/255.0,
227	cairo_set_alpha(ctx, double(opacity));	227	double(opacity));
228		228
229	float width;	229	float width;
230	mSource->GetStrokeWidth(&width);	230	mSource->GetStrokeWidth(&width);

Lines 212-222 Link Here

(-)./nsSVGCairoPathGeometry.cpp (-10 / +11 lines)
212	float opacity;	212	float opacity;
213	mSource->GetFillOpacity(&opacity);	213	mSource->GetFillOpacity(&opacity);
214		214
215	cairo_set_rgb_color(ctx,	215	cairo_set_source_rgba(ctx,
216	NS_GET_R(rgb)/255.0,	216	NS_GET_R(rgb)/255.0,
217	NS_GET_G(rgb)/255.0,	217	NS_GET_G(rgb)/255.0,
218	NS_GET_B(rgb)/255.0);	218	NS_GET_B(rgb)/255.0,
219	cairo_set_alpha(ctx, double(opacity));	219	double(opacity));
220		220
221	PRUint16 rule;	221	PRUint16 rule;
222	mSource->GetFillRule(&rule);	222	mSource->GetFillRule(&rule);
Lines 236-246 Link Here
236	mSource->GetStrokePaint(&rgb);	236	mSource->GetStrokePaint(&rgb);
237	float opacity;	237	float opacity;
238	mSource->GetStrokeOpacity(&opacity);	238	mSource->GetStrokeOpacity(&opacity);
239	cairo_set_rgb_color(ctx,	239
240	NS_GET_R(rgb)/255.0,	240	cairo_set_source_rgba(ctx,
241	NS_GET_G(rgb)/255.0,	241	NS_GET_R(rgb)/255.0,
242	NS_GET_B(rgb)/255.0);	242	NS_GET_G(rgb)/255.0,
243	cairo_set_alpha(ctx, double(opacity));	243	NS_GET_B(rgb)/255.0,
		244	double(opacity));
244		245
245	float width;	246	float width;
246	mSource->GetStrokeWidth(&width);	247	mSource->GetStrokeWidth(&width);