b=599698; remove UpdateSurfaceClip speedtrap in canvas drawImage; r+a=shaver
authorVladimir Vukicevic <vladimir@pobox.com>
Sat, 25 Sep 2010 23:57:56 -0700
changeset 54655 2370ecfdcbb7b152ef000e21d10ff6e43109fb90
parent 54654 ec28605a1fc8e10e1b74a1d2243e4af3e2bb42b4
child 54656 49cc66b9f097b4b36c900eb81f9c24d738842c37
push id15975
push uservladimir@mozilla.com
push dateSun, 26 Sep 2010 07:01:29 +0000
treeherdermozilla-central@2370ecfdcbb7 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs599698
milestone2.0b7pre
first release with
nightly linux32
2370ecfdcbb7 / 4.0b7pre / 20100926031147 / files
nightly linux64
2370ecfdcbb7 / 4.0b7pre / 20100926030635 / files
nightly mac
2370ecfdcbb7 / 4.0b7pre / 20100926030946 / files
nightly win32
2370ecfdcbb7 / 4.0b7pre / 20100926042726 / files
nightly win64
2370ecfdcbb7 / 4.0b7pre / 20100926010224 / files
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
releases
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
b=599698; remove UpdateSurfaceClip speedtrap in canvas drawImage; r+a=shaver
content/canvas/src/nsCanvasRenderingContext2D.cpp
--- a/content/canvas/src/nsCanvasRenderingContext2D.cpp
+++ b/content/canvas/src/nsCanvasRenderingContext2D.cpp
@@ -3570,27 +3570,16 @@ nsCanvasRenderingContext2D::DrawImage(ns
         } else {
             /* we need to use to clip instead of fill for globalAlpha */
             mThebes->Clip(clip);
             mThebes->Paint(CurrentState().globalAlpha);
         }
         dirty = mThebes->UserToDevice(clip);
     }
 
-#if 1
-    // XXX cairo bug workaround; force a clip update on mThebes.
-    // Otherwise, a pixman clip gets left around somewhere, and pixman
-    // (Render) does source clipping as well -- so we end up
-    // compositing with an incorrect clip.  This only seems to affect
-    // fallback cases, which happen when we have CSS scaling going on.
-    // This will blow away the current path, but we already blew it
-    // away in this function earlier.
-    mThebes->UpdateSurfaceClip();
-#endif
-
 FINISH:
     if (NS_SUCCEEDED(rv))
         rv = Redraw(dirty);
 
     return rv;
 }
 
 NS_IMETHODIMP