[embedlite-components] Entering secure JS context by pushing AutoNoJS…

…API to the stack. Contributes to JB#49549

chromehelper/EmbedChromeListener.cpp

@@ -26,6 +26,7 @@
 #include "nsIFocusManager.h"
 #include "nsIDocShellTreeItem.h"
 #include "nsIWebNavigation.h"
+#include "mozilla/dom/ScriptSettings.h"
 
 EmbedChromeListener::EmbedChromeListener(nsIDOMWindow* aWin)
   :  DOMWindow(aWin)
@@ -100,7 +101,7 @@ EmbedChromeListener::HandleEvent(nsIDOMEvent* aEvent)
     uint32_t winid;
     mService->GetIDByWindow(window, &winid);
     NS_ENSURE_TRUE(winid , NS_ERROR_FAILURE);
-    mService->EnterSecureJSContext();
+    mozilla::dom::AutoNoJSAPI noJSAPI();
 
     if (type.EqualsLiteral(MOZ_DOMMetaAdded)) {
         messageName.AssignLiteral("chrome:metaadded");
@@ -123,7 +124,6 @@ EmbedChromeListener::HandleEvent(nsIDOMEvent* aEvent)
         bool disabled = true;
         disabledIface->GetMozDisabled(&disabled);
         if (!disabledIface || disabled) {
-            mService->LeaveSecureJSContext();
             return NS_OK;
         }
         disabledIface->GetHref(href);
@@ -135,7 +135,6 @@ EmbedChromeListener::HandleEvent(nsIDOMEvent* aEvent)
         nsCOMPtr<nsIDOMNode> node = do_QueryInterface(origTarget);
         node->GetOwnerDocument(getter_AddRefs(ownDoc));
         if (ownDoc != ctDoc) {
-          mService->LeaveSecureJSContext();
           return NS_OK;
         }
 
@@ -163,14 +162,12 @@ EmbedChromeListener::HandleEvent(nsIDOMEvent* aEvent)
         messageName.AssignLiteral("chrome:winopenclose");
         root->SetPropertyAsAString(NS_LITERAL_STRING("type"), type);
     } else {
-        mService->LeaveSecureJSContext();
         return NS_OK;
     }
 
     nsString outStr;
     json->CreateJSON(root, message);
     mService->SendAsyncMessage(winid, messageName.get(), message.get());
-    mService->LeaveSecureJSContext();
 
     return NS_OK;
 }

prompt/EmbedPromptService.cpp

@@ -33,6 +33,7 @@
 #include "nsILoginInfo.h"
 #include "nsComponentManagerUtils.h"
 #include "nsMemory.h"
+#include "mozilla/dom/ScriptSettings.h"
 
 // Prompt Factory Implementation
 
@@ -235,7 +236,7 @@ EmbedPromptService::AlertCheck(const char16_t* aDialogTitle,
 
     nsresult rv(NS_OK);
 
-    mService->EnterSecureJSContext();
+    mozilla::dom::AutoNoJSAPI noJSAPI();
 
     nsCOMPtr<nsIDOMWindowUtils> utils = do_GetInterface(mWin);
     NS_ENSURE_TRUE(utils, NS_ERROR_FAILURE);
@@ -272,8 +273,6 @@ EmbedPromptService::AlertCheck(const char16_t* aDialogTitle,
 
     rv = utils->LeaveModalState();
 
-    mService->LeaveSecureJSContext();
-
     return NS_OK;
 }
 
@@ -320,7 +319,7 @@ EmbedPromptService::ConfirmCheck(const char16_t* aDialogTitle,
 
     nsresult rv(NS_OK);
 
-    mService->EnterSecureJSContext();
+    mozilla::dom::AutoNoJSAPI noJSAPI();
 
     nsCOMPtr<nsIDOMWindowUtils> utils = do_GetInterface(mWin);
     NS_ENSURE_TRUE(utils, NS_ERROR_FAILURE);
@@ -361,8 +360,6 @@ EmbedPromptService::ConfirmCheck(const char16_t* aDialogTitle,
 
     rv = utils->LeaveModalState();
 
-    mService->LeaveSecureJSContext();
-
     return NS_OK;
 }
 
@@ -416,7 +413,7 @@ EmbedPromptService::Prompt(const char16_t* aDialogTitle,
 
     nsresult rv(NS_OK);
 
-    mService->EnterSecureJSContext();
+    mozilla::dom::AutoNoJSAPI noJSAPI();
 
     nsCOMPtr<nsIDOMWindowUtils> utils = do_GetInterface(mWin);
     NS_ENSURE_TRUE(utils, NS_ERROR_FAILURE);
@@ -463,8 +460,6 @@ EmbedPromptService::Prompt(const char16_t* aDialogTitle,
 
     rv = utils->LeaveModalState();
 
-    mService->LeaveSecureJSContext();
-
     return NS_OK;
 }
 

touchhelper/EmbedTouchListener.cpp

@@ -40,6 +40,7 @@
 #include "nsIDOMHTMLAnchorElement.h"
 #include "nsIDOMHTMLAreaElement.h"
 #include "nsIDOMHTMLImageElement.h"
+#include "mozilla/dom/ScriptSettings.h"
 
 using namespace mozilla;
 
@@ -129,7 +130,7 @@ void EmbedTouchListener::HandleDoubleTap(const CSSPoint& aPoint, mozilla::Modifi
 void
 EmbedTouchListener::AnyElementFromPoint(nsIDOMWindow* aWindow, double aX, double aY, nsIDOMElement* *aElem)
 {
-    mService->EnterSecureJSContext();
+    mozilla::dom::AutoNoJSAPI noJSAPI();
     nsCOMPtr<nsIDOMWindowUtils> utils = do_GetInterface(aWindow);
     nsCOMPtr<nsIDOMElement> elem;
     NS_ENSURE_SUCCESS(utils->ElementFromPoint(aX, aY, true, true, getter_AddRefs(elem)), );
@@ -163,7 +164,6 @@ EmbedTouchListener::AnyElementFromPoint(nsIDOMWindow* aWindow, double aX, double
     if (elem) {
         NS_ADDREF(*aElem = elem);
     }
-    mService->LeaveSecureJSContext();
 
     return;
 }
@@ -332,7 +332,7 @@ EmbedTouchListener::GetBoundingContentRect(nsIDOMElement* aElement)
         return retRect;
     }
 
-    mService->EnterSecureJSContext();
+    mozilla::dom::AutoNoJSAPI noJSAPI();
     nsCOMPtr<nsIDOMWindowUtils> utils = do_GetInterface(newWin);
     int32_t scrollX = 0, scrollY = 0;
     NS_ENSURE_SUCCESS(utils->GetScrollXY(false, &scrollX, &scrollY), retRect);
@@ -377,7 +377,6 @@ EmbedTouchListener::GetBoundingContentRect(nsIDOMElement* aElement)
     r->GetTop(&rtop);
     r->GetWidth(&rwidth);
     r->GetHeight(&rheight);
-    mService->LeaveSecureJSContext();
 
     return gfx::Rect(rleft + scrollX,
                      rtop + scrollY,

widgetfactory/nsFilePicker.cpp

@@ -18,6 +18,7 @@
 #include "nsIDOMWindowUtils.h"
 #include <nsISimpleEnumerator.h>   // for nsISimpleEnumerator
 #include <nsServiceManagerUtils.h> // for do_GetService()
+#include "mozilla/dom/ScriptSettings.h"
 
 //-----------------------------
 
@@ -186,7 +187,7 @@ NS_IMETHODIMP nsEmbedFilePicker::Show(int16_t* _retval)
 
   nsresult rv;
 
-  mService->EnterSecureJSContext();
+  mozilla::dom::AutoNoJSAPI noJSAPI();
   nsCOMPtr<nsIDOMWindowUtils> utils = do_GetInterface(mWin);
   NS_ENSURE_TRUE(utils, NS_ERROR_FAILURE);
 
@@ -214,7 +215,6 @@ NS_IMETHODIMP nsEmbedFilePicker::Show(int16_t* _retval)
   }
 
   rv = utils->LeaveModalState();
-  mService->LeaveSecureJSContext();
 
   return rv;
 }
@@ -341,12 +341,11 @@ nsEmbedFilePicker::GetDomfile(nsISupports * *aDomfile)
     return NS_OK;
   }
 
-  mService->EnterSecureJSContext();
+  mozilla::dom::AutoNoJSAPI noJSAPI();
   nsCOMPtr<nsIDOMWindowUtils> utils = do_GetInterface(mWin);
   nsCOMPtr<nsISupports> file;
   utils->WrapDOMFile(localFile, getter_AddRefs(file));
   file.forget(aDomfile);
-  mService->LeaveSecureJSContext();
 
   return NS_OK;
 }