Bug 964192 - Remove the required argument to captureEvents/releaseEvents; r=bz
authorMs2ger <ms2ger@gmail.com>
Sun, 09 Feb 2014 09:04:39 +0100
changeset 167731 255b59b2daa0ad5a44e185d405d922278bba24f5
parent 167730 5f286819d8b151e5d14efc0abcf40fc0246d64d6
child 167732 81396e0b611a5ea18efd9947f9ce814b7fafabda
push id26182
push userMs2ger@gmail.com
push dateSun, 09 Feb 2014 08:05:03 +0000
treeherdermozilla-central@c8cd1f6b6d2d [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbz
bugs964192
milestone30.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 964192 - Remove the required argument to captureEvents/releaseEvents; r=bz
content/html/document/src/nsHTMLDocument.cpp
dom/base/nsGlobalWindow.cpp
dom/interfaces/base/nsIDOMJSWindow.idl
dom/interfaces/html/nsIDOMHTMLDocument.idl
dom/webidl/HTMLDocument.webidl
dom/webidl/Window.webidl
--- a/content/html/document/src/nsHTMLDocument.cpp
+++ b/content/html/document/src/nsHTMLDocument.cpp
@@ -2173,24 +2173,24 @@ nsHTMLDocument::GetSelection(ErrorResult
 
   nsCOMPtr<nsISelection> sel;
   rv = window->GetSelection(getter_AddRefs(sel));
   nsRefPtr<Selection> selection = static_cast<Selection*>(sel.get());
   return selection.forget();
 }
 
 NS_IMETHODIMP
-nsHTMLDocument::CaptureEvents(int32_t aEventFlags)
+nsHTMLDocument::CaptureEvents()
 {
   WarnOnceAbout(nsIDocument::eUseOfCaptureEvents);
   return NS_OK;
 }
 
 NS_IMETHODIMP
-nsHTMLDocument::ReleaseEvents(int32_t aEventFlags)
+nsHTMLDocument::ReleaseEvents()
 {
   WarnOnceAbout(nsIDocument::eUseOfReleaseEvents);
   return NS_OK;
 }
 
 // Mapped to document.embeds for NS4 compatibility
 NS_IMETHODIMP
 nsHTMLDocument::GetPlugins(nsIDOMHTMLCollection** aPlugins)
--- a/dom/base/nsGlobalWindow.cpp
+++ b/dom/base/nsGlobalWindow.cpp
@@ -7024,27 +7024,27 @@ NS_IMETHODIMP
 nsGlobalWindow::SetResizable(bool aResizable)
 {
   // nop
 
   return NS_OK;
 }
 
 NS_IMETHODIMP
-nsGlobalWindow::CaptureEvents(int32_t aEventFlags)
+nsGlobalWindow::CaptureEvents()
 {
   if (mDoc) {
     mDoc->WarnOnceAbout(nsIDocument::eUseOfCaptureEvents);
   }
 
   return NS_OK;
 }
 
 NS_IMETHODIMP
-nsGlobalWindow::ReleaseEvents(int32_t aEventFlags)
+nsGlobalWindow::ReleaseEvents()
 {
   if (mDoc) {
     mDoc->WarnOnceAbout(nsIDocument::eUseOfReleaseEvents);
   }
 
   return NS_OK;
 }
 
--- a/dom/interfaces/base/nsIDOMJSWindow.idl
+++ b/dom/interfaces/base/nsIDOMJSWindow.idl
@@ -1,16 +1,16 @@
 /* -*- 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 "domstubs.idl"
 
-[scriptable, uuid(5a9689e8-5822-4dd5-b231-609b8d0260ab)]
+[scriptable, uuid(4237c376-d637-4b6e-9f8a-1da57e867834)]
 interface nsIDOMJSWindow : nsISupports
 {
   void                      dump(in DOMString str);
 
   /**
    * These methods take typeless arguments and optional arguments, the
    * first argument is either a function or a string, the second
    * argument must be a number (ms) and the rest of the arguments (2
@@ -32,18 +32,18 @@ interface nsIDOMJSWindow : nsISupports
    * its implementation is a no-op
    */
   void                      setResizable(in boolean resizable);
 
   /**
    * @deprecated These are old Netscape 4 methods. Do not use,
    *             the implementation is no-op.
    */
-  void                      captureEvents(in long eventFlags);
-  void                      releaseEvents(in long eventFlags);
+  void                      captureEvents();
+  void                      releaseEvents();
 
   /**
    * This is the scriptable version of nsIDOMWindow::open()
    * that takes 3 optional arguments. Its binary name is OpenJS to
    * avoid colliding with nsIDOMWindow::open(), which has the
    * same signature. The reason we can't have that collision is that
    * the implementation needs to know whether it was called from JS or
    * not.
--- a/dom/interfaces/html/nsIDOMHTMLDocument.idl
+++ b/dom/interfaces/html/nsIDOMHTMLDocument.idl
@@ -8,17 +8,17 @@
 /**
  * The nsIDOMHTMLDocument interface is the interface to a [X]HTML
  * document object.
  *
  * @see <http://www.whatwg.org/html/>
  */
 interface nsISelection;
 
-[scriptable, uuid(a3efb7eb-ae02-447b-99a5-bebca100afbd)]
+[scriptable, uuid(7147c7ea-393e-454f-8de8-e356861bd9a7)]
 interface nsIDOMHTMLDocument : nsIDOMDocument
 {
            attribute DOMString            domain;
            attribute DOMString            cookie;
 
   readonly attribute nsIDOMHTMLHeadElement head;
            attribute nsIDOMHTMLElement    body;
 
@@ -85,16 +85,16 @@ interface nsIDOMHTMLDocument : nsIDOMDoc
 
   void                      clear();
 
 
   // DOM Range
   nsISelection                getSelection();
 
 
-  // Mozilla extensions
+  // More obsolete APIs
   /**
    * @deprecated These are old Netscape 4 methods. Do not use,
    *             the implementation is no-op.
    */
-  void                      captureEvents(in long eventFlags);
-  void                      releaseEvents(in long eventFlags);
+  void                      captureEvents();
+  void                      releaseEvents();
 };
--- a/dom/webidl/HTMLDocument.webidl
+++ b/dom/webidl/HTMLDocument.webidl
@@ -77,11 +77,11 @@ interface HTMLDocument : Document {
 
   // https://dvcs.w3.org/hg/editing/raw-file/tip/editing.html#selections
   [Throws]
   Selection? getSelection();
 
   // @deprecated These are old Netscape 4 methods. Do not use,
   //             the implementation is no-op.
   // XXXbz do we actually need these anymore?
-  void                      captureEvents(long eventFlags);
-  void                      releaseEvents(long eventFlags);
+  void                      captureEvents();
+  void                      releaseEvents();
 };
--- a/dom/webidl/Window.webidl
+++ b/dom/webidl/Window.webidl
@@ -115,18 +115,18 @@ Window implements WindowSessionStorage;
 [NoInterfaceObject]
 interface WindowLocalStorage {
   [Throws] readonly attribute Storage? localStorage;
 };
 Window implements WindowLocalStorage;
 
 // http://www.whatwg.org/specs/web-apps/current-work/
 partial interface Window {
-  void captureEvents(long dummy);
-  void releaseEvents(long dummy);
+  void captureEvents();
+  void releaseEvents();
 };
 
 // https://dvcs.w3.org/hg/editing/raw-file/tip/editing.html
 partial interface Window {
   //[Throws] Selection getSelection();
   [Throws] Selection? getSelection();
 };