mirror of
https://gitlab.winehq.org/wine/wine-gecko.git
synced 2024-09-13 09:24:08 -07:00
Backed out changeset 1f53f85ddfb5 because of mochitest-3 failure
This commit is contained in:
Ehsan Akhgari
parent
c92e063c3b
commit
97d66f9128
@ -220,8 +220,6 @@ nsDOMStorageMemoryDB::SetKey(DOMStorageImpl* aStorage,
|
||||
}
|
||||
else
|
||||
{
|
||||
if (!aSecure && item->mSecure)
|
||||
return NS_ERROR_DOM_SECURITY_ERR;
|
||||
usage -= aKey.Length() + item->mValue.Length();
|
||||
if (usage > aQuota) {
|
||||
return NS_ERROR_DOM_QUOTA_REACHED;
|
||||
|
||||
@ -53,7 +53,6 @@ DIRS += \
|
||||
general \
|
||||
whatwg \
|
||||
geolocation \
|
||||
globalstorage \
|
||||
localstorage \
|
||||
sessionstorage \
|
||||
storageevent \
|
||||
|
||||
@ -1,54 +0,0 @@
|
||||
#
|
||||
# ***** BEGIN LICENSE BLOCK *****
|
||||
# Version: MPL 1.1/GPL 2.0/LGPL 2.1
|
||||
#
|
||||
# The contents of this file are subject to the Mozilla Public License Version
|
||||
# 1.1 (the "License"); you may not use this file except in compliance with
|
||||
# the License. You may obtain a copy of the License at
|
||||
# http://www.mozilla.org/MPL/
|
||||
#
|
||||
# Software distributed under the License is distributed on an "AS IS" basis,
|
||||
# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
|
||||
# for the specific language governing rights and limitations under the
|
||||
# License.
|
||||
#
|
||||
# The Original Code is mozilla.org code.
|
||||
#
|
||||
# The Initial Developer of the Original Code is
|
||||
# Mozilla Foundation.
|
||||
# Portions created by the Initial Developer are Copyright (C) 2010
|
||||
# the Initial Developer. All Rights Reserved.
|
||||
#
|
||||
# Contributor(s):
|
||||
#
|
||||
# Alternatively, the contents of this file may be used under the terms of
|
||||
# either of the GNU General Public License Version 2 or later (the "GPL"),
|
||||
# or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
|
||||
# in which case the provisions of the GPL or the LGPL are applicable instead
|
||||
# of those above. If you wish to allow use of your version of this file only
|
||||
# under the terms of either the GPL or the LGPL, and not to allow others to
|
||||
# use your version of this file under the terms of the MPL, indicate your
|
||||
# decision by deleting the provisions above and replace them with the notice
|
||||
# and other provisions required by the GPL or the LGPL. If you do not delete
|
||||
# the provisions above, a recipient may use your version of this file under
|
||||
# the terms of any one of the MPL, the GPL or the LGPL.
|
||||
#
|
||||
# ***** END LICENSE BLOCK *****
|
||||
|
||||
DEPTH = ../../../..
|
||||
topsrcdir = @top_srcdir@
|
||||
srcdir = @srcdir@
|
||||
VPATH = @srcdir@
|
||||
relativesrcdir = dom/tests/mochitest/globalstorage
|
||||
|
||||
include $(DEPTH)/config/autoconf.mk
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
||||
_TEST_FILES = \
|
||||
test_bug614116.html \
|
||||
iframe_bug614116-1.html \
|
||||
iframe_bug614116-2.html \
|
||||
$(NULL)
|
||||
|
||||
libs:: $(_TEST_FILES)
|
||||
$(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/tests/$(relativesrcdir)
|
||||
@ -1,30 +0,0 @@
|
||||
<!DOCTYPE html>
|
||||
<html>
|
||||
<body onload="loaded()">
|
||||
<script>
|
||||
function loaded() {
|
||||
parent.postMessage("loaded", "http://mochi.test:8888");
|
||||
}
|
||||
|
||||
function onMessageReceived(e) {
|
||||
switch (e.data) {
|
||||
case "getdata":
|
||||
parent.postMessage("data:" + globalStorage["example.com"].data, "http://mochi.test:8888");
|
||||
break;
|
||||
case "setdata":
|
||||
var didSucceed = true;
|
||||
try {
|
||||
globalStorage["example.com"].data = "value2";
|
||||
} catch(e) {
|
||||
didSucceed = false;
|
||||
}
|
||||
parent.postMessage("success:" + didSucceed, "http://mochi.test:8888");
|
||||
parent.postMessage("dataset2:" + globalStorage["example.com"].data, "http://mochi.test:8888");
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
addEventListener("message", onMessageReceived, false);
|
||||
</script>
|
||||
</body>
|
||||
</html>
|
||||
@ -1,24 +0,0 @@
|
||||
<!DOCTYPE html>
|
||||
<html>
|
||||
<body onload="loaded()">
|
||||
<script>
|
||||
function loaded() {
|
||||
parent.postMessage("loaded", "http://mochi.test:8888");
|
||||
}
|
||||
|
||||
function onMessageReceived(e) {
|
||||
switch (e.data) {
|
||||
case "getdata":
|
||||
parent.postMessage("data2:" + globalStorage["example.com"].data, "http://mochi.test:8888");
|
||||
break;
|
||||
case "setdata":
|
||||
globalStorage["example.com"].data = "value";
|
||||
parent.postMessage("dataset:" + globalStorage["example.com"].data, "http://mochi.test:8888");
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
addEventListener("message", onMessageReceived, false);
|
||||
</script>
|
||||
</body>
|
||||
</html>
|
||||
@ -1,86 +0,0 @@
|
||||
<!DOCTYPE HTML>
|
||||
<html>
|
||||
<!--
|
||||
https://bugzilla.mozilla.org/show_bug.cgi?id=614116
|
||||
-->
|
||||
<head>
|
||||
<title>Test for Bug 614116</title>
|
||||
<script type="application/javascript" src="/MochiKit/packed.js"></script>
|
||||
<script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
|
||||
<script type="text/javascript" src="/tests/SimpleTest/EventUtils.js"></script>
|
||||
<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=614116">Mozilla Bug 614116</a>
|
||||
<p id="display"></p>
|
||||
<div id="content">
|
||||
<iframe id="http"></iframe>
|
||||
<iframe id="https"></iframe>
|
||||
</div>
|
||||
<pre id="test">
|
||||
<script type="application/javascript">
|
||||
|
||||
/** Test for Bug 614116 **/
|
||||
SimpleTest.waitForExplicitFinish();
|
||||
addLoadEvent(function() {
|
||||
netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
|
||||
|
||||
const httpDomain = "http://example.com";
|
||||
const httpsDomain = "https://example.com";
|
||||
const path = "/tests/dom/tests/mochitest/globalstorage/";
|
||||
|
||||
var pm = Components.classes["@mozilla.org/permissionmanager;1"]
|
||||
.getService(Components.interfaces.nsIPermissionManager);
|
||||
var ios = Components.classes["@mozilla.org/network/io-service;1"]
|
||||
.getService(Components.interfaces.nsIIOService);
|
||||
pm.add(ios.newURI(httpDomain, null, null), "cookie", Components.interfaces.nsICookiePermission.ACCESS_SESSION);
|
||||
pm.add(ios.newURI(httpsDomain, null, null), "cookie", Components.interfaces.nsICookiePermission.ACCESS_SESSION);
|
||||
|
||||
var http = document.getElementById("http");
|
||||
var https = document.getElementById("https");
|
||||
|
||||
function finishTest() {
|
||||
netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
|
||||
pm.removeAll();
|
||||
SimpleTest.finish();
|
||||
}
|
||||
|
||||
var loaded = 0;
|
||||
function onMessageReceived(e) {
|
||||
switch (e.data) {
|
||||
case "loaded":
|
||||
++loaded;
|
||||
ok(loaded <= 2, "Two iframes should be loaded at most");
|
||||
if (loaded == 2) {
|
||||
https.contentWindow.postMessage("setdata", httpsDomain);
|
||||
}
|
||||
break;
|
||||
default:
|
||||
if (e.data.indexOf("dataset:") == 0) {
|
||||
is(e.data.substr(8), "value", "Correct value should be set");
|
||||
http.contentWindow.postMessage("getdata", httpDomain);
|
||||
} else if (e.data.indexOf("data:") == 0) {
|
||||
is(e.data.substr(5), "undefined", "Data should not be available in HTTP mode");
|
||||
http.contentWindow.postMessage("setdata", httpDomain);
|
||||
} else if (e.data.indexOf("dataset2:") == 0) {
|
||||
is(e.data.substr(9), "undefined", "Correct value should be set");
|
||||
https.contentWindow.postMessage("getdata", httpsDomain);
|
||||
} else if (e.data.indexOf("data2:") == 0) {
|
||||
is(e.data.substr(6), "value", "Data should not be modified in HTTP mode");
|
||||
finishTest();
|
||||
} else if (e.data.indexOf("success:") == 0) {
|
||||
is(e.data.substr(8), "false", "Setting the value in HTTP mode should fail");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
window.addEventListener("message", onMessageReceived, false);
|
||||
|
||||
http.src = httpDomain + path + "iframe_bug614116-1.html";
|
||||
https.src = httpsDomain + path + "iframe_bug614116-2.html";
|
||||
});
|
||||
|
||||
</script>
|
||||
</pre>
|
||||
</body>
|
||||
</html>
|
||||
Loading…
Reference in New Issue
Block a user