author | Matt Woodrow <mwoodrow@mozilla.com> |
Thu, 17 Apr 2014 17:32:41 +1200 | |
changeset 179108 | abc11addc2d10017095a8f2911d763a6f0998577 |
parent 179107 | c609ffeef5244970aae38f43599f2f35d55f7aad |
child 179109 | 5e815640f63d0d2c93a1917c5f4250f9590717d9 |
push id | 26607 |
push user | ryanvm@gmail.com |
push date | Fri, 18 Apr 2014 02:31:26 +0000 |
treeherder | mozilla-central@7fe3ee0cf8be [default view] [failures only] |
perfherder | [talos] [build metrics] [platform microbench] (compared to previous push) |
reviewers | roc |
bugs | 997014 |
milestone | 31.0a1 |
first release with | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
last release without | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
--- a/content/canvas/src/CanvasRenderingContext2D.cpp +++ b/content/canvas/src/CanvasRenderingContext2D.cpp @@ -3216,38 +3216,16 @@ CanvasRenderingContext2D::DrawImage(cons if (image.IsHTMLCanvasElement()) { HTMLCanvasElement* canvas = &image.GetAsHTMLCanvasElement(); element = canvas; nsIntSize size = canvas->GetSize(); if (size.width == 0 || size.height == 0) { error.Throw(NS_ERROR_DOM_INVALID_STATE_ERR); return; } - - // Special case for Canvas, which could be an Azure canvas! - nsICanvasRenderingContextInternal *srcCanvas = canvas->GetContextAtIndex(0); - if (srcCanvas == this) { - // Self-copy. - srcSurf = mTarget->Snapshot(); - imgSize = gfxIntSize(mWidth, mHeight); - } else if (srcCanvas) { - // This might not be an Azure canvas! - srcSurf = srcCanvas->GetSurfaceSnapshot(); - - if (srcSurf) { - if (mCanvasElement) { - // Do security check here. - CanvasUtils::DoDrawImageSecurityCheck(mCanvasElement, - element->NodePrincipal(), - canvas->IsWriteOnly(), - false); - } - imgSize = gfxIntSize(srcSurf->GetSize().width, srcSurf->GetSize().height); - } - } } else { if (image.IsHTMLImageElement()) { HTMLImageElement* img = &image.GetAsHTMLImageElement(); element = img; } else { HTMLVideoElement* video = &image.GetAsHTMLVideoElement(); element = video; }