Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-04-01 12:03:08 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

b=599698; remove UpdateSurfaceClip speedtrap in canvas drawImage; r+a=shaver

Browse Source
This commit is contained in:
Vladimir Vukicevic 2010-09-25 23:57:56 -07:00
parent ad96d8ce4b
commit 4eee784ada
2 changed files with 16 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
content/canvas/src/nsCanvasRenderingContext2D.cpp
View File

@ -3575,17 +3575,6 @@ nsCanvasRenderingContext2D::DrawImage(nsIDOMElement *imgElt, float a1,
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);

31
content/canvas/test/Makefile.in
View File

@ -68,10 +68,14 @@ _TEST_FILES_0 = \
image_green-redirect^headers^ \
test_drawImageIncomplete.html \
test_canvas_font_setter.html \
test_2d.composite.uncovered.image.source-in.html \
test_2d.composite.uncovered.image.destination-in.html \
test_2d.composite.uncovered.image.source-out.html \
test_2d.composite.uncovered.image.destination-atop.html \
test_2d.composite.canvas.destination-atop.html \
test_2d.composite.canvas.destination-in.html \
test_2d.composite.canvas.source-in.html \
test_2d.composite.canvas.source-out.html \
test_2d.composite.image.destination-atop.html \
test_2d.composite.image.destination-in.html \
test_2d.composite.image.source-in.html \
test_2d.composite.image.source-out.html \
test_mozGetAsFile.html \
$(NULL)
@ -89,17 +93,14 @@ _TEST_FILES_0 = \
# test_2d.composite.clip.lighter.html \
#
# Temporarily disabled tests; unbounded operators changed behaviour, need to reevaluate tests
#
# test_2d.composite.canvas.destination-atop.html \
# test_2d.composite.canvas.destination-in.html \
# test_2d.composite.canvas.source-in.html \
# test_2d.composite.canvas.source-out.html \
# test_2d.composite.image.destination-atop.html \
# test_2d.composite.image.destination-in.html \
# test_2d.composite.image.source-in.html \
# test_2d.composite.image.source-out.html \
#
# Temporarily disabled tests; unbounded operators changed behaviour, need to reevaluate tests.
# At one point we were passing these accidentally, because the UpdateSurfaceClip at the end
# of drawImage happened to clear the entire canvas with some operators, which is what these
# tests were checking.
# test_2d.composite.uncovered.image.source-in.html \
# test_2d.composite.uncovered.image.destination-in.html \
# test_2d.composite.uncovered.image.source-out.html \
# test_2d.composite.uncovered.image.destination-atop.html \
# Tests that fail on Mac (possibly because spec is underdefined?). Bug 407105
ifneq ($(MOZ_WIDGET_TOOLKIT),cocoa)