Bug 1434819 part 5. Remove nsIDOMTreeWalker. r=qdot

MozReview-Commit-ID: QmxoxVhppG

accessible/generic/Accessible.cpp

@@ -33,7 +33,6 @@
 #include "nsIDOMElement.h"
 #include "nsIDOMNodeFilter.h"
 #include "nsIDOMKeyEvent.h"
-#include "nsIDOMTreeWalker.h"
 #include "nsIDOMXULButtonElement.h"
 #include "nsIDOMXULElement.h"
 #include "nsIDOMXULLabelElement.h"

dom/base/TreeWalker.cpp

@@ -5,7 +5,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 /*
- * Implementation of DOM Traversal's nsIDOMTreeWalker
+ * Implementation of DOM Traversal's TreeWalker
  */
 
 #include "mozilla/dom/TreeWalker.h"
@@ -45,8 +45,7 @@ NS_IMPL_CYCLE_COLLECTION(TreeWalker, mFilter, mCurrentNode, mRoot)
 
 // QueryInterface implementation for TreeWalker
 NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(TreeWalker)
-    NS_INTERFACE_MAP_ENTRY(nsIDOMTreeWalker)
-    NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsIDOMTreeWalker)
+    NS_INTERFACE_MAP_ENTRY(nsISupports)
 NS_INTERFACE_MAP_END
 
 // Have to pass in dom::TreeWalker because a11y has an a11y::TreeWalker that

dom/base/TreeWalker.h

@@ -5,13 +5,13 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 /*
- * Implementation of DOM Traversal's nsIDOMTreeWalker
+ * Implementation of DOM Traversal's TreeWalker
  */
 
 #ifndef mozilla_dom_TreeWalker_h
 #define mozilla_dom_TreeWalker_h
 
-#include "nsIDOMTreeWalker.h"
+#include "nsISupports.h"
 #include "nsTraversal.h"
 #include "nsCOMPtr.h"
 #include "nsTArray.h"
@@ -23,13 +23,12 @@ class nsIDOMNode;
 namespace mozilla {
 namespace dom {
 
-class TreeWalker final : public nsIDOMTreeWalker, public nsTraversal
+class TreeWalker final : public nsISupports, public nsTraversal
 {
     virtual ~TreeWalker();
 
 public:
     NS_DECL_CYCLE_COLLECTING_ISUPPORTS
-    NS_DECL_NSIDOMTREEWALKER
 
     TreeWalker(nsINode *aRoot,
                uint32_t aWhatToShow,

dom/base/nsTraversal.h

@@ -5,7 +5,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 /*
- * Implementation of DOM Traversal's nsIDOMTreeWalker
+ * Implementation of common traversal methods for TreeWalker and NodeIterator.
  */
 
 #ifndef nsTraversal_h___

dom/interfaces/traversal/moz.build

@@ -9,7 +9,6 @@ with Files("**"):
 
 XPIDL_SOURCES += [
     'nsIDOMNodeFilter.idl',
-    'nsIDOMTreeWalker.idl',
 ]
 
 XPIDL_MODULE = 'dom_traversal'

dom/interfaces/traversal/nsIDOMTreeWalker.idl

@@ -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"
-
-interface nsIDOMNodeFilter;
-
-[uuid(c4ffa159-237c-4dde-b0ba-20b9f9270cf6)]
-// Introduced in DOM Level 2:
-interface nsIDOMTreeWalker : nsISupports {
-};

extensions/spellcheck/src/mozInlineSpellChecker.cpp

@@ -538,7 +538,6 @@ NS_IMPL_CYCLE_COLLECTING_RELEASE(mozInlineSpellChecker)
 NS_IMPL_CYCLE_COLLECTION(mozInlineSpellChecker,
                          mTextEditor,
                          mSpellCheck,
-                         mTreeWalker,
                          mCurrentSelectionAnchorNode)
 
 mozInlineSpellChecker::SpellCheckingState

extensions/spellcheck/src/mozInlineSpellChecker.h

@@ -8,7 +8,6 @@
 
 #include "nsCycleCollectionParticipant.h"
 #include "nsIDOMEventListener.h"
-#include "nsIDOMTreeWalker.h"
 #include "nsIEditorSpellCheck.h"
 #include "nsIInlineSpellChecker.h"
 #include "nsRange.h"
@@ -130,7 +129,6 @@ private:
   RefPtr<mozilla::TextEditor> mTextEditor;
   RefPtr<mozilla::EditorSpellCheck> mSpellCheck;
   RefPtr<mozilla::EditorSpellCheck> mPendingSpellCheck;
-  nsCOMPtr<nsIDOMTreeWalker> mTreeWalker;
   nsCOMPtr<mozISpellI18NUtil> mConverter;
 
   int32_t mNumWordsInSpellSelection;

layout/inspector/inDeepTreeWalker.cpp

@@ -100,7 +100,6 @@ inDeepTreeWalker::Init(nsIDOMNode* aRoot, uint32_t aWhatToShow)
 }
 
 ////////////////////////////////////////////////////
-// nsIDOMTreeWalker
 
 NS_IMETHODIMP
 inDeepTreeWalker::GetRoot(nsIDOMNode** aRoot)

layout/inspector/inIDeepTreeWalker.idl

@@ -25,7 +25,7 @@ interface inIDeepTreeWalker : nsISupports
 
   void init(in nsIDOMNode aRoot, in unsigned long aWhatToShow);
 
-  // Methods and attributes from nsIDOMTreeWalker, which is not scriptable.
+  // 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

xpcom/reflect/xptinfo/ShimInterfaceInfo.cpp

@@ -64,7 +64,6 @@
 #include "nsIDOMTimeEvent.h"
 #include "nsIDOMTimeRanges.h"
 #include "nsIDOMTransitionEvent.h"
-#include "nsIDOMTreeWalker.h"
 #include "nsIDOMUIEvent.h"
 #include "nsIDOMValidityState.h"
 #include "nsIDOMWheelEvent.h"
@@ -160,7 +159,6 @@
 #include "mozilla/dom/TimeRangesBinding.h"
 #include "mozilla/dom/TransitionEventBinding.h"
 #include "mozilla/dom/TreeBoxObjectBinding.h"
-#include "mozilla/dom/TreeWalkerBinding.h"
 #include "mozilla/dom/UIEventBinding.h"
 #include "mozilla/dom/ValidityStateBinding.h"
 #include "mozilla/dom/WheelEventBinding.h"
@@ -291,7 +289,6 @@ const ComponentsInterfaceShimEntry kComponentsInterfaceShimMap[] =
   DEFINE_SHIM(TimeRanges),
   DEFINE_SHIM(TransitionEvent),
   DEFINE_SHIM_WITH_CUSTOM_INTERFACE(nsITreeBoxObject, TreeBoxObject),
-  DEFINE_SHIM(TreeWalker),
   DEFINE_SHIM(UIEvent),
   DEFINE_SHIM(ValidityState),
   DEFINE_SHIM_WITH_CUSTOM_INTERFACE(nsIWebBrowserPersistable, FrameLoader),