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

Bug 1335368 part 10. Stop using IsCallerChrome in CanvasRenderingContext2D. r=bholley

Browse Source
This commit is contained in:
Boris Zbarsky 2017-02-01 15:43:37 -05:00
parent 3e7fca5cf9
commit 02217e5d26
3 changed files with 9 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
dom/canvas/CanvasRenderingContext2D.cpp
View File

@ -5375,21 +5375,10 @@ CanvasRenderingContext2D::AsyncDrawXULElement(nsXULElement& aElem,
double aW, double aH,
const nsAString& aBgColor,
uint32_t aFlags,
SystemCallerGuarantee,
ErrorResult& aError)
{
// 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
// -- rendering the user's theme and then extracting the results
// -- rendering native anonymous content (e.g., file input paths;
// scrollbars should be allowed)
if (!nsContentUtils::IsCallerChrome()) {
// not permitted to use DrawWindow
// XXX ERRMSG we need to report an error to developers here! (bug 329026)
aError.Throw(NS_ERROR_DOM_SECURITY_ERR);
return;
}
// XXXbz This should go away. Bug 1334865.
#if 0
nsCOMPtr<nsIFrameLoaderOwner> loaderOwner = do_QueryInterface(&elem);
if (!loaderOwner) {
@ -5483,7 +5472,11 @@ CanvasRenderingContext2D::GetImageData(JSContext* aCx, double aSx,
// Check only if we have a canvas element; if we were created with a docshell,
// then it's special internal use.
if (mCanvasElement && mCanvasElement->IsWriteOnly() &&
!nsContentUtils::IsCallerChrome())
// We could ask bindings for the caller type, but they already hand us a
// JSContext, and we're at least _somewhat_ perf-sensitive (so may not
// want to compute the caller type in the common non-write-only case), so
// let's just use what we have.
!nsContentUtils::IsSystemCaller(aCx))
{
// XXX ERRMSG we need to report an error to developers here! (bug 329026)
aError.Throw(NS_ERROR_DOM_SECURITY_ERR);

2
dom/canvas/CanvasRenderingContext2D.h
View File

@ -402,7 +402,7 @@ public:
mozilla::ErrorResult& aError);
void AsyncDrawXULElement(nsXULElement& aElem, double aX, double aY, double aW,
double aH, const nsAString& aBgColor, uint32_t aFlags,
mozilla::ErrorResult& aError);
SystemCallerGuarantee, mozilla::ErrorResult& aError);
enum RenderingMode {
SoftwareBackendMode,

2
dom/webidl/CanvasRenderingContext2D.webidl
View File

@ -110,7 +110,7 @@ interface CanvasRenderingContext2D {
[Throws, ChromeOnly]
void drawWindow(Window window, double x, double y, double w, double h,
DOMString bgColor, optional unsigned long flags = 0);
[Throws, ChromeOnly]
[Throws, ChromeOnly, NeedsCallerType]
void asyncDrawXULElement(XULElement elem, double x, double y, double w,
double h, DOMString bgColor,
optional unsigned long flags = 0);