author | Ehsan Akhgari <ehsan@mozilla.com> |
Wed, 18 Dec 2013 22:54:26 -0500 | |
changeset 161193 | d86702f2170c3a5cf51d499d11a57c4273498e21 |
parent 161192 | f6588099c40bca005474bf3f198fdd7ce3b98e68 |
child 161194 | ab6a4c0bb0825409af8114fd82acde13a30cf135 |
push id | 37825 |
push user | eakhgari@mozilla.com |
push date | Thu, 19 Dec 2013 03:54:33 +0000 |
treeherder | mozilla-inbound@d86702f2170c [default view] [failures only] |
perfherder | [talos] [build metrics] [platform microbench] (compared to previous push) |
reviewers | bent |
bugs | 951555 |
milestone | 29.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
|
dom/workers/RuntimeService.cpp | file | annotate | diff | comparison | revisions | |
dom/workers/RuntimeService.h | file | annotate | diff | comparison | revisions |
--- a/dom/workers/RuntimeService.cpp +++ b/dom/workers/RuntimeService.cpp @@ -1728,25 +1728,16 @@ RuntimeService::Init() PREF_MAX_SCRIPT_RUN_TIME_CHROME, -1))) { NS_WARNING("Failed to register timeout cache!"); } int32_t maxPerDomain = Preferences::GetInt(PREF_WORKERS_MAX_PER_DOMAIN, MAX_WORKERS_PER_DOMAIN); gMaxWorkersPerDomain = std::max(0, maxPerDomain); - mDetectorName = Preferences::GetLocalizedCString("intl.charset.detector"); - - nsCOMPtr<nsIPlatformCharset> 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; } return NS_OK; }
--- a/dom/workers/RuntimeService.h +++ b/dom/workers/RuntimeService.h @@ -91,19 +91,16 @@ private: // *Not* protected by mMutex. nsClassHashtable<nsPtrHashKey<nsPIDOMWindow>, nsTArray<WorkerPrivate*> > mWindowMap; // Only used on the main thread. nsCOMPtr<nsITimer> mIdleThreadTimer; - nsCString mDetectorName; - nsCString mSystemCharset; - static JSSettings sDefaultJSSettings; static bool sDefaultPreferences[WORKERPREF_COUNT]; public: struct NavigatorStrings { nsString mAppName; nsString mAppVersion; @@ -148,28 +145,16 @@ public: CreateSharedWorker(const GlobalObject& aGlobal, const nsAString& aScriptURL, const nsAString& aName, SharedWorker** aSharedWorker); void ForgetSharedWorker(WorkerPrivate* aWorkerPrivate); - const nsACString& - GetDetectorName() const - { - return mDetectorName; - } - - const nsACString& - GetSystemCharset() const - { - return mSystemCharset; - } - const NavigatorStrings& GetNavigatorStrings() const { return mNavigatorStrings; } void NoteIdleThread(WorkerThread* aThread);