From 4fa04d6a289e2515329d94017bdb371335a4aead Mon Sep 17 00:00:00 2001 From: Ehsan Akhgari Date: Wed, 18 Dec 2013 22:54:26 -0500 Subject: [PATCH] Bug 951555 - Clean up dead code from dom/workers/RuntimeService.cpp after removal of heuristic detection from the File API; r=bent --- dom/workers/RuntimeService.cpp | 9 --------- dom/workers/RuntimeService.h | 15 --------------- 2 files changed, 24 deletions(-) diff --git a/dom/workers/RuntimeService.cpp b/dom/workers/RuntimeService.cpp index 6cd7669b2412..dde3efd2a63f 100644 --- a/dom/workers/RuntimeService.cpp +++ b/dom/workers/RuntimeService.cpp @@ -1733,15 +1733,6 @@ RuntimeService::Init() MAX_WORKERS_PER_DOMAIN); gMaxWorkersPerDomain = std::max(0, maxPerDomain); - mDetectorName = Preferences::GetLocalizedCString("intl.charset.detector"); - - nsCOMPtr platformCharset = - do_GetService(NS_PLATFORMCHARSET_CONTRACTID, &rv); - if (NS_SUCCEEDED(rv)) { - rv = platformCharset->GetCharset(kPlatformCharsetSel_PlainTextInFile, - mSystemCharset); - } - rv = InitOSFileConstants(); if (NS_FAILED(rv)) { return rv; diff --git a/dom/workers/RuntimeService.h b/dom/workers/RuntimeService.h index 57a17a59c33e..f770be5d543e 100644 --- a/dom/workers/RuntimeService.h +++ b/dom/workers/RuntimeService.h @@ -96,9 +96,6 @@ private: // Only used on the main thread. nsCOMPtr mIdleThreadTimer; - nsCString mDetectorName; - nsCString mSystemCharset; - static JSSettings sDefaultJSSettings; static bool sDefaultPreferences[WORKERPREF_COUNT]; @@ -153,18 +150,6 @@ public: void ForgetSharedWorker(WorkerPrivate* aWorkerPrivate); - const nsACString& - GetDetectorName() const - { - return mDetectorName; - } - - const nsACString& - GetSystemCharset() const - { - return mSystemCharset; - } - const NavigatorStrings& GetNavigatorStrings() const {