Merge pull request #998 from MoonchildProductions/master

Merge master into Sync-weave

6 files changed, 7 insertions, 115 deletions

diff --git a/dom/webidl/AddonEvent.webidl b/dom/webidl/AddonEvent.webidl
deleted file mode 100644
index 235f81ec2..000000000
--- a/dom/webidl/AddonEvent.webidl
+++ /dev/null
@@ -1,12 +0,0 @@
-[ Func="mozilla::AddonManagerWebAPI::IsAPIEnabled",
-  Constructor(DOMString type, AddonEventInit eventInitDict)]
-interface AddonEvent : Event {
-  readonly attribute DOMString id;
-  readonly attribute boolean needsRestart;
-};
-
-dictionary AddonEventInit : EventInit {
-  required DOMString id;
-  required boolean needsRestart;
-};
-
diff --git a/dom/webidl/AddonManager.webidl b/dom/webidl/AddonManager.webidl
deleted file mode 100644
index 02c7953e6..000000000
--- a/dom/webidl/AddonManager.webidl
+++ /dev/null
@@ -1,91 +0,0 @@
-/* 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/.
- */
-
-/* We need a JSImplementation but cannot get one without a contract ID.
-   Since Addon and AddonInstall are only ever created from JS they don't need
-   real contract IDs. */
-[ChromeOnly, JSImplementation="dummy"]
-interface Addon {
-  // The add-on's ID.
-  readonly attribute DOMString id;
-  // The add-on's version.
-  readonly attribute DOMString version;
-  // The add-on's type (extension, theme, etc.).
-  readonly attribute DOMString type;
-  // The add-on's name in the current locale.
-  readonly attribute DOMString name;
-  // The add-on's description in the current locale.
-  readonly attribute DOMString description;
-  // If the user has enabled this add-on, note that it still may not be running
-  // depending on whether enabling requires a restart or if the add-on is
-  // incompatible in some way.
-  readonly attribute boolean isEnabled;
-  // If the add-on is currently active in the browser.
-  readonly attribute boolean isActive;
-  // If the add-on may be uninstalled
-  readonly attribute boolean canUninstall;
-
-  Promise<boolean> uninstall();
-  Promise<void> setEnabled(boolean value);
-};
-
-[ChromeOnly, JSImplementation="dummy"]
-interface AddonInstall : EventTarget {
-  // One of the STATE_* symbols from AddonManager.jsm
-  readonly attribute DOMString state;
-  // One of the ERROR_* symbols from AddonManager.jsm, or null
-  readonly attribute DOMString? error;
-  // How many bytes have been downloaded
-  readonly attribute long long progress;
-  // How many total bytes will need to be downloaded or -1 if unknown
-  readonly attribute long long maxProgress;
-
-  Promise<void> install();
-  Promise<void> cancel();
-};
-
-dictionary addonInstallOptions {
-  required DOMString url;
-  // If a non-empty string is passed for "hash", it is used to verify the
-  // checksum of the downloaded XPI before installing.  If is omitted or if
-  // it is null or empty string, no checksum verification is performed.
-  DOMString? hash = null;
-};
-
-[HeaderFile="mozilla/AddonManagerWebAPI.h",
- Func="mozilla::AddonManagerWebAPI::IsAPIEnabled",
- NavigatorProperty="mozAddonManager",
- JSImplementation="@mozilla.org/addon-web-api/manager;1"]
-interface AddonManager : EventTarget {
-  /**
-   * Gets information about an add-on
-   *
-   * @param  id
-   *         The ID of the add-on to test for.
-   * @return A promise. It will resolve to an Addon if the add-on is installed.
-   */
-  Promise<Addon> getAddonByID(DOMString id);
-
-  /**
-   * Creates an AddonInstall object for a given URL.
-   *
-   * @param options
-   *        Only one supported option: 'url', the URL of the addon to install.
-   * @return A promise that resolves to an instance of AddonInstall.
-   */
-  Promise<AddonInstall> createInstall(optional addonInstallOptions options);
-
-  /* Hooks for managing event listeners */
-  [ChromeOnly]
-  void eventListenerWasAdded(DOMString type);
-  [ChromeOnly]
-  void eventListenerWasRemoved(DOMString type);
-};
-
-[ChromeOnly,Exposed=System,HeaderFile="mozilla/AddonManagerWebAPI.h"]
-interface AddonManagerPermissions {
-  static boolean isHostPermitted(DOMString host);
-};
-
diff --git a/dom/webidl/AudioContext.webidl b/dom/webidl/AudioContext.webidl
index c2f65abaf..9aa3d5567 100644
--- a/dom/webidl/AudioContext.webidl
+++ b/dom/webidl/AudioContext.webidl
@@ -24,7 +24,6 @@ dictionary PeriodicWaveConstraints {
 };
 
 [Constructor,
- Constructor(AudioChannel audioChannelType),
  Pref="dom.webaudio.enabled"]
 interface AudioContext : EventTarget {
 
diff --git a/dom/webidl/Element.webidl b/dom/webidl/Element.webidl
index 97eb4ffe0..cf17523a5 100644
--- a/dom/webidl/Element.webidl
+++ b/dom/webidl/Element.webidl
@@ -164,9 +164,10 @@ interface Element : Node {
 };
 
 // http://dev.w3.org/csswg/cssom-view/
-enum ScrollLogicalPosition { "start", "end" };
+enum ScrollLogicalPosition { "start", "center", "end", "nearest" };
 dictionary ScrollIntoViewOptions : ScrollOptions {
   ScrollLogicalPosition block = "start";
+  ScrollLogicalPosition inline = "nearest";
 };
 
 // http://dev.w3.org/csswg/cssom-view/#extensions-to-the-element-interface
@@ -175,8 +176,7 @@ partial interface Element {
   DOMRect getBoundingClientRect();
 
   // scrolling
-  void scrollIntoView(boolean top);
-  void scrollIntoView(optional ScrollIntoViewOptions options);
+  void scrollIntoView(optional (boolean or ScrollIntoViewOptions) arg);
   // None of the CSSOM attributes are [Pure], because they flush
            attribute long scrollTop;   // scroll on setting
            attribute long scrollLeft;  // scroll on setting
diff --git a/dom/webidl/IntersectionObserver.webidl b/dom/webidl/IntersectionObserver.webidl
index dbe8f428d..83200d950 100644
--- a/dom/webidl/IntersectionObserver.webidl
+++ b/dom/webidl/IntersectionObserver.webidl
@@ -7,7 +7,7 @@
  * https://wicg.github.io/IntersectionObserver/
  */
 
-[ProbablyShortLivingObject, Pref="dom.IntersectionObserver.enabled"]
+[ProbablyShortLivingObject, Pref="dom.intersectionObserver.enabled"]
 interface IntersectionObserverEntry {
   [Constant]
   readonly attribute DOMHighResTimeStamp time;
@@ -18,6 +18,8 @@ interface IntersectionObserverEntry {
   [Constant]
   readonly attribute DOMRectReadOnly intersectionRect;
   [Constant]
+  readonly attribute boolean isIntersecting;
+  [Constant]
   readonly attribute double intersectionRatio;
   [Constant]
   readonly attribute Element target;
@@ -25,7 +27,7 @@ interface IntersectionObserverEntry {
 
 [Constructor(IntersectionCallback intersectionCallback,
              optional IntersectionObserverInit options),
- Pref="dom.IntersectionObserver.enabled"]
+ Pref="dom.intersectionObserver.enabled"]
 interface IntersectionObserver {
   [Constant]
   readonly attribute Element? root;
diff --git a/dom/webidl/moz.build b/dom/webidl/moz.build
index 06fea2f20..aae7e479c 100644
--- a/dom/webidl/moz.build
+++ b/dom/webidl/moz.build
@@ -591,9 +591,6 @@ WEBIDL_FILES = [
     'XULElement.webidl',
 ]
 
-if CONFIG['MOZ_WEBEXTENSIONS']:
-  WEBIDL_FILES += ['AddonManager.webidl']
-
 if CONFIG['MOZ_AUDIO_CHANNEL_MANAGER']:
     WEBIDL_FILES += [
         'AudioChannelManager.webidl',
@@ -722,9 +719,6 @@ GENERATED_EVENTS_WEBIDL_FILES = [
     'WebGLContextEvent.webidl',
 ]
 
-if CONFIG['MOZ_WEBEXTENSIONS']:
-  GENERATED_EVENTS_WEBIDL_FILES += ['AddonEvent.webidl']
-
 if CONFIG['MOZ_WEBRTC']:
     GENERATED_EVENTS_WEBIDL_FILES += [
         'RTCDataChannelEvent.webidl',