1 files changed, 6 insertions, 45 deletions

diff --git a/dom/html/nsGenericHTMLFrameElement.cpp b/dom/html/nsGenericHTMLFrameElement.cpp
index ae2c4dcce5..92591d7b72 100644
--- a/dom/html/nsGenericHTMLFrameElement.cpp
+++ b/dom/html/nsGenericHTMLFrameElement.cpp
@@ -35,7 +35,6 @@ NS_IMPL_CYCLE_COLLECTION_CLASS(nsGenericHTMLFrameElement)
 NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN_INHERITED(nsGenericHTMLFrameElement,
                                                   nsGenericHTMLElement)
   NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mFrameLoader)
-  NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mBrowserElementAPI)
 NS_IMPL_CYCLE_COLLECTION_TRAVERSE_END
 
 NS_IMPL_CYCLE_COLLECTION_UNLINK_BEGIN_INHERITED(nsGenericHTMLFrameElement,
@@ -45,22 +44,12 @@ NS_IMPL_CYCLE_COLLECTION_UNLINK_BEGIN_INHERITED(nsGenericHTMLFrameElement,
   }
 
   NS_IMPL_CYCLE_COLLECTION_UNLINK(mFrameLoader)
-  NS_IMPL_CYCLE_COLLECTION_UNLINK(mBrowserElementAPI)
 NS_IMPL_CYCLE_COLLECTION_UNLINK_END
 
-NS_IMPL_ISUPPORTS_CYCLE_COLLECTION_INHERITED(
-    nsGenericHTMLFrameElement, nsGenericHTMLElement, nsFrameLoaderOwner,
-    nsIDOMMozBrowserFrame, nsIMozBrowserFrame, nsGenericHTMLFrameElement)
-
-NS_IMETHODIMP
-nsGenericHTMLFrameElement::GetMozbrowser(bool* aValue) {
-  *aValue = GetBoolAttr(nsGkAtoms::mozbrowser);
-  return NS_OK;
-}
-NS_IMETHODIMP
-nsGenericHTMLFrameElement::SetMozbrowser(bool aValue) {
-  return SetBoolAttr(nsGkAtoms::mozbrowser, aValue);
-}
+NS_IMPL_ISUPPORTS_CYCLE_COLLECTION_INHERITED(nsGenericHTMLFrameElement,
+                                             nsGenericHTMLElement,
+                                             nsFrameLoaderOwner,
+                                             nsGenericHTMLFrameElement)
 
 int32_t nsGenericHTMLFrameElement::TabIndexDefault() { return 0; }
 
@@ -202,7 +191,7 @@ nsresult nsGenericHTMLFrameElement::BindToTree(BindContext& aContext,
   return rv;
 }
 
-void nsGenericHTMLFrameElement::UnbindFromTree(bool aNullParent) {
+void nsGenericHTMLFrameElement::UnbindFromTree(UnbindContext& aContext) {
   if (mFrameLoader) {
     // This iframe is being taken out of the document, destroy the
     // iframe's frame loader (doing that will tear down the window in
@@ -214,7 +203,7 @@ void nsGenericHTMLFrameElement::UnbindFromTree(bool aNullParent) {
     mFrameLoader = nullptr;
   }
 
-  nsGenericHTMLElement::UnbindFromTree(aNullParent);
+  nsGenericHTMLElement::UnbindFromTree(aContext);
 }
 
 /* static */
@@ -260,9 +249,6 @@ void nsGenericHTMLFrameElement::AfterSetAttr(
           child->SendScrollbarPreferenceChanged(pref);
         }
       }
-    } else if (aName == nsGkAtoms::mozbrowser) {
-      mReallyIsBrowser = !!aValue && XRE_IsParentProcess() &&
-                         NodePrincipal()->IsSystemPrincipal();
     }
   }
 
@@ -336,28 +322,3 @@ bool nsGenericHTMLFrameElement::IsHTMLFocusable(bool aWithMouse,
   *aIsFocusable = true;
   return false;
 }
-
-/**
- * Return true if this frame element really is a mozbrowser.  (It
- * needs to have the right attributes, and its creator must have the right
- * permissions.)
- */
-/* [infallible] */
-nsresult nsGenericHTMLFrameElement::GetReallyIsBrowser(bool* aOut) {
-  *aOut = mReallyIsBrowser;
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsGenericHTMLFrameElement::InitializeBrowserAPI() {
-  MOZ_ASSERT(mFrameLoader);
-  InitBrowserElementAPI();
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsGenericHTMLFrameElement::DestroyBrowserFrameScripts() {
-  MOZ_ASSERT(mFrameLoader);
-  DestroyBrowserElementFrameScripts();
-  return NS_OK;
-}