Bug 1491846 GetFrameLoader inside child objects vtbls could not be re…

…solved by linker. It looks like a clang bug, but requires closer look. I worked around it by having explicit forwards. r=smaug Differential Revision: https://phabricator.services.mozilla.com/D6051 --HG-- extra : moz-landing-system : lando
dothq · Sep 18, 2018 · c9db005 · c9db005
1 parent 2a646ae
commit c9db005
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 0 deletions.
diff --git a/dom/html/HTMLEmbedElement.h b/dom/html/HTMLEmbedElement.h
@@ -127,6 +127,8 @@ class HTMLEmbedElement final : public nsGenericHTMLElement
    */
   void StartObjectLoad(bool aNotify, bool aForceLoad);
 
+  NS_FORWARD_NSIFRAMELOADEROWNER(nsObjectLoadingContent::)
+
 protected:
   // Override for nsImageLoadingContent.
   nsIContent* AsContent() override { return this; }

diff --git a/dom/html/HTMLFrameElement.h b/dom/html/HTMLFrameElement.h
@@ -112,6 +112,8 @@ class HTMLFrameElement final : public nsGenericHTMLFrameElement
   using nsGenericHTMLFrameElement::GetContentDocument;
   using nsGenericHTMLFrameElement::GetContentWindow;
 
+  NS_FORWARD_NSIFRAMELOADEROWNER(nsGenericHTMLFrameElement::)
+
 protected:
   virtual ~HTMLFrameElement();
 

diff --git a/dom/html/HTMLObjectElement.h b/dom/html/HTMLObjectElement.h
@@ -243,6 +243,8 @@ class HTMLObjectElement final : public nsGenericHTMLFormElement
    */
   void StartObjectLoad(bool aNotify, bool aForceLoad);
 
+  NS_FORWARD_NSIFRAMELOADEROWNER(nsObjectLoadingContent::)
+
 protected:
   // Override for nsImageLoadingContent.
   nsIContent* AsContent() override { return this; }