From 384bd6c7e81e54dbc5710aba938ffd99d5a9fba7 Mon Sep 17 00:00:00 2001 From: "vladimir%pobox.com" Date: Tue, 11 Oct 2005 18:32:03 +0000 Subject: [PATCH] b=306752, canvas drawimage clips image instead of positioning at right x/y, r=tor --- content/canvas/src/nsCanvasRenderingContext2D.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/content/canvas/src/nsCanvasRenderingContext2D.cpp b/content/canvas/src/nsCanvasRenderingContext2D.cpp index 358eabd956b5..0dbc92b9553e 100644 --- a/content/canvas/src/nsCanvasRenderingContext2D.cpp +++ b/content/canvas/src/nsCanvasRenderingContext2D.cpp @@ -999,10 +999,10 @@ nsCanvasRenderingContext2D::ClearRect(float x, float y, float w, float h) NS_IMETHODIMP nsCanvasRenderingContext2D::FillRect(float x, float y, float w, float h) { - ApplyStyle(STYLE_FILL); - cairo_new_path (mCairo); cairo_rectangle (mCairo, x, y, w, h); + + ApplyStyle(STYLE_FILL); cairo_fill (mCairo); return Redraw(); @@ -1011,10 +1011,10 @@ nsCanvasRenderingContext2D::FillRect(float x, float y, float w, float h) NS_IMETHODIMP nsCanvasRenderingContext2D::StrokeRect(float x, float y, float w, float h) { - ApplyStyle(STYLE_STROKE); - cairo_new_path (mCairo); cairo_rectangle (mCairo, x, y, w, h); + + ApplyStyle(STYLE_STROKE); cairo_stroke (mCairo); return Redraw(); @@ -1327,9 +1327,9 @@ nsCanvasRenderingContext2D::DrawImage() cairo_pattern_set_matrix(pat, &surfMat); cairo_save(mCairo); - cairo_set_source(mCairo, pat); cairo_translate(mCairo, dx, dy); cairo_rectangle(mCairo, 0, 0, dw, dh); + cairo_set_source(mCairo, pat); cairo_clip(mCairo); cairo_paint_with_alpha(mCairo, mGlobalAlpha); cairo_restore(mCairo);