Bug 1434819 part 9. Remove nsIDOMNodeFilter. r=qdot
authorBoris Zbarsky <bzbarsky@mit.edu>
Thu, 01 Feb 2018 14:26:13 -0500
changeset 402118 bffbab07fdc4c9a92b7a6ff5d68459961cc786ab
parent 402117 8ad255c6fd62f59b4dacd6480b506e3b53378df8
child 402119 d5a5ad1dbbf2c53a80386e7397ba6b32153b2b8e
child 402157 ee7f64d0764961e9663c681efc8d2b3759af79d6
push id99495
push userbzbarsky@mozilla.com
push dateThu, 01 Feb 2018 19:26:43 +0000
treeherdermozilla-inbound@bffbab07fdc4 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersqdot
bugs1434819
milestone60.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 1434819 part 9. Remove nsIDOMNodeFilter. r=qdot MozReview-Commit-ID: JsxGp9HQ2ak
accessible/generic/Accessible.cpp
browser/installer/package-manifest.in
dom/base/nsDOMClassInfo.cpp
dom/base/nsDocument.cpp
dom/base/nsIDocument.h
dom/base/nsTraversal.h
dom/interfaces/traversal/moz.build
dom/interfaces/traversal/nsIDOMNodeFilter.idl
dom/moz.build
layout/inspector/inDeepTreeWalker.cpp
layout/inspector/inIDeepTreeWalker.idl
mobile/android/installer/package-manifest.in
--- a/accessible/generic/Accessible.cpp
+++ b/accessible/generic/Accessible.cpp
@@ -26,17 +26,16 @@
 #include "States.h"
 #include "StyleInfo.h"
 #include "TableAccessible.h"
 #include "TableCellAccessible.h"
 #include "TreeWalker.h"
 #include "XULDocument.h"
 
 #include "nsIDOMElement.h"
-#include "nsIDOMNodeFilter.h"
 #include "nsIDOMKeyEvent.h"
 #include "nsIDOMXULButtonElement.h"
 #include "nsIDOMXULElement.h"
 #include "nsIDOMXULLabelElement.h"
 #include "nsIDOMXULSelectCntrlEl.h"
 #include "nsIDOMXULSelectCntrlItemEl.h"
 #include "nsINodeList.h"
 #include "nsPIDOMWindow.h"
--- a/browser/installer/package-manifest.in
+++ b/browser/installer/package-manifest.in
@@ -212,17 +212,16 @@
 @RESPATH@/components/dom_payments.xpt
 @RESPATH@/components/dom_power.xpt
 @RESPATH@/components/dom_push.xpt
 @RESPATH@/components/dom_quota.xpt
 @RESPATH@/components/dom_range.xpt
 @RESPATH@/components/dom_security.xpt
 @RESPATH@/components/dom_sidebar.xpt
 @RESPATH@/components/dom_storage.xpt
-@RESPATH@/components/dom_traversal.xpt
 #ifdef MOZ_WEBSPEECH
 @RESPATH@/components/dom_webspeechrecognition.xpt
 #endif
 @RESPATH@/components/dom_workers.xpt
 @RESPATH@/components/dom_xbl.xpt
 @RESPATH@/components/dom_xhr.xpt
 @RESPATH@/components/dom_xpath.xpt
 @RESPATH@/components/dom_xul.xpt
--- a/dom/base/nsDOMClassInfo.cpp
+++ b/dom/base/nsDOMClassInfo.cpp
@@ -1694,16 +1694,17 @@ const InterfaceShimEntry kInterfaceShimM
   { "nsIDOMMouseScrollEvent", "MouseScrollEvent" },
   { "nsIDOMMutationEvent", "MutationEvent" },
   { "nsIDOMSimpleGestureEvent", "SimpleGestureEvent" },
   { "nsIDOMUIEvent", "UIEvent" },
   { "nsIDOMHTMLMediaElement", "HTMLMediaElement" },
   { "nsIDOMOfflineResourceList", "OfflineResourceList" },
   { "nsIDOMRange", "Range" },
   { "nsIDOMSVGLength", "SVGLength" },
+  // Think about whether Ci.nsINodeFilter can just go away for websites!
   { "nsIDOMNodeFilter", "NodeFilter" },
   { "nsIDOMXPathResult", "XPathResult" } };
 
 static nsresult
 LookupComponentsShim(JSContext *cx, JS::Handle<JSObject*> global,
                      nsPIDOMWindowInner *win,
                      JS::MutableHandle<JS::PropertyDescriptor> desc)
 {
--- a/dom/base/nsDocument.cpp
+++ b/dom/base/nsDocument.cpp
@@ -51,17 +51,16 @@
 #include "mozilla/Services.h"
 #include "nsScreen.h"
 #include "ChildIterator.h"
 
 #include "mozilla/AsyncEventDispatcher.h"
 #include "mozilla/BasicEvents.h"
 #include "mozilla/EventListenerManager.h"
 #include "mozilla/EventStateManager.h"
-#include "nsIDOMNodeFilter.h"
 
 #include "mozilla/dom/Attr.h"
 #include "mozilla/dom/BindingDeclarations.h"
 #include "nsIDOMDOMImplementation.h"
 #include "nsIDOMDocumentXBL.h"
 #include "mozilla/dom/Element.h"
 #include "mozilla/dom/FramingChecker.h"
 #include "nsGenericHTMLElement.h"
--- a/dom/base/nsIDocument.h
+++ b/dom/base/nsIDocument.h
@@ -81,17 +81,16 @@ class nsIContent;
 class nsIContentSink;
 class nsIDocShell;
 class nsIDocShellTreeItem;
 class nsIDocumentEncoder;
 class nsIDocumentObserver;
 class nsIDOMDocument;
 class nsIDOMDocumentType;
 class nsIDOMElement;
-class nsIDOMNodeFilter;
 class nsIDOMNodeList;
 class nsIHTMLCollection;
 class nsILayoutHistoryState;
 class nsILoadContext;
 class nsIObjectLoadingContent;
 class nsIObserver;
 class nsIPrincipal;
 class nsIRequest;
--- a/dom/base/nsTraversal.h
+++ b/dom/base/nsTraversal.h
@@ -10,17 +10,16 @@
 
 #ifndef nsTraversal_h___
 #define nsTraversal_h___
 
 #include "nsCOMPtr.h"
 #include "mozilla/dom/CallbackObject.h"
 #include "mozilla/ErrorResult.h"
 #include "mozilla/dom/NodeFilterBinding.h"
-#include "nsIDOMNodeFilter.h"
 
 class nsINode;
 
 class nsTraversal
 {
 public:
     nsTraversal(nsINode *aRoot,
                 uint32_t aWhatToShow,
deleted file mode 100644
--- a/dom/interfaces/traversal/moz.build
+++ /dev/null
@@ -1,15 +0,0 @@
-# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
-# vim: set filetype=python:
-# 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/.
-
-with Files("**"):
-    BUG_COMPONENT = ("Core", "DOM: Core & HTML")
-
-XPIDL_SOURCES += [
-    'nsIDOMNodeFilter.idl',
-]
-
-XPIDL_MODULE = 'dom_traversal'
-
deleted file mode 100644
--- a/dom/interfaces/traversal/nsIDOMNodeFilter.idl
+++ /dev/null
@@ -1,14 +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 "domstubs.idl"
-
-[scriptable, function, uuid(e4723748-1dd1-11b2-8ee6-866a532a6237)]
-// Introduced in DOM Level 2:
-interface nsIDOMNodeFilter : nsISupports
-{
-  short              acceptNode(in nsIDOMNode n);
-};
--- a/dom/moz.build
+++ b/dom/moz.build
@@ -15,17 +15,16 @@ JAR_MANIFESTS += ['jar.mn']
 
 interfaces = [
     'base',
     'canvas',
     'core',
     'html',
     'events',
     'sidebar',
-    'traversal',
     'range',
     'xbl',
     'xpath',
     'xul',
     'security',
     'storage',
     'offline',
     'geolocation',
--- a/layout/inspector/inDeepTreeWalker.cpp
+++ b/layout/inspector/inDeepTreeWalker.cpp
@@ -4,17 +4,16 @@
  * 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 "inDeepTreeWalker.h"
 #include "inLayoutUtils.h"
 
 #include "nsString.h"
 #include "nsIDOMDocument.h"
-#include "nsIDOMNodeFilter.h"
 #include "nsIDOMNodeList.h"
 #include "nsServiceManagerUtils.h"
 #include "nsIContent.h"
 #include "ChildIterator.h"
 #include "mozilla/dom/Element.h"
 #include "mozilla/dom/InspectorUtils.h"
 #include "mozilla/dom/NodeFilterBinding.h"
 
@@ -113,22 +112,16 @@ inDeepTreeWalker::GetRoot(nsIDOMNode** a
 NS_IMETHODIMP
 inDeepTreeWalker::GetWhatToShow(uint32_t* aWhatToShow)
 {
   *aWhatToShow = mWhatToShow;
   return NS_OK;
 }
 
 NS_IMETHODIMP
-inDeepTreeWalker::GetFilter(nsIDOMNodeFilter** aFilter)
-{
-  return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-NS_IMETHODIMP
 inDeepTreeWalker::GetCurrentNode(nsIDOMNode** aCurrentNode)
 {
   *aCurrentNode = mCurrentNode;
   NS_IF_ADDREF(*aCurrentNode);
   return NS_OK;
 }
 
 already_AddRefed<nsIDOMNode>
--- a/layout/inspector/inIDeepTreeWalker.idl
+++ b/layout/inspector/inIDeepTreeWalker.idl
@@ -1,16 +1,15 @@
 /* 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 nsIDOMNode;
-interface nsIDOMNodeFilter;
 
 // Note: the iterator does not handle DOM mutations gracefully. So if
 // the underlying DOM we are iterating over is changed, the behavior
 // of the walker is undefined. (With the current implementation we
 // cache the siblings of the current node and this list is not updated
 // when a mutation occurs).
 
 [scriptable, uuid(6657e8eb-b646-48e7-993e-cfa6e96415b4)]
@@ -28,17 +27,16 @@ interface inIDeepTreeWalker : nsISupport
   // Methods and attributes that look like TreeWalker.
   // Note: normally parentNode cannot go further up on the tree once it reached
   // the root, but setting currentNode does not have this limitation. If currentNode
   // is set to a node that does not have the root as its ancestor the walk can be
   // continued from there, and once we reach a node that is 'under' the root, the
   // limitation for the parentNode will work again.
   readonly attribute nsIDOMNode       root;
   readonly attribute unsigned long    whatToShow;
-  readonly attribute nsIDOMNodeFilter filter;
            attribute nsIDOMNode       currentNode;
 
   nsIDOMNode         parentNode();
   nsIDOMNode         firstChild();
   nsIDOMNode         lastChild();
   nsIDOMNode         previousSibling();
   nsIDOMNode         nextSibling();
   nsIDOMNode         previousNode();
--- a/mobile/android/installer/package-manifest.in
+++ b/mobile/android/installer/package-manifest.in
@@ -137,17 +137,16 @@
 @BINPATH@/components/dom_push.xpt
 #endif
 @BINPATH@/components/dom_quota.xpt
 @BINPATH@/components/dom_range.xpt
 @BINPATH@/components/dom_security.xpt
 @BINPATH@/components/dom_sidebar.xpt
 @BINPATH@/components/dom_storage.xpt
 @BINPATH@/components/dom_system.xpt
-@BINPATH@/components/dom_traversal.xpt
 #ifdef MOZ_WEBSPEECH
 @BINPATH@/components/dom_webspeechrecognition.xpt
 #endif
 @BINPATH@/components/dom_xbl.xpt
 @BINPATH@/components/dom_xhr.xpt
 @BINPATH@/components/dom_xpath.xpt
 @BINPATH@/components/dom_xul.xpt
 @BINPATH@/components/dom_presentation.xpt