Bug 1453869 part 15. Remove nsIDOMParser. r=mrbkap
authorBoris Zbarsky <bzbarsky@mit.edu>
Fri, 20 Apr 2018 23:04:46 -0400
changeset 468465 3c6dbba979108358ff053420ecb42e35ba37d339
parent 468464 697cfb2ce42d6ac219470b565d7d2e4121387879
child 468466 757c523ca40f0d55e764e1c4f0685b3db3816c0d
push id9165
push userasasaki@mozilla.com
push dateThu, 26 Apr 2018 21:04:54 +0000
treeherdermozilla-beta@064c3804de2e [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmrbkap
bugs1453869
milestone61.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 1453869 part 15. Remove nsIDOMParser. r=mrbkap MozReview-Commit-ID: 8gGb1qO56gu
dom/base/DOMParser.cpp
dom/base/DOMParser.h
dom/base/moz.build
dom/base/nsIDOMParser.idl
--- a/dom/base/DOMParser.cpp
+++ b/dom/base/DOMParser.cpp
@@ -43,18 +43,17 @@ DOMParser::DOMParser(nsIGlobalObject* aO
 
 DOMParser::~DOMParser()
 {
 }
 
 // QueryInterface implementation for DOMParser
 NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(DOMParser)
   NS_WRAPPERCACHE_INTERFACE_MAP_ENTRY
-  NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsIDOMParser)
-  NS_INTERFACE_MAP_ENTRY(nsIDOMParser)
+  NS_INTERFACE_MAP_ENTRY(nsISupports)
   NS_INTERFACE_MAP_ENTRY(nsISupportsWeakReference)
 NS_INTERFACE_MAP_END
 
 NS_IMPL_CYCLE_COLLECTION_WRAPPERCACHE(DOMParser, mOwner)
 
 NS_IMPL_CYCLE_COLLECTING_ADDREF(DOMParser)
 NS_IMPL_CYCLE_COLLECTING_RELEASE(DOMParser)
 
--- a/dom/base/DOMParser.h
+++ b/dom/base/DOMParser.h
@@ -4,45 +4,39 @@
  * 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/. */
 
 #ifndef mozilla_dom_DOMParser_h_
 #define mozilla_dom_DOMParser_h_
 
 #include "nsCOMPtr.h"
 #include "nsIDocument.h"
-#include "nsIDOMParser.h"
 #include "nsWeakReference.h"
 #include "nsWrapperCache.h"
 #include "mozilla/ErrorResult.h"
 #include "mozilla/Span.h"
 #include "mozilla/dom/DOMParserBinding.h"
 #include "mozilla/dom/TypedArray.h"
 
 class nsIDocument;
 class nsIGlobalObject;
 
 namespace mozilla {
 namespace dom {
 
-class DOMParser final : public nsIDOMParser,
-                        public nsSupportsWeakReference,
+class DOMParser final : public nsSupportsWeakReference,
                         public nsWrapperCache
 {
   typedef mozilla::dom::GlobalObject GlobalObject;
 
   virtual ~DOMParser();
 
 public:
   NS_DECL_CYCLE_COLLECTING_ISUPPORTS
-  NS_DECL_CYCLE_COLLECTION_SCRIPT_HOLDER_CLASS_AMBIGUOUS(DOMParser,
-                                                         nsIDOMParser)
-
-  // nsIDOMParser
-  NS_DECL_NSIDOMPARSER
+  NS_DECL_CYCLE_COLLECTION_SCRIPT_HOLDER_CLASS(DOMParser)
 
   // WebIDL API
   static already_AddRefed<DOMParser>
   Constructor(const GlobalObject& aOwner,
               mozilla::ErrorResult& rv);
 
   already_AddRefed<nsIDocument>
   ParseFromString(const nsAString& aStr, SupportedType aType, ErrorResult& aRv);
--- a/dom/base/moz.build
+++ b/dom/base/moz.build
@@ -11,17 +11,16 @@ with Files("**"):
     BUG_COMPONENT = ("Core", "DOM")
 
 TEST_DIRS += ['test']
 
 XPIDL_SOURCES += [
     'mozIDOMWindow.idl',
     'nsIContentPolicy.idl',
     'nsIDocumentEncoder.idl',
-    'nsIDOMParser.idl',
     'nsIDOMRequestService.idl',
     'nsIDroppedLinkHandler.idl',
     'nsIFrameLoaderOwner.idl',
     'nsIImageLoadingContent.idl',
     'nsIMessageManager.idl',
     'nsIObjectLoadingContent.idl',
     'nsIPerformanceMetrics.idl',
     'nsIRemoteWindowContext.idl',
deleted file mode 100644
--- a/dom/base/nsIDOMParser.idl
+++ /dev/null
@@ -1,25 +0,0 @@
-/* -*- Mode: C++; 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 "nsISupports.idl"
-
-interface nsIInputStream;
-interface nsIDOMDocument;
-interface nsIURI;
-interface nsIPrincipal;
-interface nsIGlobalObject;
-
-/**
- * The nsIDOMParser interface is a non-SAX interface that can be used
- * to parse a string or byte stream containing XML or HTML content
- * to a DOM document. Parsing is always synchronous - a document is always
- * returned from the parsing methods. This is as opposed to loading and
- * parsing with the XMLHttpRequest interface, which can be used for
- * asynchronous (callback-based) loading.
- */
-[shim(DOMParser), uuid(70b9600e-8622-4c93-9ad8-22c28058dc44)]
-interface nsIDOMParser : nsISupports
-{
-};