mozilla
/
gecko-dev
зеркало из https://github.com/mozilla/gecko-dev.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Bug 830221 - Remove nsIDOMDOMImplementation. r=bz 

MozReview-Commit-ID: 3SCN1mHiMMn

--HG--
extra : rebase_source : 68494c099873ed487fc71800006afd93d0edf4e7
This commit is contained in:
Adrian Wielgosik 2018-02-12 21:49:07 +01:00
Родитель 8072ad5aa6
Коммит 598264eaff
7 изменённых файлов: 7 добавлений и 111 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

58
dom/base/DOMImplementation.cpp
Просмотреть файл

@ -21,7 +21,6 @@ namespace dom {
// QueryInterface implementation for DOMImplementation
NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(DOMImplementation)
NS_WRAPPERCACHE_INTERFACE_MAP_ENTRY
NS_INTERFACE_MAP_ENTRY(nsIDOMDOMImplementation)
NS_INTERFACE_MAP_ENTRY(nsISupports)
NS_INTERFACE_MAP_END
@ -36,15 +35,6 @@ DOMImplementation::WrapObject(JSContext* aCx, JS::Handle<JSObject*> aGivenProto)
return DOMImplementationBinding::Wrap(aCx, this, aGivenProto);
}
NS_IMETHODIMP
DOMImplementation::HasFeature(const nsAString& aFeature,
const nsAString& aVersion,
bool* aReturn)
{
*aReturn = true;
return NS_OK;
}
already_AddRefed<DocumentType>
DOMImplementation::CreateDocumentType(const nsAString& aQualifiedName,
const nsAString& aPublicId,
@ -74,27 +64,13 @@ DOMImplementation::CreateDocumentType(const nsAString& aQualifiedName,
return docType.forget();
}
NS_IMETHODIMP
DOMImplementation::CreateDocumentType(const nsAString& aQualifiedName,
const nsAString& aPublicId,
const nsAString& aSystemId,
nsIDOMDocumentType** aReturn)
{
ErrorResult rv;
*aReturn =
CreateDocumentType(aQualifiedName, aPublicId, aSystemId, rv).take();
return rv.StealNSResult();
}
nsresult
DOMImplementation::CreateDocument(const nsAString& aNamespaceURI,
const nsAString& aQualifiedName,
nsIDOMDocumentType* aDoctype,
nsIDocument** aDocument,
nsIDOMDocument** aDOMDocument)
nsIDocument** aDocument)
{
*aDocument = nullptr;
*aDOMDocument = nullptr;
nsresult rv;
if (!aQualifiedName.IsEmpty()) {
@ -143,7 +119,6 @@ DOMImplementation::CreateDocument(const nsAString& aNamespaceURI,
doc->SetReadyStateInternal(nsIDocument::READYSTATE_COMPLETE);
doc.forget(aDocument);
document.forget(aDOMDocument);
return NS_OK;
}
@ -154,30 +129,16 @@ DOMImplementation::CreateDocument(const nsAString& aNamespaceURI,
ErrorResult& aRv)
{
nsCOMPtr<nsIDocument> document;
nsCOMPtr<nsIDOMDocument> domDocument;
aRv = CreateDocument(aNamespaceURI, aQualifiedName, aDoctype,
getter_AddRefs(document), getter_AddRefs(domDocument));
getter_AddRefs(document));
return document.forget();
}
NS_IMETHODIMP
DOMImplementation::CreateDocument(const nsAString& aNamespaceURI,
const nsAString& aQualifiedName,
nsIDOMDocumentType* aDoctype,
nsIDOMDocument** aReturn)
{
nsCOMPtr<nsIDocument> document;
return CreateDocument(aNamespaceURI, aQualifiedName, aDoctype,
getter_AddRefs(document), aReturn);
}
nsresult
DOMImplementation::CreateHTMLDocument(const nsAString& aTitle,
nsIDocument** aDocument,
nsIDOMDocument** aDOMDocument)
nsIDocument** aDocument)
{
*aDocument = nullptr;
*aDOMDocument = nullptr;
NS_ENSURE_STATE(mOwner);
@ -239,7 +200,6 @@ DOMImplementation::CreateHTMLDocument(const nsAString& aTitle,
doc->SetReadyStateInternal(nsIDocument::READYSTATE_COMPLETE);
doc.forget(aDocument);
document.forget(aDOMDocument);
return NS_OK;
}
@ -248,20 +208,10 @@ DOMImplementation::CreateHTMLDocument(const Optional<nsAString>& aTitle,
ErrorResult& aRv)
{
nsCOMPtr<nsIDocument> document;
nsCOMPtr<nsIDOMDocument> domDocument;
aRv = CreateHTMLDocument(aTitle.WasPassed() ? aTitle.Value() : VoidString(),
getter_AddRefs(document),
getter_AddRefs(domDocument));
getter_AddRefs(document));
return document.forget();
}
NS_IMETHODIMP
DOMImplementation::CreateHTMLDocument(const nsAString& aTitle,
nsIDOMDocument** aReturn)
{
nsCOMPtr<nsIDocument> document;
return CreateHTMLDocument(aTitle, getter_AddRefs(document), aReturn);
}
} // namespace dom
} // namespace mozilla

14
dom/base/DOMImplementation.h
Просмотреть файл

@ -7,7 +7,6 @@
#ifndef mozilla_dom_DOMImplementation_h
#define mozilla_dom_DOMImplementation_h
#include "nsIDOMDOMImplementation.h"
#include "nsWrapperCache.h"
#include "mozilla/Attributes.h"
@ -20,13 +19,11 @@
#include "nsIWeakReferenceUtils.h"
#include "nsString.h"
class nsIDOMDocument;
namespace mozilla {
namespace dom {
class DocumentType;
class DOMImplementation final : public nsIDOMDOMImplementation
class DOMImplementation final : public nsISupports
, public nsWrapperCache
{
~DOMImplementation()
@ -56,9 +53,6 @@ public:
virtual JSObject* WrapObject(JSContext* aCx, JS::Handle<JSObject*> aGivenProto) override;
// nsIDOMDOMImplementation
NS_DECL_NSIDOMDOMIMPLEMENTATION
bool HasFeature()
{
return true;
@ -83,11 +77,9 @@ private:
nsresult CreateDocument(const nsAString& aNamespaceURI,
const nsAString& aQualifiedName,
nsIDOMDocumentType* aDoctype,
nsIDocument** aDocument,
nsIDOMDocument** aDOMDocument);
nsIDocument** aDocument);
nsresult CreateHTMLDocument(const nsAString& aTitle,
nsIDocument** aDocument,
nsIDOMDocument** aDOMDocument);
nsIDocument** aDocument);
nsCOMPtr<nsIDocument> mOwner;
nsWeakPtr mScriptObject;

1
dom/base/nsDocument.cpp
Просмотреть файл

@ -59,7 +59,6 @@
#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"

1
dom/interfaces/base/domstubs.idl
Просмотреть файл

@ -18,7 +18,6 @@ typedef unsigned long long nsViewID;
// Core
interface nsIDOMCharacterData;
interface nsIDOMComment;
interface nsIDOMDOMImplementation;
interface nsIDOMDocument;
interface nsIDOMDocumentFragment;
interface nsIDOMDocumentType;

1
dom/interfaces/core/moz.build
Просмотреть файл

@ -14,7 +14,6 @@ XPIDL_SOURCES += [
'nsIDOMDocumentFragment.idl',
'nsIDOMDocumentType.idl',
'nsIDOMDOMException.idl',
'nsIDOMDOMImplementation.idl',
'nsIDOMElement.idl',
'nsIDOMNode.idl',
'nsIDOMNodeList.idl',

42
dom/interfaces/core/nsIDOMDOMImplementation.idl
Просмотреть файл

@ -1,42 +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"
/**
* The nsIDOMDOMImplementation interface provides a number of methods for
* performing operations that are independent of any particular instance
* of the document object model.
*
* For more information on this interface please see
* http://www.w3.org/TR/DOM-Level-2-Core/
*/
[uuid(03a6f574-99ec-42f8-9e6c-812a4a9bcbf7)]
interface nsIDOMDOMImplementation : nsISupports
{
boolean hasFeature(in DOMString feature,
in DOMString version);
nsIDOMDocumentType createDocumentType(in DOMString qualifiedName,
in DOMString publicId,
in DOMString systemId)
raises(DOMException);
nsIDOMDocument createDocument(in DOMString namespaceURI,
in DOMString qualifiedName,
in nsIDOMDocumentType doctype)
raises(DOMException);
/**
* Returns an HTML document with a basic DOM already constructed and with an
* appropriate title element.
*
* @param title the title of the Document
* @see <http://www.whatwg.org/html/#creating-documents>
*/
nsIDOMDocument createHTMLDocument([Null(Stringify)]
in DOMString title);
};

1
layout/build/nsLayoutModule.cpp
Просмотреть файл

@ -24,7 +24,6 @@
#include "nsIContentViewer.h"
#include "nsIController.h"
#include "nsIControllers.h"
#include "nsIDOMDOMImplementation.h"
#include "nsIDocument.h"
#include "nsIDocumentEncoder.h"
#include "nsIFactory.h"