Adding upstream version 125.0.1.upstream/125.0.1

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 3 insertions, 22 deletions

diff --git a/dom/html/nsGenericHTMLFrameElement.h b/dom/html/nsGenericHTMLFrameElement.h
index 4ac6401721..587e861b88 100644
--- a/dom/html/nsGenericHTMLFrameElement.h
+++ b/dom/html/nsGenericHTMLFrameElement.h
@@ -8,12 +8,10 @@
 #define nsGenericHTMLFrameElement_h
 
 #include "mozilla/Attributes.h"
-#include "mozilla/dom/nsBrowserElement.h"
 
 #include "nsFrameLoader.h"
 #include "nsFrameLoaderOwner.h"
 #include "nsGenericHTMLElement.h"
-#include "nsIMozBrowserFrame.h"
 
 namespace mozilla {
 class ErrorResult;
@@ -38,39 +36,30 @@ class XULFrameElement;
  * A helper class for frame elements
  */
 class nsGenericHTMLFrameElement : public nsGenericHTMLElement,
-                                  public nsFrameLoaderOwner,
-                                  public mozilla::nsBrowserElement,
-                                  public nsIMozBrowserFrame {
+                                  public nsFrameLoaderOwner {
  public:
   nsGenericHTMLFrameElement(
       already_AddRefed<mozilla::dom::NodeInfo>&& aNodeInfo,
       mozilla::dom::FromParser aFromParser)
       : nsGenericHTMLElement(std::move(aNodeInfo)),
         mSrcLoadHappened(false),
-        mNetworkCreated(aFromParser == mozilla::dom::FROM_PARSER_NETWORK),
-        mBrowserFrameListenersRegistered(false),
-        mReallyIsBrowser(false) {}
+        mNetworkCreated(aFromParser == mozilla::dom::FROM_PARSER_NETWORK) {}
 
   NS_DECL_ISUPPORTS_INHERITED
 
-  NS_DECL_NSIDOMMOZBROWSERFRAME
-  NS_DECL_NSIMOZBROWSERFRAME
-
   NS_DECLARE_STATIC_IID_ACCESSOR(NS_GENERICHTMLFRAMEELEMENT_IID)
 
   // nsIContent
   virtual bool IsHTMLFocusable(bool aWithMouse, bool* aIsFocusable,
                                int32_t* aTabIndex) override;
   virtual nsresult BindToTree(BindContext&, nsINode& aParent) override;
-  virtual void UnbindFromTree(bool aNullParent = true) override;
+  virtual void UnbindFromTree(UnbindContext&) override;
   virtual void DestroyContent() override;
 
   nsresult CopyInnerTo(mozilla::dom::Element* aDest);
 
   virtual int32_t TabIndexDefault() override;
 
-  virtual nsIMozBrowserFrame* GetAsMozBrowserFrame() override { return this; }
-
   NS_DECL_CYCLE_COLLECTION_CLASS_INHERITED(nsGenericHTMLFrameElement,
                                            nsGenericHTMLElement)
 
@@ -94,11 +83,6 @@ class nsGenericHTMLFrameElement : public nsGenericHTMLElement,
     return mSrcTriggeringPrincipal;
   }
 
-  // Needed for nsBrowserElement
-  already_AddRefed<nsFrameLoader> GetFrameLoader() override {
-    return nsFrameLoaderOwner::GetFrameLoader();
-  }
-
  protected:
   virtual ~nsGenericHTMLFrameElement();
 
@@ -132,9 +116,6 @@ class nsGenericHTMLFrameElement : public nsGenericHTMLElement,
    */
   bool mNetworkCreated;
 
-  bool mBrowserFrameListenersRegistered;
-  bool mReallyIsBrowser;
-
   // This flag is only used by <iframe>. See HTMLIFrameElement::
   // FullscreenFlag() for details. It is placed here so that we
   // do not bloat any struct.