зеркало из https://github.com/mozilla/gecko-dev.git
Bug 995943 - Clean up some silly stuff surrounding prefs in CAPS. r=bz
This commit is contained in:
Родитель
fcffeeb528
Коммит
1eda1636be
|
@ -1150,18 +1150,8 @@ NS_IMETHODIMP
|
|||
nsScriptSecurityManager::Observe(nsISupports* aObject, const char* aTopic,
|
||||
const char16_t* aMessage)
|
||||
{
|
||||
nsresult rv = NS_OK;
|
||||
NS_ConvertUTF16toUTF8 messageStr(aMessage);
|
||||
const char *message = messageStr.get();
|
||||
|
||||
static const char jsPrefix[] = "javascript.";
|
||||
static const char securityPrefix[] = "security.";
|
||||
if ((PL_strncmp(message, jsPrefix, sizeof(jsPrefix)-1) == 0) ||
|
||||
(PL_strncmp(message, securityPrefix, sizeof(securityPrefix)-1) == 0) )
|
||||
{
|
||||
ScriptSecurityPrefChanged();
|
||||
}
|
||||
return rv;
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
/////////////////////////////////////////////
|
||||
|
@ -1273,21 +1263,9 @@ nsScriptSecurityManager::SystemPrincipalSingletonConstructor()
|
|||
inline void
|
||||
nsScriptSecurityManager::ScriptSecurityPrefChanged()
|
||||
{
|
||||
// JavaScript defaults to enabled in failure cases.
|
||||
mIsJavaScriptEnabled = true;
|
||||
|
||||
sStrictFileOriginPolicy = true;
|
||||
|
||||
nsresult rv;
|
||||
if (!mPrefInitialized) {
|
||||
rv = InitPrefs();
|
||||
if (NS_FAILED(rv))
|
||||
return;
|
||||
}
|
||||
|
||||
MOZ_ASSERT(mPrefInitialized);
|
||||
mIsJavaScriptEnabled =
|
||||
Preferences::GetBool(sJSEnabledPrefName, mIsJavaScriptEnabled);
|
||||
|
||||
sStrictFileOriginPolicy =
|
||||
Preferences::GetBool(sFileOriginPolicyPrefName, false);
|
||||
}
|
||||
|
|
Загрузка…
Ссылка в новой задаче