wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 830221 - Remove nsIDOMDOMImplementation r=bz

Browse Source
This commit is contained in:
David Zbarsky 2013-01-14 21:06:20 -05:00
parent cae582f47e
commit 66edabde03
8 changed files with 5 additions and 96 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
content/base/src/DOMImplementation.cpp
View File

@ -16,7 +16,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,18 +35,7 @@ bool
DOMImplementation::HasFeature(const nsAString& aFeature,
const nsAString& aVersion)
{
return nsContentUtils::InternalIsSupported(
static_cast<nsIDOMDOMImplementation*>(this),
aFeature, aVersion);
}
NS_IMETHODIMP
DOMImplementation::HasFeature(const nsAString& aFeature,
const nsAString& aVersion,
bool* aReturn)
{
*aReturn = HasFeature(aFeature, aVersion);
return NS_OK;
return nsContentUtils::InternalIsSupported(this, aFeature, aVersion);
}
already_AddRefed<DocumentType>
@ -79,17 +67,6 @@ 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).get();
return rv.ErrorCode();
}
nsresult
DOMImplementation::CreateDocument(const nsAString& aNamespaceURI,
const nsAString& aQualifiedName,
@ -155,17 +132,6 @@ DOMImplementation::CreateDocument(const nsAString& aNamespaceURI,
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,
@ -256,13 +222,5 @@ DOMImplementation::CreateHTMLDocument(const nsAString& aTitle,
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

6
content/base/src/DOMImplementation.h
View File

@ -5,7 +5,6 @@
#ifndef mozilla_dom_DOMImplementation_h
#define mozilla_dom_DOMImplementation_h
#include "nsIDOMDOMImplementation.h"
#include "nsWrapperCache.h"
#include "mozilla/Attributes.h"
@ -24,7 +23,7 @@ namespace mozilla {
namespace dom {
class DocumentType;
class DOMImplementation MOZ_FINAL : public nsIDOMDOMImplementation
class DOMImplementation MOZ_FINAL : public nsISupports
, public nsWrapperCache
{
public:
@ -56,9 +55,6 @@ public:
virtual JSObject* WrapObject(JSContext* aCx, JSObject* aScope,
bool* aTriedToWrap) MOZ_OVERRIDE;
// nsIDOMDOMImplementation
NS_DECL_NSIDOMDOMIMPLEMENTATION
bool HasFeature(const nsAString& aFeature, const nsAString& aVersion);
already_AddRefed<DocumentType>

3
content/base/src/nsDocument.cpp
View File

@ -41,7 +41,6 @@
#include "nsIDOMStyleSheet.h"
#include "nsDOMAttribute.h"
#include "nsIDOMDOMStringList.h"
#include "nsIDOMDOMImplementation.h"
#include "nsIDOMDocumentXBL.h"
#include "mozilla/dom/Element.h"
#include "nsGenericHTMLElement.h"
@ -4491,7 +4490,7 @@ nsDocument::GetDoctype(nsIDOMDocumentType** aDoctype)
}
NS_IMETHODIMP
nsDocument::GetImplementation(nsIDOMDOMImplementation** aImplementation)
nsDocument::GetImplementation(nsISupports** aImplementation)
{
ErrorResult rv;
*aImplementation = GetImplementation(rv);

1
dom/interfaces/base/domstubs.idl
View File

@ -18,7 +18,6 @@ interface nsIDOMAttr;
interface nsIDOMCDATASection;
interface nsIDOMCharacterData;
interface nsIDOMComment;
interface nsIDOMDOMImplementation;
interface nsIDOMDocument;
interface nsIDOMDocumentFragment;
interface nsIDOMDocumentType;

1
dom/interfaces/core/Makefile.in
View File

@ -20,7 +20,6 @@ SDK_XPIDLSRCS = \
nsIDOMCharacterData.idl \
nsIDOMComment.idl \
nsIDOMDOMException.idl \
nsIDOMDOMImplementation.idl \
nsIDOMDocument.idl \
nsIDOMDocumentFragment.idl \
nsIDOMDocumentType.idl \

42
dom/interfaces/core/nsIDOMDOMImplementation.idl
View File

@ -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);
};

3
dom/interfaces/core/nsIDOMDocument.idl
View File

@ -31,7 +31,8 @@ interface nsIDOMLocation;
interface nsIDOMDocument : nsIDOMNode
{
readonly attribute nsIDOMDocumentType doctype;
readonly attribute nsIDOMDOMImplementation implementation;
// DOMImplementation
readonly attribute nsISupports implementation;
readonly attribute nsIDOMElement documentElement;
nsIDOMElement createElement([Null(Stringify)] in DOMString tagName)
raises(DOMException);

1
layout/build/nsLayoutModule.cpp
View File

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