Backed out changeset d045286cff6e (original backout of 8 changesets) for not working right a=backout

dom/html/nsGenericHTMLFrameElement.h

@@ -9,14 +9,15 @@
 #define nsGenericHTMLFrameElement_h
 
 #include "mozilla/Attributes.h"
+#include "mozilla/ErrorResult.h"
+#include "mozilla/dom/nsBrowserElement.h"
+
 #include "nsElementFrameLoaderOwner.h"
+#include "nsFrameLoader.h"
 #include "nsGenericHTMLElement.h"
+#include "nsIDOMEventListener.h"
 #include "nsIFrameLoader.h"
 #include "nsIMozBrowserFrame.h"
-#include "nsIDOMEventListener.h"
-#include "mozilla/ErrorResult.h"
-
-#include "nsFrameLoader.h"
 
 class nsXULElement;
 
@@ -25,6 +26,7 @@ class nsXULElement;
  */
 class nsGenericHTMLFrameElement : public nsGenericHTMLElement,
                                   public nsElementFrameLoaderOwner,
+                                  public mozilla::nsBrowserElement,
                                   public nsIMozBrowserFrame
 {
 public:
@@ -32,6 +34,7 @@ public:
                             mozilla::dom::FromParser aFromParser)
     : nsGenericHTMLElement(aNodeInfo)
     , nsElementFrameLoaderOwner(aFromParser)
+    , nsBrowserElement()
   {
   }
 
@@ -71,6 +74,19 @@ public:
 
   static bool BrowserFramesEnabled();
 
+  /**
+   * nsIFrameLoaderOwner defines two GetFrameLoader() overloads. One
+   * is XPCOM style interface, the other one is C++ only.  "using" pulls
+   * them both in, now GetFrameLoader() is ambiguous because
+   * nsBrowserElement also has GetFrameLoader(). Explicit redefine
+   * GetFrameLoader() to choose nsElementFrameLoaderOwner::GetFrameLoader()
+   */
+  using nsElementFrameLoaderOwner::GetFrameLoader;
+  NS_IMETHOD_(already_AddRefed<nsFrameLoader>) GetFrameLoader() MOZ_OVERRIDE
+  {
+    return nsElementFrameLoaderOwner::GetFrameLoader();
+  }
+
   /**
    * Helper method to map a HTML 'scrolling' attribute value to a nsIScrollable
    * enum value.  scrolling="no" (and its synonyms) maps to