Bug 1245306: Devirtualize RefreshCompartmentPrincipal. r=smaug

iaxat · Feb 3, 2016 · e1d9c64 · e1d9c64
1 parent 369abbd
commit e1d9c64
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 10 deletions.
diff --git a/dom/base/nsDocument.cpp b/dom/base/nsDocument.cpp
@@ -2272,7 +2272,7 @@ nsDocument::ResetToURI(nsIURI *aURI, nsILoadGroup *aLoadGroup,
 
   // Refresh the principal on the compartment.
   if (nsPIDOMWindowInner* win = GetInnerWindow()) {
-    win->RefreshCompartmentPrincipal();
+    nsGlobalWindow::Cast(win)->RefreshCompartmentPrincipal();
   }
 }
 

diff --git a/dom/base/nsGlobalWindow.h b/dom/base/nsGlobalWindow.h
@@ -480,7 +480,7 @@ class nsGlobalWindow : public mozilla::dom::EventTarget,
   bool DispatchResizeEvent(const mozilla::CSSIntSize& aSize);
 
   // Inner windows only.
-  virtual void RefreshCompartmentPrincipal() override;
+  void RefreshCompartmentPrincipal();
 
   // For accessing protected field mFullScreen
   friend class FullscreenTransitionTask;

diff --git a/dom/base/nsPIDOMWindow.h b/dom/base/nsPIDOMWindow.h
@@ -507,14 +507,6 @@ class nsPIDOMWindow : public T
    */
   virtual bool DispatchCustomEvent(const nsAString& aEventName) = 0;
 
-  /**
-   * Call when the document principal may have changed and the compartment
-   * principal needs to be updated.
-   *
-   * Inner windows only.
-   */
-  virtual void RefreshCompartmentPrincipal() = 0;
-
   /**
    * Like nsIDOMWindow::Open, except that we don't navigate to the given URL.
    *