diff options
| author | athenian200 <athenian200@outlook.com> | 2020-01-27 22:59:08 -0600 |
|---|---|---|
| committer | athenian200 <athenian200@outlook.com> | 2020-01-27 22:59:08 -0600 |
| commit | 3c4f414db74b84f7d2a6fb13fd888a47a153699b (patch) | |
| tree | ea81fca559849967a79d598a6f460830762ec9ea /dom/jsurl/nsJSProtocolHandler.cpp | |
| parent | 1f8d508258ac5d7d57fc4eb35cac90f28bc8ca03 (diff) | |
| parent | c4b0715baaffc541670fd1158557aa7e61e521d3 (diff) | |
| download | UXP-3c4f414db74b84f7d2a6fb13fd888a47a153699b.tar UXP-3c4f414db74b84f7d2a6fb13fd888a47a153699b.tar.gz UXP-3c4f414db74b84f7d2a6fb13fd888a47a153699b.tar.lz UXP-3c4f414db74b84f7d2a6fb13fd888a47a153699b.tar.xz UXP-3c4f414db74b84f7d2a6fb13fd888a47a153699b.zip | |
Merge branch 'master' of https://github.com/MoonchildProductions/UXP into form-disabled-issue
Diffstat (limited to 'dom/jsurl/nsJSProtocolHandler.cpp')
| -rw-r--r-- | dom/jsurl/nsJSProtocolHandler.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/dom/jsurl/nsJSProtocolHandler.cpp b/dom/jsurl/nsJSProtocolHandler.cpp index 90171db10..df1e6cbf5 100644 --- a/dom/jsurl/nsJSProtocolHandler.cpp +++ b/dom/jsurl/nsJSProtocolHandler.cpp @@ -46,6 +46,7 @@ #include "nsIWritablePropertyBag2.h" #include "nsIContentSecurityPolicy.h" #include "nsSandboxFlags.h" +#include "mozilla/CycleCollectedJSContext.h" #include "mozilla/dom/ScriptSettings.h" #include "nsILoadInfo.h" #include "nsContentSecurityManager.h" @@ -241,7 +242,7 @@ nsresult nsJSThunk::EvaluateScript(nsIChannel *aChannel, // New script entry point required, due to the "Create a script" step of // http://www.whatwg.org/specs/web-apps/current-work/#javascript-protocol - nsAutoMicroTask mt; + mozilla::nsAutoMicroTask mt; AutoEntryScript aes(innerGlobal, "javascript: URI", true); JSContext* cx = aes.cx(); JS::Rooted<JSObject*> globalJSObject(cx, innerGlobal->GetGlobalJSObject()); |