Use AutoNoJS for all WindowUtil calls

sailfishos · Jun 17, 2014 · 82d344f · 82d344f
1 parent 0c241a8
commit 82d344f
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 1 deletion.
diff --git a/embedding/embedlite/embedthread/EmbedLiteViewThreadChild.cpp b/embedding/embedlite/embedthread/EmbedLiteViewThreadChild.cpp
@@ -210,6 +210,7 @@ EmbedLiteViewThreadChild::InitGeckoWindow(const uint32_t& parentId)
     NS_ERROR("Got stuck with DOMWindow1!");
   }
 
+  mozilla::dom::AutoNoJSAPI nojsapi;
   nsCOMPtr<nsIDOMWindowUtils> utils = do_GetInterface(mDOMWindow);
   utils->GetOuterWindowID(&mOuterId);
 
@@ -589,7 +590,7 @@ EmbedLiteViewThreadChild::RecvUpdateFrame(const FrameMetrics& aFrameMetrics)
 
   if (mViewResized &&
       aFrameMetrics.mIsRoot &&
-      mHelper->mLastRootMetrics.mPresShellId == aFrameMetrics.mPresShellId &&
+      mHelper->mLastRootMetrics.GetPresShellId() == aFrameMetrics.GetPresShellId() &&
       mHelper->HandlePossibleViewportChange()) {
     mViewResized = false;
   }
@@ -781,6 +782,7 @@ bool
 EmbedLiteViewThreadChild::RecvHandleKeyPressEvent(const int& domKeyCode, const int& gmodifiers, const int& charCode)
 {
   nsCOMPtr<nsPIDOMWindow> window = do_GetInterface(mWebNavigation);
+  mozilla::dom::AutoNoJSAPI nojsapi;
   nsCOMPtr<nsIDOMWindowUtils> utils = do_GetInterface(window);
   NS_ENSURE_TRUE(utils, true);
   bool handled = false;
@@ -805,6 +807,7 @@ bool
 EmbedLiteViewThreadChild::RecvHandleKeyReleaseEvent(const int& domKeyCode, const int& gmodifiers, const int& charCode)
 {
   nsCOMPtr<nsPIDOMWindow> window = do_GetInterface(mWebNavigation);
+  mozilla::dom::AutoNoJSAPI nojsapi;
   nsCOMPtr<nsIDOMWindowUtils> utils = do_GetInterface(window);
   NS_ENSURE_TRUE(utils, true);
   bool handled = false;
@@ -826,6 +829,7 @@ EmbedLiteViewThreadChild::RecvMouseEvent(const nsString& aType,
   }
 
   nsCOMPtr<nsPIDOMWindow> window = do_GetInterface(mWebNavigation);
+  mozilla::dom::AutoNoJSAPI nojsapi;
   nsCOMPtr<nsIDOMWindowUtils> utils = do_GetInterface(window);
 
   NS_ENSURE_TRUE(utils, true);

diff --git a/embedding/embedlite/modules/EmbedLiteAppService.cpp b/embedding/embedlite/modules/EmbedLiteAppService.cpp
@@ -124,6 +124,7 @@ EmbedLiteAppService::GetIDByWindow(nsIDOMWindow* aWin, uint32_t* aId)
   nsCOMPtr<nsIDOMWindow> rootWin(do_GetInterface(rootItem));
   NS_ENSURE_TRUE(rootWin, NS_ERROR_FAILURE);
   rootWin->GetTop(getter_AddRefs(window));
+  mozilla::dom::AutoNoJSAPI nojsapi;
   nsCOMPtr<nsIDOMWindowUtils> utils = do_GetInterface(window);
   uint64_t OuterWindowID = 0;
   utils->GetOuterWindowID(&OuterWindowID);

diff --git a/embedding/embedlite/utils/TabChildHelper.cpp b/embedding/embedlite/utils/TabChildHelper.cpp
@@ -228,6 +228,8 @@ TabChildHelper::Observe(nsISupports* aSubject,
     nsCOMPtr<nsIDocument> doc(GetDocument());
 
     if (SameCOMIdentity(subject, doc)) {
+      mozilla::dom::AutoNoJSAPI nojsapi;
+
       nsCOMPtr<nsIDOMWindowUtils> utils(GetDOMWindowUtils());
 
       mContentDocumentIsDisplayed = true;
@@ -244,6 +246,7 @@ TabChildHelper::Observe(nsISupports* aSubject,
         // until we we get an inner size.
         if (HasValidInnerSize()) {
           InitializeRootMetrics();
+
           utils->SetResolution(mLastRootMetrics.mResolution.scale,
                                mLastRootMetrics.mResolution.scale);
           HandlePossibleViewportChange();

diff --git a/embedding/embedlite/utils/WebBrowserChrome.cpp b/embedding/embedlite/utils/WebBrowserChrome.cpp
@@ -174,6 +174,7 @@ WebBrowserChrome::OnProgressChange(nsIWebProgress* progress, nsIRequest* request
   }
 
   nsCOMPtr<nsPIDOMWindow> window = do_GetInterface(mWebBrowser);
+  mozilla::dom::AutoNoJSAPI nojsapi;
   nsCOMPtr<nsIDOMWindowUtils> utils = do_GetInterface(window);
   if (!utils) {
     NS_WARNING("window Utils are null");
@@ -202,6 +203,7 @@ WebBrowserChrome::OnStateChange(nsIWebProgress* progress, nsIRequest* request,
   }
 
   nsCOMPtr<nsPIDOMWindow> window = do_GetInterface(mWebBrowser);
+  mozilla::dom::AutoNoJSAPI nojsapi;
   nsCOMPtr<nsIDOMWindowUtils> utils = do_GetInterface(window);
   if (!utils) {
     NS_WARNING("window Utils are null");
@@ -284,6 +286,7 @@ WebBrowserChrome::OnLocationChange(nsIWebProgress* aWebProgress,
   ctDoc->GetCharacterSet(charset);
 
   nsCOMPtr<nsPIDOMWindow> window = do_GetInterface(mWebBrowser);
+  mozilla::dom::AutoNoJSAPI nojsapi;
   nsCOMPtr<nsIDOMWindowUtils> utils = do_GetInterface(window);
   if (!utils) {
     NS_WARNING("window Utils are null");
@@ -339,6 +342,7 @@ WebBrowserChrome::OnSecurityChange(nsIWebProgress* aWebProgress,
   }
 
   nsCOMPtr<nsPIDOMWindow> window = do_GetInterface(mWebBrowser);
+  mozilla::dom::AutoNoJSAPI nojsapi;
   nsCOMPtr<nsIDOMWindowUtils> utils = do_GetInterface(window);
   if (!utils) {
     NS_WARNING("window Utils are null");
@@ -382,6 +386,7 @@ WebBrowserChrome::HandleEvent(nsIDOMEvent* aEvent)
 
   nsCOMPtr<nsIDOMWindow> docWin = do_GetInterface(mWebBrowser);
   nsCOMPtr<nsPIDOMWindow> window = do_GetInterface(mWebBrowser);
+  mozilla::dom::AutoNoJSAPI nojsapi;
   nsCOMPtr<nsIDOMWindowUtils> utils = do_GetInterface(window);
   if (type.EqualsLiteral(MOZ_MozScrolledAreaChanged)) {
     nsCOMPtr<nsIDOMEventTarget> origTarget;
@@ -445,6 +450,7 @@ WebBrowserChrome::HandleEvent(nsIDOMEvent* aEvent)
 nsIntPoint
 WebBrowserChrome::GetScrollOffset(nsIDOMWindow* aWindow)
 {
+  mozilla::dom::AutoNoJSAPI nojsapi;
   nsCOMPtr<nsIDOMWindowUtils> utils = do_GetInterface(aWindow);
   nsIntPoint scrollOffset;
   utils->GetScrollXY(PR_FALSE, &scrollOffset.x, &scrollOffset.y);