зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1379786, part 1 - Remove dead code related to the security manager. r=mrbkap
Also, one unused include of nsIProgrammingLanguage, which is unrelated. MozReview-Commit-ID: LJf2NSwmaYG --HG-- extra : rebase_source : 63dfca9185535dbfa695cf2f383d81a14ce423c0
This commit is contained in:
Родитель
bb284dfc84
Коммит
5de8ffcbf5
|
@ -16,7 +16,6 @@
|
||||||
#include "nsIDocument.h"
|
#include "nsIDocument.h"
|
||||||
#include "nsIDOMDOMException.h"
|
#include "nsIDOMDOMException.h"
|
||||||
#include "nsIException.h"
|
#include "nsIException.h"
|
||||||
#include "nsIProgrammingLanguage.h"
|
|
||||||
#include "nsMemory.h"
|
#include "nsMemory.h"
|
||||||
#include "xpcprivate.h"
|
#include "xpcprivate.h"
|
||||||
|
|
||||||
|
|
|
@ -233,11 +233,6 @@ nsresult nsJSThunk::EvaluateScript(nsIChannel *aChannel,
|
||||||
NS_UnescapeURL(script);
|
NS_UnescapeURL(script);
|
||||||
|
|
||||||
|
|
||||||
nsCOMPtr<nsIScriptSecurityManager> securityManager;
|
|
||||||
securityManager = do_GetService(NS_SCRIPTSECURITYMANAGER_CONTRACTID, &rv);
|
|
||||||
if (NS_FAILED(rv))
|
|
||||||
return rv;
|
|
||||||
|
|
||||||
// New script entry point required, due to the "Create a script" step of
|
// New script entry point required, due to the "Create a script" step of
|
||||||
// http://www.whatwg.org/specs/web-apps/current-work/#javascript-protocol
|
// http://www.whatwg.org/specs/web-apps/current-work/#javascript-protocol
|
||||||
nsAutoMicroTask mt;
|
nsAutoMicroTask mt;
|
||||||
|
|
|
@ -7953,12 +7953,6 @@ StorageDirectoryHelper::RunOnMainThread()
|
||||||
|
|
||||||
nsresult rv;
|
nsresult rv;
|
||||||
|
|
||||||
nsCOMPtr<nsIScriptSecurityManager> secMan =
|
|
||||||
do_GetService(NS_SCRIPTSECURITYMANAGER_CONTRACTID, &rv);
|
|
||||||
if (NS_WARN_IF(NS_FAILED(rv))) {
|
|
||||||
return rv;
|
|
||||||
}
|
|
||||||
|
|
||||||
for (uint32_t count = mOriginProps.Length(), index = 0;
|
for (uint32_t count = mOriginProps.Length(), index = 0;
|
||||||
index < count;
|
index < count;
|
||||||
index++) {
|
index++) {
|
||||||
|
|
|
@ -83,8 +83,6 @@ NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(SandboxPrivate)
|
||||||
NS_INTERFACE_MAP_ENTRY(nsISupportsWeakReference)
|
NS_INTERFACE_MAP_ENTRY(nsISupportsWeakReference)
|
||||||
NS_INTERFACE_MAP_END
|
NS_INTERFACE_MAP_END
|
||||||
|
|
||||||
const char kScriptSecurityManagerContractID[] = NS_SCRIPTSECURITYMANAGER_CONTRACTID;
|
|
||||||
|
|
||||||
class nsXPCComponents_utils_Sandbox : public nsIXPCComponents_utils_Sandbox,
|
class nsXPCComponents_utils_Sandbox : public nsIXPCComponents_utils_Sandbox,
|
||||||
public nsIXPCScriptable
|
public nsIXPCScriptable
|
||||||
{
|
{
|
||||||
|
|
|
@ -804,10 +804,6 @@ nsWindowWatcher::OpenWindowInternal(mozIDOMWindowProxy* aParent,
|
||||||
SizeSpec sizeSpec;
|
SizeSpec sizeSpec;
|
||||||
CalcSizeSpec(features, sizeSpec);
|
CalcSizeSpec(features, sizeSpec);
|
||||||
|
|
||||||
nsCOMPtr<nsIScriptSecurityManager> sm(
|
|
||||||
do_GetService(NS_SCRIPTSECURITYMANAGER_CONTRACTID));
|
|
||||||
|
|
||||||
|
|
||||||
// XXXbz Why is an AutoJSAPI good enough here? Wouldn't AutoEntryScript (so
|
// XXXbz Why is an AutoJSAPI good enough here? Wouldn't AutoEntryScript (so
|
||||||
// we affect the entry global) make more sense? Or do we just want to affect
|
// we affect the entry global) make more sense? Or do we just want to affect
|
||||||
// GetSubjectPrincipal()?
|
// GetSubjectPrincipal()?
|
||||||
|
|
Загрузка…
Ссылка в новой задаче