author | Chris Pearce <cpearce@mozilla.com> |
Tue, 30 Oct 2012 11:02:24 +1300 | |
changeset 111701 | 9c5a898efbe9fdefa5d97591c57c989005a2cf5f |
parent 111700 | 22e4bae8fe65e57e63ea8734ba3016f684d4912f |
child 111702 | 7bd96dda75f03267736c8e628995c0481014a139 |
push id | 17208 |
push user | cpearce@mozilla.com |
push date | Mon, 29 Oct 2012 22:02:57 +0000 |
treeherder | mozilla-inbound@9c5a898efbe9 [default view] [failures only] |
perfherder | [talos] [build metrics] [platform microbench] (compared to previous push) |
reviewers | jlebar |
bugs | 805301 |
milestone | 19.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/b2g/chrome/content/shell.js +++ b/b2g/chrome/content/shell.js @@ -153,25 +153,25 @@ var shell = { if (!homeURL) { let msg = 'Fatal error during startup: No homescreen found: try setting B2G_HOMESCREEN'; alert(msg); return; } let manifestURL = this.manifestURL; // <html:iframe id="homescreen" - // mozbrowser="true" mozallowfullscreen="true" + // mozbrowser="true" allowfullscreen="true" // style="overflow: hidden; -moz-box-flex: 1; border: none;" // src="data:text/html;charset=utf-8,%3C!DOCTYPE html>%3Cbody style='background:black;'>"/> let browserFrame = document.createElementNS('http://www.w3.org/1999/xhtml', 'html:iframe'); browserFrame.setAttribute('id', 'homescreen'); browserFrame.setAttribute('mozbrowser', 'true'); browserFrame.setAttribute('mozapp', manifestURL); - browserFrame.setAttribute('mozallowfullscreen', 'true'); + browserFrame.setAttribute('allowfullscreen', 'true'); browserFrame.setAttribute('style', "overflow: hidden; -moz-box-flex: 1; border: none;"); browserFrame.setAttribute('src', "data:text/html;charset=utf-8,%3C!DOCTYPE html>%3Cbody style='background:black;"); document.getElementById('shell').appendChild(browserFrame); browserFrame.contentWindow .QueryInterface(Ci.nsIInterfaceRequestor) .getInterface(Ci.nsIWebNavigation) .sessionHistory = Cc["@mozilla.org/browser/shistory;1"]
--- a/browser/base/content/test/test_contextmenu.html +++ b/browser/base/content/test/test_contextmenu.html @@ -875,17 +875,17 @@ function startTest() { ok(contextMenu, "Got context menu XUL"); if (chromeWin.document.getElementById("Browser:Stop").getAttribute("disabled") != "true") { todo(false, "Wait for subwindow to load... (This should usually happen once.)"); SimpleTest.executeSoon(startTest); return; } - subwindow.mozAllowFullScreen = true; + subwindow.allowfullscreen = true; lastElement = null; text = subwindow.document.getElementById("test-text"); link = subwindow.document.getElementById("test-link"); imagelink = subwindow.document.getElementById("test-image-link"); mailto = subwindow.document.getElementById("test-mailto"); input = subwindow.document.getElementById("test-input"); img = subwindow.document.getElementById("test-image");
--- a/content/base/src/nsDocument.cpp +++ b/content/base/src/nsDocument.cpp @@ -9053,17 +9053,17 @@ nsDocument::IsFullScreenEnabled(bool aCa LogFullScreenDenied(aLogFailure, "FullScreenDeniedHidden", this); return false; } if (HasFullScreenSubDocument(this)) { LogFullScreenDenied(aLogFailure, "FullScreenDeniedSubDocFullScreen", this); return false; } - // Ensure that all ancestor <iframe> elements have the mozallowfullscreen + // Ensure that all ancestor <iframe> elements have the allowfullscreen // boolean attribute set. nsCOMPtr<nsIDocShell> docShell = do_QueryReferent(mDocumentContainer); bool allowed = false; if (docShell) { docShell->GetFullscreenAllowed(&allowed); } if (!allowed) { LogFullScreenDenied(aLogFailure, "FullScreenDeniedIframeDisallowed", this);
--- a/content/base/src/nsGkAtomList.h +++ b/content/base/src/nsGkAtomList.h @@ -68,16 +68,17 @@ GK_ATOM(after, "after") GK_ATOM(after_end, "after_end") GK_ATOM(after_start, "after_start") GK_ATOM(align, "align") GK_ATOM(alink, "alink") GK_ATOM(all, "all") GK_ATOM(allowevents, "allowevents") GK_ATOM(allowforms, "allow-forms") GK_ATOM(allownegativeassertions, "allownegativeassertions") +GK_ATOM(allowfullscreen, "allowfullscreen") GK_ATOM(allowsameorigin, "allow-same-origin") GK_ATOM(allowscripts, "allow-scripts") GK_ATOM(allowtopnavigation, "allow-top-navigation") GK_ATOM(allowuntrusted, "allowuntrusted") GK_ATOM(alt, "alt") GK_ATOM(alternate, "alternate") GK_ATOM(always, "always") GK_ATOM(ancestor, "ancestor")
--- a/content/html/content/src/nsHTMLIFrameElement.cpp +++ b/content/html/content/src/nsHTMLIFrameElement.cpp @@ -50,17 +50,17 @@ NS_IMPL_STRING_ATTR(nsHTMLIFrameElement, NS_IMPL_STRING_ATTR(nsHTMLIFrameElement, Height, height) NS_IMPL_URI_ATTR(nsHTMLIFrameElement, LongDesc, longdesc) NS_IMPL_STRING_ATTR(nsHTMLIFrameElement, MarginHeight, marginheight) NS_IMPL_STRING_ATTR(nsHTMLIFrameElement, MarginWidth, marginwidth) NS_IMPL_STRING_ATTR(nsHTMLIFrameElement, Name, name) NS_IMPL_STRING_ATTR(nsHTMLIFrameElement, Scrolling, scrolling) NS_IMPL_URI_ATTR(nsHTMLIFrameElement, Src, src) NS_IMPL_STRING_ATTR(nsHTMLIFrameElement, Width, width) -NS_IMPL_BOOL_ATTR(nsHTMLIFrameElement, MozAllowFullScreen, mozallowfullscreen) +NS_IMPL_BOOL_ATTR(nsHTMLIFrameElement, Allowfullscreen, allowfullscreen) NS_IMPL_STRING_ATTR(nsHTMLIFrameElement, Sandbox, sandbox) void nsHTMLIFrameElement::GetItemValueText(nsAString& aValue) { GetSrc(aValue); }
--- a/content/html/content/test/file_fullscreen-api.html +++ b/content/html/content/test/file_fullscreen-api.html @@ -73,17 +73,17 @@ function enter1(event) { is(document.mozFullScreenElement, null, "8. Full-screen element should still be null after re-adding former FSE."); } function exit1(event) { ok(!document.mozFullScreen, "9. Should have left full-screen mode (first time)"); is(event.target, document, "10. Event target should be full-screen document #2"); is(document.mozFullScreenElement, null, "11. Full-screen element should be null."); iframe = document.createElement("iframe"); - iframe.mozAllowFullScreen = true; + iframe.allowfullscreen = true; addFullscreenChangeContinuation("enter", enter2); document.body.appendChild(iframe); iframe.src = iframeContents; } function enter2(event) { ok(document.mozFullScreen, "12. Should be back in full-screen mode (second time)"); is(event.target, document, "13. Event target should be full-screen document #3");
--- a/content/html/content/test/file_fullscreen-denied-inner.html +++ b/content/html/content/test/file_fullscreen-denied-inner.html @@ -1,22 +1,22 @@ <html> <body onload='foo();'> <script> function foo() { document.addEventListener('mozfullscreenerror', function() { - parent.ok(true, "Request from an iframe without mozallowfullscreen should be denied"); + parent.ok(true, "Request from an iframe without allowfullscreen should be denied"); parent.finish(); }, false); document.addEventListener('mozfullscreenchange', function() { - parent.ok(false, "Request from an iframe without mozallowfullscreen should be denied, but was granted!"); + parent.ok(false, "Request from an iframe without allowfullscreen should be denied, but was granted!"); parent.finish(); }, false); - parent.is(document.mozFullScreenEnabled, false, "Full-screen should not be enabled, coz mozallowfullscreen isn't present."); + parent.is(document.mozFullScreenEnabled, false, "Full-screen should not be enabled, coz allowfullscreen isn't present."); document.body.mozRequestFullScreen(); } </script> </body> </html>
--- a/content/html/content/test/file_fullscreen-denied.html +++ b/content/html/content/test/file_fullscreen-denied.html @@ -66,17 +66,17 @@ function keyHandler(event) { addFullscreenErrorContinuation( function() { ok(!document.mozFullScreen, "Should not grant request in long-running event handler."); // Disable the requirement for trusted contexts only, so the tests are easier // to write. SpecialPowers.setBoolPref("full-screen-api.allow-trusted-requests-only", false); - // Create an iframe without a mozallowfullscreen attribute, whose contents requests + // Create an iframe without a allowfullscreen attribute, whose contents requests // full-screen. The request should be denied, and we should not receive a fullscreenchange // event in this document. var iframe = document.createElement("iframe"); iframe.src = "file_fullscreen-denied-inner.html"; document.body.appendChild(iframe); }); document.body.mozRequestFullScreen(); }
--- a/content/html/content/test/file_fullscreen-hidden.html +++ b/content/html/content/test/file_fullscreen-hidden.html @@ -5,17 +5,17 @@ https://bugzilla.mozilla.org/show_bug.cg --> <head> <title>Test for Bug 697636</title> <script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script> <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/> </head> <body> -<iframe id="f" src="data:text/html,<body text=green>1" mozallowfullscreen></iframe> +<iframe id="f" src="data:text/html,<body text=green>1" allowfullscreen></iframe> <a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=697636">Mozilla Bug 697636</a> <p id="display"></p> <div id="content" style="display: none"> </div> <pre id="test"> <script type="application/javascript">
--- a/content/html/content/test/file_fullscreen-navigation.html +++ b/content/html/content/test/file_fullscreen-navigation.html @@ -5,17 +5,17 @@ https://bugzilla.mozilla.org/show_bug.cg --> <head> <title>Test for Bug 685402</title> <script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script> <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/> </head> <body style="background-color: gray;"> -<iframe id="f" src="data:text/html,<body text=green>1" mozallowfullscreen></iframe> +<iframe id="f" src="data:text/html,<body text=green>1" allowfullscreen></iframe> <a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=685402">Mozilla Bug 685402</a> <p id="display"></p> <div id="content" style="display: none"> </div> <pre id="test"> <script type="application/javascript">
--- a/content/html/content/test/file_fullscreen-rollback.html +++ b/content/html/content/test/file_fullscreen-rollback.html @@ -21,17 +21,17 @@ Tests: <script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script> <script type="application/javascript" src="/tests/SimpleTest/EventUtils.js"></script> <script type="application/javascript" src="file_fullscreen-utils.js"></script> </head> <body> <div id="fse"> <div id="fse-inner"> - <iframe id="subdoc" mozallowfullscreen src="data:text/html,<html><body bgcolor='black'></body></html>"></iframe> + <iframe id="subdoc" allowfullscreen src="data:text/html,<html><body bgcolor='black'></body></html>"></iframe> </div> </div> <div id="non-fse"></div> <script type="application/javascript"> /** Test for Bug 700764 **/
--- a/content/html/content/test/test_fullscreen-api.html +++ b/content/html/content/test/test_fullscreen-api.html @@ -26,17 +26,17 @@ // Ensure the full-screen api is enabled, and will be disabled on test exit. SpecialPowers.setBoolPref("full-screen-api.enabled", true); // Disable the requirement for trusted contexts only, so the tests are easier // to write. SpecialPowers.setBoolPref("full-screen-api.allow-trusted-requests-only", false); // Run the tests which go full-screen in new windows, as mochitests normally -// run in an iframe, which by default will not have the mozallowfullscreen +// run in an iframe, which by default will not have the allowfullscreen // attribute set, so full-screen won't work. var gTestWindows = [ "file_fullscreen-rollback.html", "file_fullscreen-esc-exit.html", "file_fullscreen-denied.html", "file_fullscreen-api.html", "file_fullscreen-api-keys.html", "file_fullscreen-plugins.html",
--- a/docshell/base/nsDocShell.cpp +++ b/docshell/base/nsDocShell.cpp @@ -2145,32 +2145,33 @@ nsDocShell::GetFullscreenAllowed(bool* a *aFullscreenAllowed = (mFullscreenAllowed == PARENT_ALLOWS); return NS_OK; } // Assume false until we determine otherwise... *aFullscreenAllowed = false; // For non-content boundaries, check that the enclosing iframe element - // has the mozallowfullscreen attribute set to true. If any ancestor - // iframe does not have mozallowfullscreen=true, then fullscreen is + // has the allowfullscreen attribute set to true. If any ancestor + // iframe does not have allowfullscreen=true, then fullscreen is // prohibited. nsCOMPtr<nsPIDOMWindow> win = do_GetInterface(GetAsSupports(this)); if (!win) { return NS_OK; } nsCOMPtr<nsIContent> frameElement = do_QueryInterface(win->GetFrameElementInternal()); if (frameElement && frameElement->IsHTML(nsGkAtoms::iframe) && + !frameElement->HasAttr(kNameSpaceID_None, nsGkAtoms::allowfullscreen) && !frameElement->HasAttr(kNameSpaceID_None, nsGkAtoms::mozallowfullscreen)) { return NS_OK; } // If we have no parent then we're the root docshell; no ancestor of the - // original docshell doesn't have a mozallowfullscreen attribute, so + // original docshell doesn't have a allowfullscreen attribute, so // report fullscreen as allowed. nsCOMPtr<nsIDocShellTreeItem> dsti = do_GetInterface(GetAsSupports(this)); NS_ENSURE_TRUE(dsti, NS_OK); nsCOMPtr<nsIDocShellTreeItem> parentTreeItem; dsti->GetParent(getter_AddRefs(parentTreeItem)); if (!parentTreeItem) { *aFullscreenAllowed = true;
--- a/docshell/base/nsDocShell.h +++ b/docshell/base/nsDocShell.h @@ -767,24 +767,24 @@ protected: // transaction at the time that this DocShell begins to load int32_t mPreviousTransIndex; int32_t mLoadedTransIndex; uint32_t mSandboxFlags; // mFullscreenAllowed stores how we determine whether fullscreen is allowed // when GetFullscreenAllowed() is called. Fullscreen is allowed in a - // docshell when all containing iframes have the mozallowfullscreen + // docshell when all containing iframes have the allowfullscreen // attribute set to true. When mFullscreenAllowed is CHECK_ATTRIBUTES - // we check this docshell's containing frame for the mozallowfullscreen + // we check this docshell's containing frame for the allowfullscreen // attribute, and recurse onto the parent docshell to ensure all containing - // frames also have the mozallowfullscreen attribute. If we find an ancestor + // frames also have the allowfullscreen attribute. If we find an ancestor // docshell with mFullscreenAllowed not equal to CHECK_ATTRIBUTES, we've // reached a content boundary, and mFullscreenAllowed denotes whether the - // parent across the content boundary has mozallowfullscreen=true in all its + // parent across the content boundary has allowfullscreen=true in all its // containing iframes. mFullscreenAllowed defaults to CHECK_ATTRIBUTES and // is set otherwise when docshells which are content boundaries are created. enum FullscreenAllowedState { CHECK_ATTRIBUTES, PARENT_ALLOWS, PARENT_PROHIBITS }; FullscreenAllowedState mFullscreenAllowed;
--- a/docshell/base/nsIDocShell.idl +++ b/docshell/base/nsIDocShell.idl @@ -685,19 +685,19 @@ interface nsIDocShell : nsISupports * not be allowed. */ [noscript, notxpcom] bool pluginsAllowedInCurrentDoc(); /** * Attribute that determines whether fullscreen is allowed to be entered for * this subtree of the docshell tree. This is true when all iframes containing - * this docshell have their "mozallowfullscreen" attribute set to "true". + * this docshell have their "allowfullscreen" attribute set to "true". * fullscreenAllowed is only writable at content boundaries, where it is used * to propagate the value of the cross process parent's iframe's - * "mozallowfullscreen" attribute to the child process. Setting + * "allowfullscreen" attribute to the child process. Setting * fullscreenAllowed on docshells which aren't content boundaries throws an * exception. */ [infallible] readonly attribute boolean fullscreenAllowed; void setFullscreenAllowed(in boolean allowed); };
--- a/dom/browser-element/BrowserElementParent.js +++ b/dom/browser-element/BrowserElementParent.js @@ -366,19 +366,20 @@ BrowserElementParent.prototype = { if (this._window.document.mozHidden) { this._ownerVisibilityChange(); } }, _recvGetName: function(data) { return this._frameElement.getAttribute('name'); }, - + _recvGetFullscreenAllowed: function(data) { - return this._frameElement.hasAttribute('mozallowfullscreen'); + return this._frameElement.hasAttribute('allowfullscreen') || + this._frameElement.hasAttribute('mozallowfullscreen'); }, _fireCtxMenuEvent: function(data) { let evtName = data.name.substring('browser-element-api:'.length); let detail = data.json; debug('fireCtxMenuEventFromMsg: ' + evtName + ' ' + detail); let evt = this._createEvent(evtName, detail);
--- a/dom/interfaces/core/nsIDOMDocument.idl +++ b/dom/interfaces/core/nsIDOMDocument.idl @@ -348,17 +348,17 @@ interface nsIDOMDocument : nsIDOMNode * * @see <https://wiki.mozilla.org/index.php?title=Gecko:FullScreenAPI> */ readonly attribute boolean mozFullScreen; /** * Denotes whether the full-screen-api.enabled is true, no windowed * plugins are present, and all ancestor documents have the - * mozallowfullscreen attribute set. + * allowfullscreen attribute set. * * @see <https://wiki.mozilla.org/index.php?title=Gecko:FullScreenAPI> */ readonly attribute boolean mozFullScreenEnabled; /** * The element to which the mouse pointer is locked, if any, as per the * DOM pointer lock api.
--- a/dom/interfaces/html/nsIDOMHTMLIFrameElement.idl +++ b/dom/interfaces/html/nsIDOMHTMLIFrameElement.idl @@ -11,17 +11,17 @@ * * This interface is trying to follow the DOM Level 2 HTML specification: * http://www.w3.org/TR/DOM-Level-2-HTML/ * * with changes from the work-in-progress WHATWG HTML specification: * http://www.whatwg.org/specs/web-apps/current-work/ */ -[scriptable, uuid(52f6244b-b1f5-4f4c-8ff3-7e146316f411)] +[scriptable, uuid(a7bd1e34-3969-47ae-8c1d-2970132ba925)] interface nsIDOMHTMLIFrameElement : nsIDOMHTMLElement { attribute DOMString align; attribute DOMString frameBorder; attribute DOMString height; attribute DOMString longDesc; attribute DOMString marginHeight; attribute DOMString marginWidth; @@ -30,13 +30,13 @@ interface nsIDOMHTMLIFrameElement : nsID attribute DOMString src; attribute DOMString width; // Introduced in DOM Level 2: readonly attribute nsIDOMDocument contentDocument; readonly attribute nsIDOMWindow contentWindow; attribute DOMString sandbox; // Mozilla extensions - // iframe elements require the mozAllowFullScreen attribute to be present + // iframe elements require the allowfullscreen attribute to be present // if they're to allow content in the sub document to go into DOM full-screen // mode. See https://wiki.mozilla.org/index.php?title=Gecko:FullScreenAPI - attribute boolean mozAllowFullScreen; + attribute boolean allowfullscreen; };
--- a/dom/locales/en-US/chrome/dom/dom.properties +++ b/dom/locales/en-US/chrome/dom/dom.properties @@ -67,17 +67,17 @@ nsIJSONEncodeDeprecatedWarning=nsIJSON.e nsIDOMWindowInternalWarning=Use of nsIDOMWindowInternal is deprecated. Use nsIDOMWindow instead. InputEncodingWarning=Use of inputEncoding is deprecated. # LOCALIZATION NOTE: Do not translate "MozBeforePaint" and "mozRequestAnimationFrame" MozBeforePaintWarning=MozBeforePaint events are no longer supported. mozRequestAnimationFrame must be passed a non-null callback argument. FullScreenDeniedBlocked=Request for full-screen was denied because this domain has been blocked from full-screen by user. FullScreenDeniedDisabled=Request for full-screen was denied because full-screen API is disabled by user preference. FullScreenDeniedFocusedPlugin=Request for full-screen was denied because a windowed plugin is focused. FullScreenDeniedHidden=Request for full-screen was denied because the document is no longer visible. -FullScreenDeniedIframeDisallowed=Request for full-screen was denied because at least one of the document's containing iframes does not have a "mozallowfullscreen" attribute. +FullScreenDeniedIframeDisallowed=Request for full-screen was denied because at least one of the document's containing iframes does not have an "allowfullscreen" attribute. FullScreenDeniedNotInputDriven=Request for full-screen was denied because Element.mozRequestFullScreen() was not called from inside a short running user-generated event handler. FullScreenDeniedNotInDocument=Request for full-screen was denied because requesting element is no longer in its document. FullScreenDeniedMovedDocument=Request for full-screen was denied because requesting element has moved document. FullScreenDeniedLostWindow=Request for full-screen was denied because we no longer have a window. FullScreenDeniedSubDocFullScreen=Request for full-screen was denied because a subdocument of the document requesting full-screen is already full-screen. FullScreenDeniedNotDescendant=Request for full-screen was denied because requesting element is not a descendant of the current full-screen element. FullScreenDeniedNotFocusedTab=Request for full-screen was denied because requesting element is not in the currently focused tab. RemovedFullScreenElement=Exited full-screen because full-screen element was removed from document.
--- a/dom/tests/mochitest/pointerlock/file_allowPointerLockSandboxFlag.html +++ b/dom/tests/mochitest/pointerlock/file_allowPointerLockSandboxFlag.html @@ -13,17 +13,17 @@ <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" /> </head> <body> <a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=784402"> Mozilla Bug 784402</a> <p id="display"></p> - <iframe src ="iframe_differentDOM.html" mozallowfullscreen="true" id="iframe" + <iframe src ="iframe_differentDOM.html" allowfullscreen="true" id="iframe" onload="startTest()" sandbox="allow-scripts allow-same-origin allow-pointer-lock"> </iframe> <pre id="test"> <script type="application/javascript"> /* * Test for Bug 784402
--- a/dom/tests/mochitest/pointerlock/test_pointerlock-api.html +++ b/dom/tests/mochitest/pointerlock/test_pointerlock-api.html @@ -15,36 +15,36 @@ https://bugzilla.mozilla.org/show_bug.cg </a> <div id="content"> </div> <pre id="test"> <script type="application/javascript"> /** * Pointer Lock tests for bug 633602. These depend on the fullscreen api * which doesn't work when run in the mochitests' iframe, since the - * mochitests' iframe doesn't have a mozallowfullscreen attribute. To get + * mochitests' iframe doesn't have an allowfullscreen attribute. To get * around this, all tests are run in a child window, which can go fullscreen. * This method is borrowed from content/html/content/test/test_fullscreen-api.html. **/ SimpleTest.waitForExplicitFinish(); // Ensure the full-screen api is enabled, and will be disabled on test exit. SpecialPowers.setBoolPref("full-screen-api.enabled", true); // Disable the requirement for trusted contexts only, so the tests are easier to write. SpecialPowers.setBoolPref("full-screen-api.allow-trusted-requests-only", false); // Grant "fullscreen" permission on the test domain. This means fullscreen will be // automatically approved, so pointer lock in the tests will be too. SpecialPowers.setFullscreenAllowed(document); - + // Run the tests which go full-screen in new window, as Mochitests // normally run in an iframe, which by default will not have the - // mozallowfullscreen attribute set, so full-screen won't work. + // allowfullscreen attribute set, so full-screen won't work. var gTestFiles = [ "file_approval.html", "file_screenClientXYConst.html", "file_childIframe.html", "file_doubleLock.html", "file_escapeKey.html", "file_infiniteMovement.html", "file_locksvgelement.html", @@ -67,21 +67,21 @@ https://bugzilla.mozilla.org/show_bug.cg // TODO: if ever we remove these checks for XP and Lion, we should do the same // in content/html/content/test/test_fullscreen-api.html, which uses the same pattern. const isWinXP = navigator.userAgent.indexOf("Windows NT 5.1") != -1; const isOSXLion = navigator.userAgent.indexOf("Mac OS X 10.7") != -1; const isOSXMtnLion = navigator.userAgent.indexOf("Mac OS X 10.8") != -1; function finish() { SpecialPowers.clearUserPref("full-screen-api.enabled"); - SpecialPowers.clearUserPref("full-screen-api.allow-trusted-requests-only"); + SpecialPowers.clearUserPref("full-screen-api.allow-trusted-requests-only"); SpecialPowers.removeFullscreenAllowed(document) SimpleTest.finish(); } - + function nextTest() { if (isWinXP) { todo(false, "Can't reliably run full-screen tests on Windows XP due to bug 704010"); finish(); return; } if (isOSXLion || isOSXMtnLion) { todo(false, "Can't reliably run full-screen tests on OS X Lion or Mountain Lion, see bug 744125");