mozilla
/
gecko-dev
зеркало из https://github.com/mozilla/gecko-dev.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Backing out bug 492219 to fix assertion failure on leak boxes

This commit is contained in:
Robert O'Callahan 2009-05-15 17:31:45 +12:00
Родитель 760a26b486
Коммит b8e092eedf
6 изменённых файлов: 9 добавлений и 47 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

8
dom/base/nsDOMClassInfo.cpp
Просмотреть файл

@ -1182,7 +1182,7 @@ static nsDOMClassInfoData sClassInfoData[] = {
// since a call to addProperty() is always followed by a call to
// setProperty(), except in the case when a getter or setter is set
// for a property. But we don't care about getters or setters here.
NS_DEFINE_CLASSINFO_DATA(StorageObsolete, nsStorageSH,
NS_DEFINE_CLASSINFO_DATA(Storage, nsStorageSH,
DOM_DEFAULT_SCRIPTABLE_FLAGS |
nsIXPCScriptable::WANT_NEWRESOLVE |
nsIXPCScriptable::WANT_GETPROPERTY |
@ -1191,7 +1191,7 @@ static nsDOMClassInfoData sClassInfoData[] = {
nsIXPCScriptable::DONT_ENUM_STATIC_PROPS |
nsIXPCScriptable::WANT_NEWENUMERATE)
NS_DEFINE_CLASSINFO_DATA(Storage, nsStorage2SH,
NS_DEFINE_CLASSINFO_DATA(Storage2, nsStorage2SH,
DOM_DEFAULT_SCRIPTABLE_FLAGS |
nsIXPCScriptable::WANT_NEWRESOLVE |
nsIXPCScriptable::WANT_GETPROPERTY |
@ -3396,11 +3396,11 @@ nsDOMClassInfo::Init()
DOM_CLASSINFO_MAP_ENTRY(nsIDOMXPathResult)
DOM_CLASSINFO_MAP_END
DOM_CLASSINFO_MAP_BEGIN(StorageObsolete, nsIDOMStorage)
DOM_CLASSINFO_MAP_BEGIN(Storage, nsIDOMStorage)
DOM_CLASSINFO_MAP_ENTRY(nsIDOMStorage)
DOM_CLASSINFO_MAP_END
DOM_CLASSINFO_MAP_BEGIN(Storage, nsIDOMStorage2)
DOM_CLASSINFO_MAP_BEGIN(Storage2, nsIDOMStorage2)
DOM_CLASSINFO_MAP_ENTRY(nsIDOMStorage2)
DOM_CLASSINFO_MAP_END

2
dom/base/nsDOMClassInfoID.h
Просмотреть файл

@ -382,8 +382,8 @@ enum nsDOMClassInfoID {
eDOMClassInfo_XPathResult_id,
// WhatWG WebApps Objects
eDOMClassInfo_StorageObsolete_id,
eDOMClassInfo_Storage_id,
eDOMClassInfo_Storage2_id,
eDOMClassInfo_StorageList_id,
eDOMClassInfo_StorageItem_id,
eDOMClassInfo_StorageEvent_id,

4
dom/src/storage/nsDOMStorage.cpp
Просмотреть файл

@ -471,7 +471,7 @@ NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(nsDOMStorage)
NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsIDOMStorage)
NS_INTERFACE_MAP_ENTRY(nsIDOMStorage)
NS_INTERFACE_MAP_ENTRY(nsPIDOMStorage)
NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(StorageObsolete)
NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(Storage)
NS_INTERFACE_MAP_END
NS_IMETHODIMP
@ -1342,7 +1342,7 @@ NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(nsDOMStorage2)
NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsIDOMStorage2)
NS_INTERFACE_MAP_ENTRY(nsIDOMStorage2)
NS_INTERFACE_MAP_ENTRY(nsPIDOMStorage)
NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(Storage)
NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(Storage2)
NS_INTERFACE_MAP_END
nsresult

4
dom/tests/mochitest/chrome/domstorage_global.js
Просмотреть файл

@ -9,10 +9,10 @@ function test_DOMStorage_global()
is(globalStorage instanceof StorageList, true, "globalStorage property");
var storage = globalStorage.namedItem(currentDomain);
is(storage instanceof StorageObsolete, true, "StorageList namedItem");
is(storage instanceof Storage, true, "StorageList namedItem");
var storage2 = globalStorage[currentDomain];
is(storage2 instanceof StorageObsolete, true, "StorageList property syntax");
is(storage2 instanceof Storage, true, "StorageList property syntax");
is(storage, storage2, "StorageList namedItem and array return same value");

1
dom/tests/mochitest/localstorage/Makefile.in
Просмотреть файл

@ -71,7 +71,6 @@ _TEST_FILES = \
test_localStorageQuota.html \
test_localStorageKeyOrder.html \
test_removeOwnersAPI.html \
test_storageConstructor.html \
$(NULL)
_CHROME_FILES = \

37
dom/tests/mochitest/localstorage/test_storageConstructor.html
Просмотреть файл

@ -1,37 +0,0 @@
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<title>localStorage different port numbers</title>
<script type="text/javascript" src="/MochiKit/packed.js"></script>
<script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
<script type="text/javascript" src="interOriginTest2.js"></script>
<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
<script type="text/javascript">
function startTest()
{
var functionCalled = false;
is(localStorage instanceof Storage, true, "localStorage is instance of Storage");
Storage.prototype.exists = function(key) {
functionCalled = true;
return this.getItem(key) != null;
}
localStorage.setItem("test_prototype", "value");
is(functionCalled, false, "Overridden function not called");
is(localStorage.exists("test_prototype"), true, "Prototype overridden");
is(functionCalled, true, "Overridden function called");
localStorage.clear();
SimpleTest.finish();
}
SimpleTest.waitForExplicitFinish();
</script>
</head>
<body onload="startTest();">
</body>
</html>