Bug 1013475 - give inIDeepTreeWalker all of nsIDOMTreeWalker's methods/attributes, rather than inheriting them; r=bz
authorNathan Froyd <froydnj@mozilla.com>
Tue, 20 May 2014 14:17:27 -0400
changeset 203252 ea0448aacaa368a012650135e7fdb696634eabc8
parent 203251 5b90c47a36f02a3c5146173518369c638b1e4dda
child 203253 7bd21ae215a263d9c911014792a42570eb5de735
push id3741
push userasasaki@mozilla.com
push dateMon, 21 Jul 2014 20:25:18 +0000
treeherdermozilla-beta@4d6f46f5af68 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbz
bugs1013475
milestone32.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 1013475 - give inIDeepTreeWalker all of nsIDOMTreeWalker's methods/attributes, rather than inheriting them; r=bz
layout/inspector/inDeepTreeWalker.cpp
layout/inspector/inDeepTreeWalker.h
layout/inspector/inIDeepTreeWalker.idl
--- a/layout/inspector/inDeepTreeWalker.cpp
+++ b/layout/inspector/inDeepTreeWalker.cpp
@@ -33,18 +33,17 @@ inDeepTreeWalker::inDeepTreeWalker()
 {
 }
 
 inDeepTreeWalker::~inDeepTreeWalker() 
 { 
 }
 
 NS_IMPL_ISUPPORTS(inDeepTreeWalker,
-                  inIDeepTreeWalker,
-                  nsIDOMTreeWalker)
+                  inIDeepTreeWalker)
 
 ////////////////////////////////////////////////////
 // inIDeepTreeWalker
 
 NS_IMETHODIMP
 inDeepTreeWalker::GetShowAnonymousContent(bool *aShowAnonymousContent)
 {
   *aShowAnonymousContent = mShowAnonymousContent;
--- a/layout/inspector/inDeepTreeWalker.h
+++ b/layout/inspector/inDeepTreeWalker.h
@@ -24,17 +24,16 @@ struct DeepTreeStackItem
 };
 
 ////////////////////////////////////////////////////
 
 class inDeepTreeWalker : public inIDeepTreeWalker
 {
 public:
 	NS_DECL_ISUPPORTS
-	NS_DECL_NSIDOMTREEWALKER
 	NS_DECL_INIDEEPTREEWALKER
 
   inDeepTreeWalker();
   virtual ~inDeepTreeWalker();
 
 protected:
   void PushNode(nsIDOMNode* aNode);
 
--- a/layout/inspector/inIDeepTreeWalker.idl
+++ b/layout/inspector/inIDeepTreeWalker.idl
@@ -1,17 +1,33 @@
 /* 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 "nsIDOMTreeWalker.idl"
+#include "nsISupports.idl"
 
 interface nsIDOMNode;
+interface nsIDOMNodeFilter;
 
-[scriptable, uuid(91FCA0E9-99D6-406b-9D78-4C96F11E9EE4)]
-interface inIDeepTreeWalker : nsIDOMTreeWalker
+[scriptable, uuid(5ba1ec15-e18f-46df-9558-c618429f3db3)]
+interface inIDeepTreeWalker : nsISupports
 {
   attribute boolean showAnonymousContent;
   attribute boolean showSubDocuments;
   
   void init(in nsIDOMNode aRoot, in unsigned long aWhatToShow);
+
+  // Methods and attributes from nsIDOMTreeWalker, which is not scriptable.
+  readonly attribute nsIDOMNode       root;
+  readonly attribute unsigned long    whatToShow;
+  readonly attribute nsIDOMNodeFilter filter;
+           attribute nsIDOMNode       currentNode;
+                                        // raises(DOMException) on setting
+
+  nsIDOMNode         parentNode();
+  nsIDOMNode         firstChild();
+  nsIDOMNode         lastChild();
+  nsIDOMNode         previousSibling();
+  nsIDOMNode         nextSibling();
+  nsIDOMNode         previousNode();
+  nsIDOMNode         nextNode();
 };