From aac35871dd8a66d1c3467dca7d6eb9765fde976e Mon Sep 17 00:00:00 2001 From: Mounir Lamouri Date: Thu, 8 Nov 2012 15:56:48 +0000 Subject: [PATCH] Backed out changeset 3566ba4296f7 because of wrong bug number. --HG-- extra : rebase_source : c5d189308a555c7235d6cd405aa44d36c9b7db9a --- dom/base/nsDOMClassInfo.cpp | 8 -------- dom/file/ArchiveReader.cpp | 12 ----------- dom/file/ArchiveReader.h | 2 -- dom/file/test/helpers.js | 15 -------------- dom/file/test/test_archivereader.html | 20 +++++++++---------- dom/indexedDB/test/helpers.js | 19 ++---------------- .../mochitest/general/test_interfaces.html | 2 ++ modules/libpref/src/init/all.js | 3 --- 8 files changed, 14 insertions(+), 67 deletions(-) diff --git a/dom/base/nsDOMClassInfo.cpp b/dom/base/nsDOMClassInfo.cpp index e62343c4f5c..75d5b0e76ed 100644 --- a/dom/base/nsDOMClassInfo.cpp +++ b/dom/base/nsDOMClassInfo.cpp @@ -6677,14 +6677,6 @@ ConstructorEnabled(const nsGlobalNameStruct *aStruct, nsGlobalWindow *aWin) } } - // Don't expose ArchiveReader unless user has explicitly enabled it - if (aStruct->mDOMClassInfoID == eDOMClassInfo_ArchiveReader_id || - aStruct->mDOMClassInfoID == eDOMClassInfo_ArchiveRequest_id) { - if (!dom::file::ArchiveReader::PrefEnabled()) { - return false; - } - } - return true; } diff --git a/dom/file/ArchiveReader.cpp b/dom/file/ArchiveReader.cpp index 58404491ad1..bb6b9b375b5 100644 --- a/dom/file/ArchiveReader.cpp +++ b/dom/file/ArchiveReader.cpp @@ -16,8 +16,6 @@ #include "nsIURI.h" #include "nsNetUtil.h" -#include "mozilla/Preferences.h" - USING_FILE_NAMESPACE ArchiveReader::ArchiveReader() @@ -35,12 +33,6 @@ ArchiveReader::~ArchiveReader() nsLayoutStatics::Release(); } -bool -ArchiveReader::PrefEnabled() -{ - return Preferences::GetBool("dom.archivereader.enabled", true); -} - NS_IMETHODIMP ArchiveReader::Initialize(nsISupports* aOwner, JSContext* aCx, @@ -50,10 +42,6 @@ ArchiveReader::Initialize(nsISupports* aOwner, { NS_ENSURE_TRUE(aArgc == 1 || aArgc == 2, NS_ERROR_INVALID_ARG); - if (!PrefEnabled()) { - return NS_ERROR_UNEXPECTED; - } - // We expect to get a Blob object if (!aArgv[0].isObject()) { return NS_ERROR_INVALID_ARG; // We're not interested diff --git a/dom/file/ArchiveReader.h b/dom/file/ArchiveReader.h index dcc578af091..40b432f2a20 100644 --- a/dom/file/ArchiveReader.h +++ b/dom/file/ArchiveReader.h @@ -48,8 +48,6 @@ public: nsresult GetInputStream(nsIInputStream** aInputStream); nsresult GetSize(uint64_t* aSize); - static bool PrefEnabled(); - public: // for the ArchiveRequest: nsresult RegisterRequest(ArchiveRequest* aRequest); diff --git a/dom/file/test/helpers.js b/dom/file/test/helpers.js index b1c0d690ab0..e3494df2b33 100644 --- a/dom/file/test/helpers.js +++ b/dom/file/test/helpers.js @@ -13,14 +13,11 @@ var fileStorages = [ var utils = SpecialPowers.getDOMWindowUtils(window); -var archiveReaderEnabled = false; - var testGenerator = testSteps(); function runTest() { allowUnlimitedQuota(); - enableArchiveReader(); SimpleTest.waitForExplicitFinish(); testGenerator.next(); @@ -29,7 +26,6 @@ function runTest() function finishTest() { resetUnlimitedQuota(); - resetArchiveReader(); SimpleTest.executeSoon(function() { testGenerator.close(); @@ -102,17 +98,6 @@ function resetUnlimitedQuota(url) removePermission("indexedDB-unlimited", url); } -function enableArchiveReader() -{ - archiveReaderEnabled = SpecialPowers.getBoolPref("dom.archivereader.enabled"); - SpecialPowers.setBoolPref("dom.archivereader.enabled", true); -} - -function resetArchiveReader() -{ - SpecialPowers.setBoolPref("dom.archivereader.enabled", archiveReaderEnabled); -} - function getFileHandle(fileStorageKey, name) { var requestService = SpecialPowers.getDOMRequestService(); diff --git a/dom/file/test/test_archivereader.html b/dom/file/test/test_archivereader.html index 1a8cbbd5d58..e451f519b39 100644 --- a/dom/file/test/test_archivereader.html +++ b/dom/file/test/test_archivereader.html @@ -8,8 +8,14 @@ + - - - - - -

- -

diff --git a/dom/indexedDB/test/helpers.js b/dom/indexedDB/test/helpers.js index 034f74264df..73c0f49ab71 100644 --- a/dom/indexedDB/test/helpers.js +++ b/dom/indexedDB/test/helpers.js @@ -4,7 +4,6 @@ */ var testGenerator = testSteps(); -var archiveReaderEnabled = false; // The test js is shared between xpcshell (which has no SpecialPowers object) // and content mochitests (where the |Components| object is accessible only as @@ -69,8 +68,6 @@ if (!window.runTest) { allowUnlimitedQuota(); } - enableArchiveReader(); - clearAllDatabases(function () { testGenerator.next(); }); } } @@ -78,7 +75,6 @@ if (!window.runTest) { function finishTest() { resetUnlimitedQuota(); - resetArchiveReader(); SimpleTest.executeSoon(function() { testGenerator.close(); @@ -167,12 +163,12 @@ function compareKeys(k1, k2) { if (!(k2 instanceof Array) || k1.length != k2.length) return false; - + for (let i = 0; i < k1.length; ++i) { if (!compareKeys(k1[i], k2[i])) return false; } - + return true; } @@ -215,17 +211,6 @@ function resetUnlimitedQuota(url) removePermission("indexedDB-unlimited", url); } -function enableArchiveReader() -{ - archiveReaderEnabled = SpecialPowers.getBoolPref("dom.archivereader.enabled"); - SpecialPowers.setBoolPref("dom.archivereader.enabled", true); -} - -function resetArchiveReader() -{ - SpecialPowers.setBoolPref("dom.archivereader.enabled", archiveReaderEnabled); -} - function gc() { SpecialPowers.forceGC(); diff --git a/dom/tests/mochitest/general/test_interfaces.html b/dom/tests/mochitest/general/test_interfaces.html index b3284b8a911..9eec189bb11 100644 --- a/dom/tests/mochitest/general/test_interfaces.html +++ b/dom/tests/mochitest/general/test_interfaces.html @@ -207,6 +207,8 @@ var interfaceNamesInGlobalScope = "SVGAltGlyphElement", "Screen", "FileReader", + "ArchiveReader", + "ArchiveRequest", "SVGSwitchElement", "SVGPolylineElement", "SVGPathSegLinetoAbs", diff --git a/modules/libpref/src/init/all.js b/modules/libpref/src/init/all.js index ebeb2ebcafe..f473c40ad4a 100644 --- a/modules/libpref/src/init/all.js +++ b/modules/libpref/src/init/all.js @@ -1681,9 +1681,6 @@ pref("editor.positioning.offset", 0); pref("dom.max_chrome_script_run_time", 20); pref("dom.max_script_run_time", 10); -// If true, ArchiveReader will be enabled -pref("dom.archivereader.enabled", false); - // Hang monitor timeout after which we kill the browser, in seconds // (0 is disabled) // Disabled on all platforms per bug 705748 until the found issues are