Bug 1524683 - Remove nsIFrameLoaderOwner; r=nika
authorKyle Machulis <kyle@nonpolynomial.com>
Fri, 15 Feb 2019 22:20:55 +0000
changeset 459623 51e0522e1ee97c0c3f3fc43e0f46fd62bd224e07
parent 459622 a11e3f4d19db673bc84fcc386d992139c5354867
child 459624 9696fa097cd0ac3e27b3a34dff1677970ea7b3ea
push id35563
push userccoroiu@mozilla.com
push dateSat, 16 Feb 2019 09:36:04 +0000
treeherdermozilla-central@1cfd69d05aa1 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersnika
bugs1524683
milestone67.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1524683 - Remove nsIFrameLoaderOwner; r=nika Depends on D19729 Differential Revision: https://phabricator.services.mozilla.com/D19730
dom/base/moz.build
dom/base/nsIFrameLoaderOwner.idl
dom/html/test/test_bug389797.html
--- a/dom/base/moz.build
+++ b/dom/base/moz.build
@@ -13,17 +13,16 @@ with Files("**"):
 TEST_DIRS += ['test']
 
 XPIDL_SOURCES += [
     'mozIDOMWindow.idl',
     'nsIContentPolicy.idl',
     'nsIDocumentEncoder.idl',
     'nsIDOMRequestService.idl',
     'nsIDroppedLinkHandler.idl',
-    'nsIFrameLoaderOwner.idl',
     'nsIImageLoadingContent.idl',
     'nsIMessageManager.idl',
     'nsIObjectLoadingContent.idl',
     'nsIRemoteWindowContext.idl',
     'nsIScriptableContentIterator.idl',
     'nsIScriptChannel.idl',
     'nsISelectionController.idl',
     'nsISelectionDisplay.idl',
deleted file mode 100644
--- a/dom/base/nsIFrameLoaderOwner.idl
+++ /dev/null
@@ -1,37 +0,0 @@
-/* -*- Mode: IDL; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-#include "nsISupports.idl"
-
-interface nsFrameLoader;
-
-%{C++
-class nsFrameLoader;
-%}
-
-native alreadyAddRefed_nsFrameLoader(already_AddRefed<nsFrameLoader>);
-
-// We define a "native" type for nsFrameLoader so that the rust xpidl
-// codegen doesn't try to do anything with it.
-[ptr] native nativeFrameLoader(nsFrameLoader);
-
-[scriptable, builtinclass, uuid(adc1b3ba-8deb-4943-8045-e6de0044f2ce)]
-interface nsIFrameLoaderOwner : nsISupports
-{
-  /**
-   * The frame loader owned by this nsIFrameLoaderOwner
-   */
-  [noscript, notxpcom] alreadyAddRefed_nsFrameLoader GetFrameLoader();
-
-  /**
-   * This method is used internally by SwapFrameLoaders to set the frame loader
-   * on the target nsFrameLoader.
-   *
-   * Avoid using this method outside of that context, and instead prefer using
-   * SwapFrameLoaders.
-   */
-  [noscript, notxpcom] void
-  internalSetFrameLoader(in nativeFrameLoader aNewFrameLoader);
-};
--- a/dom/html/test/test_bug389797.html
+++ b/dom/html/test/test_bug389797.html
@@ -46,17 +46,17 @@ function HTML_TAG(aTagName, aImplClass) 
     for (i = 0; i < arguments[3].length; ++i) {
       interfacesNonClassinfo[aTagName].push(arguments[3][i]);
     }
   }
 }
 
 const objectIfaces = [
     "imgINotificationObserver", "nsIRequestObserver", "nsIStreamListener",
-    "nsIFrameLoaderOwner", "nsIObjectLoadingContent", "nsIChannelEventSink"
+    "nsIObjectLoadingContent", "nsIChannelEventSink"
   ];
 
 var objectIfaces2 = [];
 for (var iface of objectIfaces) {
   objectIfaces2.push(iface);
 }
 objectIfaces2.push("nsIImageLoadingContent");
 
@@ -114,32 +114,31 @@ HTML_TAG("dt", "");
 HTML_TAG("em", "");
 HTML_TAG("embed", "Embed", [], objectIfaces);
 HTML_TAG("fieldset", "FieldSet");
 HTML_TAG("figcaption", "")
 HTML_TAG("figure", "")
 HTML_TAG("font", "Font");
 HTML_TAG("footer", "")
 HTML_TAG("form", "Form", [], [ "nsIWebProgressListener" ]);
-HTML_TAG("frame", "Frame", [ "nsIDOMMozBrowserFrame" ], [ "nsIFrameLoaderOwner" ]);
+HTML_TAG("frame", "Frame", [ "nsIDOMMozBrowserFrame" ]);
 HTML_TAG("frameset", "FrameSet");
 HTML_TAG("h1", "Heading");
 HTML_TAG("h2", "Heading");
 HTML_TAG("h3", "Heading");
 HTML_TAG("h4", "Heading");
 HTML_TAG("h5", "Heading");
 HTML_TAG("h6", "Heading");
 HTML_TAG("head", "Head");
 HTML_TAG("header", "")
 HTML_TAG("hgroup", "")
 HTML_TAG("hr", "HR");
 HTML_TAG("html", "Html");
 HTML_TAG("i", "");
-HTML_TAG("iframe", "IFrame", [ "nsIDOMMozBrowserFrame" ],
-                             [ "nsIFrameLoaderOwner" ]);
+HTML_TAG("iframe", "IFrame", [ "nsIDOMMozBrowserFrame" ]);
 HTML_TAG("image", "");
 HTML_TAG("img", "Image", [ "nsIImageLoadingContent" ], []);
 HTML_TAG("input", "Input", [], [ "imgINotificationObserver",
                                  "nsIImageLoadingContent" ]);
 HTML_TAG("ins", "Mod");
 HTML_TAG("kbd", "");
 HTML_TAG("keygen", "Span");
 HTML_TAG("label", "Label");