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 847370 - HTMLMediaElement - crossOrigin vs crossorigin, r=bz

Browse Source
This commit is contained in:
Andrea Marchesini 2013-03-19 16:18:29 +01:00
parent 0a95c5887f
commit 6d30f2ccbf
6 changed files with 18 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
content/canvas/test/crossorigin/test_video_crossorigin.html
View File

@ -34,9 +34,9 @@ function testCanvasDrawImage(v) {
try {
var data = ctx.getImageData(0, 0, 1, 1);
ok(true, "drawImage '" + v.src + "' then getImageData with crossorigin='" + v.crossorigin + "' worked");
ok(true, "drawImage '" + v.src + "' then getImageData with crossOrigin='" + v.crossOrigin + "' worked");
} catch(error) {
ok(!v.crossorigin && error.name === "SecurityError", "drawImage '" + v.src + "' then getImageData with crossorigin='" + v.crossorigin + "' failed");
ok(!v.crossOrigin && error.name === "SecurityError", "drawImage '" + v.src + "' then getImageData with crossOrigin='" + v.crossOrigin + "' failed");
v.tainted = true;
}
}
@ -49,9 +49,9 @@ function testCanvasCreatePattern(v) {
try {
var data = ctx.getImageData(0, 0, 1, 1);
ok(true, "createPattern '" + v.src + "' then getImageData with crossorigin='" + v.crossorigin + "' worked");
ok(true, "createPattern '" + v.src + "' then getImageData with crossOrigin='" + v.crossOrigin + "' worked");
} catch(error) {
ok(!v.crossorigin && error.name === "SecurityError", "createPattern '" + v.src + "' then getImageData with crossorigin='" + v.crossorigin + "' failed");
ok(!v.crossOrigin && error.name === "SecurityError", "createPattern '" + v.src + "' then getImageData with crossOrigin='" + v.crossOrigin + "' failed");
v.tainted = true;
}
}
@ -62,9 +62,9 @@ function testWebGL(v) {
try {
gl.texImage2D(gl.TEXTURE_2D, 0, gl.RGBA, gl.RGBA, gl.UNSIGNED_BYTE, v);
ok(true, "createTexture from '" + v.src + "' with crossorigin='" + v.crossorigin + "' worked");
ok(true, "createTexture from '" + v.src + "' with crossOrigin='" + v.crossOrigin + "' worked");
} catch (error) {
ok(!v.crossorigin && error.name === "SecurityError", "createTexture from '" + v.src + "' with crossorigin='" + v.crossorigin + "' failed");
ok(!v.crossOrigin && error.name === "SecurityError", "createTexture from '" + v.src + "' with crossOrigin='" + v.crossOrigin + "' failed");
v.tainted = true;
}
}
@ -78,12 +78,12 @@ function testTaintedCanvas(v) {
var data = ctx.getImageData(0, 0, 1, 1);
ok(false, "changing the CORS mode should not allow reading data from remote videos");
} catch (error) {
ok(error.name === "SecurityError", "changing the CORS mode, drawImage '" + v.src + "' then getImageData with crossorigin='" + v.crossorigin + "' failed");
ok(error.name === "SecurityError", "changing the CORS mode, drawImage '" + v.src + "' then getImageData with crossOrigin='" + v.crossOrigin + "' failed");
}
}
function vidDataSuccess(e) {
ok(!e.target.error, "Load '" + e.target.src + "' with crossorigin='" + e.target.crossorigin + "'");
ok(!e.target.error, "Load '" + e.target.src + "' with crossOrigin='" + e.target.crossOrigin + "'");
testCanvasDrawImage(e.target);
testCanvasCreatePattern(e.target);
@ -92,7 +92,7 @@ function vidDataSuccess(e) {
}
// If we change the CORS mode after loading the file without CORS it should still throw a security error
if (e.target.tainted) {
e.target.crossorigin = "anonymous";
e.target.crossOrigin = "anonymous";
testTaintedCanvas(e.target);
}
@ -100,13 +100,13 @@ function vidDataSuccess(e) {
}
function vidLoadFailure(e) {
ok(false, "Load '" + e.target.src + "' with crossorigin='" + e.target.crossorigin + "'");
ok(false, "Load '" + e.target.src + "' with crossOrigin='" + e.target.crossOrigin + "'");
doneTest(e);
}
function vidErrorSuccess(e) {
ok(e.target.error.code === MediaError.MEDIA_ERR_SRC_NOT_SUPPORTED,
"Load '" + e.target.src + "' with crossorigin='" + e.target.crossorigin + "'");
"Load '" + e.target.src + "' with crossOrigin='" + e.target.crossOrigin + "'");
doneTest(e);
}
@ -114,10 +114,10 @@ function startTest(test, token) {
var v = document.createElement('video');
if (test.cors === "just-crossOrigin-without-value") {
var div = document.createElement('div');
div.innerHTML="<video crossorigin>";
div.innerHTML="<video crossOrigin>";
v = div.children[0];
} else if (test.cors !== "missing-value-default") {
v.crossorigin = test.cors;
v.crossOrigin = test.cors;
}
v.token = token;
manager.started(token);

2
content/html/content/public/HTMLMediaElement.h
View File

@ -344,7 +344,7 @@ public:
// XPCOM GetCurrentSrc() is OK
// XPCOM GetCrossorigin() is OK
void SetCrossorigin(const nsAString& aValue, ErrorResult& aRv)
void SetCrossOrigin(const nsAString& aValue, ErrorResult& aRv)
{
SetHTMLAttr(nsGkAtoms::crossorigin, aValue, aRv);
}

2
content/html/content/src/HTMLMediaElement.cpp
View File

@ -435,7 +435,7 @@ NS_INTERFACE_MAP_END_INHERITING(nsGenericHTMLElement)
// nsIDOMHTMLMediaElement
NS_IMPL_URI_ATTR(HTMLMediaElement, Src, src)
NS_IMPL_STRING_ATTR(HTMLMediaElement, Crossorigin, crossorigin)
NS_IMPL_STRING_ATTR(HTMLMediaElement, CrossOrigin, crossorigin)
NS_IMPL_BOOL_ATTR(HTMLMediaElement, Controls, controls)
NS_IMPL_BOOL_ATTR(HTMLMediaElement, Autoplay, autoplay)
NS_IMPL_BOOL_ATTR(HTMLMediaElement, Loop, loop)

2
content/media/test/file_access_controls.html
View File

@ -92,7 +92,7 @@ function createVideo() {
var v = document.createElement('video');
v.addEventListener('loadeddata', eventHandler, false);
v.addEventListener('error', eventHandler, false);
v.crossorigin = 'anonymous';
v.crossOrigin = 'anonymous';
return v;
}

2
dom/interfaces/html/nsIDOMHTMLMediaElement.idl
View File

@ -37,7 +37,7 @@ interface nsIDOMHTMLMediaElement : nsIDOMHTMLElement
attribute DOMString src;
attribute nsIDOMMediaStream mozSrcObject;
readonly attribute DOMString currentSrc;
attribute DOMString crossorigin;
attribute DOMString crossOrigin;
const unsigned short NETWORK_EMPTY = 0;
const unsigned short NETWORK_IDLE = 1;
const unsigned short NETWORK_LOADING = 2;

3
dom/webidl/HTMLMediaElement.webidl
View File

@ -21,9 +21,8 @@ interface HTMLMediaElement : HTMLElement {
attribute DOMString src;
readonly attribute DOMString currentSrc;
// Bug 847370 - crossOrigin vs crossorigin.
[SetterThrows]
attribute DOMString crossorigin;
attribute DOMString crossOrigin;
const unsigned short NETWORK_EMPTY = 0;
const unsigned short NETWORK_IDLE = 1;
const unsigned short NETWORK_LOADING = 2;