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 881128 - Remove nsIDOMGetSVGDocument r=bz

Browse Source
This commit is contained in:
David Zbarsky 2013-06-11 21:56:26 -07:00
parent d30dc5a7a3
commit 3f47f56d2f
13 changed files with 11 additions and 79 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
content/html/content/src/HTMLIFrameElement.cpp
View File

@ -37,9 +37,8 @@ NS_IMPL_RELEASE_INHERITED(HTMLIFrameElement, Element)
// QueryInterface implementation for HTMLIFrameElement
NS_INTERFACE_TABLE_HEAD(HTMLIFrameElement)
NS_HTML_CONTENT_INTERFACES(nsGenericHTMLFrameElement)
NS_INTERFACE_TABLE_INHERITED2(HTMLIFrameElement,
nsIDOMHTMLIFrameElement,
nsIDOMGetSVGDocument)
NS_INTERFACE_TABLE_INHERITED1(HTMLIFrameElement,
nsIDOMHTMLIFrameElement)
NS_INTERFACE_TABLE_TO_MAP_SEGUE
NS_ELEMENT_INTERFACE_MAP_END
@ -82,12 +81,6 @@ HTMLIFrameElement::GetContentWindow(nsIDOMWindow** aContentWindow)
return nsGenericHTMLFrameElement::GetContentWindow(aContentWindow);
}
NS_IMETHODIMP
HTMLIFrameElement::GetSVGDocument(nsIDOMDocument **aResult)
{
return GetContentDocument(aResult);
}
bool
HTMLIFrameElement::ParseAttribute(int32_t aNamespaceID,
nsIAtom* aAttribute,

5
content/html/content/src/HTMLIFrameElement.h
View File

@ -9,14 +9,12 @@
#include "mozilla/Attributes.h"
#include "nsGenericHTMLFrameElement.h"
#include "nsIDOMHTMLIFrameElement.h"
#include "nsIDOMGetSVGDocument.h"
namespace mozilla {
namespace dom {
class HTMLIFrameElement MOZ_FINAL : public nsGenericHTMLFrameElement
, public nsIDOMHTMLIFrameElement
, public nsIDOMGetSVGDocument
{
public:
HTMLIFrameElement(already_AddRefed<nsINodeInfo> aNodeInfo,
@ -40,9 +38,6 @@ public:
// nsIDOMHTMLIFrameElement
NS_DECL_NSIDOMHTMLIFRAMEELEMENT
// nsIDOMGetSVGDocument
NS_DECL_NSIDOMGETSVGDOCUMENT
// nsIContent
virtual bool ParseAttribute(int32_t aNamespaceID,
nsIAtom* aAttribute,

12
content/html/content/src/HTMLObjectElement.cpp
View File

@ -15,7 +15,6 @@
#include "nsIDocument.h"
#include "nsIPluginDocument.h"
#include "nsIDOMDocument.h"
#include "nsIDOMSVGDocument.h"
#include "nsFormSubmission.h"
#include "nsIObjectFrame.h"
#include "nsNPAPIPluginInstance.h"
@ -81,7 +80,7 @@ NS_IMPL_RELEASE_INHERITED(HTMLObjectElement, Element)
NS_INTERFACE_TABLE_HEAD_CYCLE_COLLECTION_INHERITED(HTMLObjectElement)
NS_HTML_CONTENT_INTERFACES(nsGenericHTMLFormElement)
NS_INTERFACE_TABLE_INHERITED12(HTMLObjectElement,
NS_INTERFACE_TABLE_INHERITED11(HTMLObjectElement,
nsIDOMHTMLObjectElement,
imgINotificationObserver,
nsIRequestObserver,
@ -92,8 +91,7 @@ NS_INTERFACE_TABLE_HEAD_CYCLE_COLLECTION_INHERITED(HTMLObjectElement)
imgIOnloadBlocker,
nsIInterfaceRequestor,
nsIChannelEventSink,
nsIConstraintValidation,
nsIDOMGetSVGDocument)
nsIConstraintValidation)
NS_INTERFACE_TABLE_TO_MAP_SEGUE
NS_ELEMENT_INTERFACE_MAP_END
@ -350,12 +348,6 @@ HTMLObjectElement::GetContentWindow()
return nullptr;
}
NS_IMETHODIMP
HTMLObjectElement::GetSVGDocument(nsIDOMDocument **aResult)
{
return GetContentDocument(aResult);
}
bool
HTMLObjectElement::ParseAttribute(int32_t aNamespaceID,
nsIAtom *aAttribute,

5
content/html/content/src/HTMLObjectElement.h
View File

@ -12,7 +12,6 @@
#include "nsObjectLoadingContent.h"
#include "nsIDOMHTMLObjectElement.h"
#include "nsIConstraintValidation.h"
#include "nsIDOMGetSVGDocument.h"
namespace mozilla {
namespace dom {
@ -21,7 +20,6 @@ class HTMLObjectElement MOZ_FINAL : public nsGenericHTMLFormElement
, public nsObjectLoadingContent
, public nsIDOMHTMLObjectElement
, public nsIConstraintValidation
, public nsIDOMGetSVGDocument
{
public:
HTMLObjectElement(already_AddRefed<nsINodeInfo> aNodeInfo,
@ -45,9 +43,6 @@ public:
// nsIDOMHTMLObjectElement
NS_DECL_NSIDOMHTMLOBJECTELEMENT
// nsIDOMGetSVGDocument
NS_DECL_NSIDOMGETSVGDOCUMENT
virtual nsresult BindToTree(nsIDocument *aDocument, nsIContent *aParent,
nsIContent *aBindingParent,
bool aCompileEventHandlers) MOZ_OVERRIDE;

23
content/html/content/src/HTMLSharedObjectElement.cpp
View File

@ -107,7 +107,6 @@ NS_INTERFACE_TABLE_HEAD_CYCLE_COLLECTION_INHERITED(HTMLSharedObjectElement)
NS_INTERFACE_TABLE_TO_MAP_SEGUE
NS_INTERFACE_MAP_ENTRY_IF_TAG(nsIDOMHTMLAppletElement, applet)
NS_INTERFACE_MAP_ENTRY_IF_TAG(nsIDOMHTMLEmbedElement, embed)
NS_INTERFACE_MAP_ENTRY_IF_TAG(nsIDOMGetSVGDocument, embed)
NS_ELEMENT_INTERFACE_MAP_END
NS_IMPL_ELEMENT_CLONE(HTMLSharedObjectElement)
@ -224,27 +223,7 @@ NS_IMPL_STRING_ATTR(HTMLSharedObjectElement, Width, width)
int32_t
HTMLSharedObjectElement::TabIndexDefault()
{
return -1;
}
NS_IMETHODIMP
HTMLSharedObjectElement::GetSVGDocument(nsIDOMDocument **aResult)
{
NS_ENSURE_ARG_POINTER(aResult);
*aResult = nullptr;
if (!IsInDoc()) {
return NS_OK;
}
// XXXbz should this use GetCurrentDoc()? sXBL/XBL2 issue!
nsIDocument *sub_doc = OwnerDoc()->GetSubDocumentFor(this);
if (!sub_doc) {
return NS_OK;
}
return CallQueryInterface(sub_doc, aResult);
return -1;
}
bool

5
content/html/content/src/HTMLSharedObjectElement.h
View File

@ -14,7 +14,6 @@
#include "nsError.h"
#include "nsIDOMHTMLAppletElement.h"
#include "nsIDOMHTMLEmbedElement.h"
#include "nsIDOMGetSVGDocument.h"
namespace mozilla {
namespace dom {
@ -23,7 +22,6 @@ class HTMLSharedObjectElement : public nsGenericHTMLElement
, public nsObjectLoadingContent
, public nsIDOMHTMLAppletElement
, public nsIDOMHTMLEmbedElement
, public nsIDOMGetSVGDocument
{
public:
HTMLSharedObjectElement(already_AddRefed<nsINodeInfo> aNodeInfo,
@ -56,9 +54,6 @@ public:
NS_IMETHOD GetType(nsAString &aType) MOZ_OVERRIDE;
NS_IMETHOD SetType(const nsAString &aType) MOZ_OVERRIDE;
// nsIDOMGetSVGDocument
NS_DECL_NSIDOMGETSVGDOCUMENT
virtual nsresult BindToTree(nsIDocument *aDocument, nsIContent *aParent,
nsIContent *aBindingParent,
bool aCompileEventHandlers) MOZ_OVERRIDE;

6
content/html/content/test/test_bug389797.html
View File

@ -135,7 +135,7 @@ HTML_TAG("div", "Div");
HTML_TAG("dl", "DList");
HTML_TAG("dt", "");
HTML_TAG("em", "");
HTML_TAG("embed", "Embed", [ "nsIDOMGetSVGDocument" ], objectIfaces);
HTML_TAG("embed", "Embed", [], objectIfaces);
HTML_TAG("fieldset", "FieldSet");
HTML_TAG("figcaption", "")
HTML_TAG("figure", "")
@ -156,7 +156,7 @@ HTML_TAG("hgroup", "")
HTML_TAG("hr", "HR");
HTML_TAG("html", "Html");
HTML_TAG("i", "");
HTML_TAG("iframe", "IFrame", [ "nsIDOMGetSVGDocument", "nsIDOMMozBrowserFrame" ],
HTML_TAG("iframe", "IFrame", [ "nsIDOMMozBrowserFrame" ],
[ "nsIFrameLoaderOwner" ]);
HTML_TAG("image", "");
HTML_TAG("img", "Image", [ "nsIImageLoadingContent" ], []);
@ -184,7 +184,7 @@ HTML_TAG("nobr", "");
HTML_TAG("noembed", "");
HTML_TAG("noframes", "");
HTML_TAG("noscript", "");
HTML_TAG("object", "Object", [ "nsIDOMGetSVGDocument" ],
HTML_TAG("object", "Object", [],
objectIfaces.concat([ "nsIImageLoadingContent" ]));
HTML_TAG("ol", "OList");
HTML_TAG("optgroup", "OptGroup");

1
dom/interfaces/svg/moz.build
View File

@ -5,7 +5,6 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
XPIDL_SOURCES += [
'nsIDOMGetSVGDocument.idl',
'nsIDOMSVGAnimatedEnum.idl',
'nsIDOMSVGAnimatedInteger.idl',
'nsIDOMSVGAnimatedLength.idl',

15
dom/interfaces/svg/nsIDOMGetSVGDocument.idl
View File

@ -1,15 +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 nsIDOMSVGDocument;
[scriptable, uuid(b5d3074c-4f63-4936-bf39-49034efa26a5)]
interface nsIDOMGetSVGDocument : nsISupports
{
nsIDOMDocument getSVGDocument ( );
// raises( DOMException );
};

1
dom/tests/mochitest/general/test_interfaces.html
View File

@ -140,7 +140,6 @@ var interfaceNamesInGlobalScope =
"GeoPositionCoords",
"GeoPositionError",
"GeoPositionErrorCallback",
"GetSVGDocument",
"GetUserMediaErrorCallback",
"GetUserMediaSuccessCallback",
"GlobalObjectConstructor",

2
dom/webidl/HTMLEmbedElement.webidl
View File

@ -36,7 +36,7 @@ partial interface HTMLEmbedElement {
};
partial interface HTMLEmbedElement {
// nsIDOMGetSVGDocument
// GetSVGDocument
Document? getSVGDocument();
};

2
dom/webidl/HTMLIFrameElement.webidl
View File

@ -47,7 +47,7 @@ partial interface HTMLIFrameElement {
};
partial interface HTMLIFrameElement {
// nsIDOMGetSVGDocument
// GetSVGDocument
Document? getSVGDocument();
};

2
dom/webidl/HTMLObjectElement.webidl
View File

@ -71,7 +71,7 @@ partial interface HTMLObjectElement {
};
partial interface HTMLObjectElement {
// nsIDOMGetSVGDocument
// GetSVGDocument
Document? getSVGDocument();
};