Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-26 03:35:33 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 772726. Make nsCanvasRenderingContext2DAzure::DrawWindow use Azure content drawing if that's enabled. r=bas

Browse Source
This commit is contained in:
Robert O'Callahan 2012-09-04 16:24:09 +12:00
parent c8038f3de8
commit 51edec70b6
1 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
content/canvas/src/nsCanvasRenderingContext2DAzure.cpp
View File

@ -3904,16 +3904,7 @@ nsCanvasRenderingContext2DAzure::DrawWindow(nsIDOMWindow* window, double x,
return;
}
nsRefPtr<gfxASurface> drawSurf;
GetThebesSurface(getter_AddRefs(drawSurf));
nsRefPtr<gfxContext> thebes = new gfxContext(drawSurf);
EnsureTarget();
Matrix matrix = mTarget->GetTransform();
thebes->SetMatrix(gfxMatrix(matrix._11, matrix._12, matrix._21,
matrix._22, matrix._31, matrix._32));
// We can't allow web apps to call this until we fix at least the
// following potential security issues:
// -- rendering cross-domain IFRAMEs and then extracting the results
@ -3928,8 +3919,9 @@ nsCanvasRenderingContext2DAzure::DrawWindow(nsIDOMWindow* window, double x,
}
// Flush layout updates
if (!(flags & nsIDOMCanvasRenderingContext2D::DRAWWINDOW_DO_NOT_FLUSH))
if (!(flags & nsIDOMCanvasRenderingContext2D::DRAWWINDOW_DO_NOT_FLUSH)) {
nsContentUtils::FlushLayoutForTree(window);
}
nsRefPtr<nsPresContext> presContext;
nsCOMPtr<nsPIDOMWindow> win = do_QueryInterface(window);
@ -3970,8 +3962,22 @@ nsCanvasRenderingContext2DAzure::DrawWindow(nsIDOMWindow* window, double x,
renderDocFlags |= nsIPresShell::RENDER_ASYNC_DECODE_IMAGES;
}
// gfxContext-over-Azure may modify the DrawTarget's transform, so
// save and restore it
Matrix matrix = mTarget->GetTransform();
nsRefPtr<gfxContext> thebes;
if (gfxPlatform::UseAzureContentDrawing()) {
thebes = new gfxContext(mTarget);
} else {
nsRefPtr<gfxASurface> drawSurf;
GetThebesSurface(getter_AddRefs(drawSurf));
thebes = new gfxContext(drawSurf);
}
thebes->SetMatrix(gfxMatrix(matrix._11, matrix._12, matrix._21,
matrix._22, matrix._31, matrix._32));
unused << presContext->PresShell()->
RenderDocument(r, renderDocFlags, backgroundColor, thebes);
mTarget->SetTransform(matrix);
// note that x and y are coordinates in the document that
// we're drawing; x and y are drawn to 0,0 in current user