Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-14 22:05:44 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1433566 part 13. Remove nsIDOMText. r=mystor

Browse Source 
MozReview-Commit-ID: DvaZ96j5exf
This commit is contained in:
Boris Zbarsky 2018-03-19 15:15:39 -04:00
parent 2a8f76304f
commit 46cdbdc51b
15 changed files with 10 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
dom/base/Attr.h
View File

@ -14,7 +14,6 @@
#include "mozilla/Attributes.h"
#include "nsIAttribute.h"
#include "nsIDOMNode.h"
#include "nsIDOMText.h"
#include "nsIDOMNodeList.h"
#include "nsString.h"
#include "nsCOMPtr.h"

2
dom/base/Selection.cpp
View File

@ -42,8 +42,6 @@
#include "nsBidiPresUtils.h"
#include "nsTextFrame.h"
#include "nsIDOMText.h"
#include "nsContentUtils.h"
#include "nsThreadUtils.h"

1
dom/base/nsDocument.cpp
View File

@ -73,7 +73,6 @@
#include "nsITabChild.h"
#include "nsRange.h"
#include "nsIDOMText.h"
#include "nsIDOMComment.h"
#include "mozilla/dom/DocumentType.h"
#include "mozilla/dom/NodeIterator.h"

1
dom/base/nsDocumentEncoder.cpp
View File

@ -21,7 +21,6 @@
#include "mozilla/Encoding.h"
#include "nsIOutputStream.h"
#include "nsIDOMElement.h"
#include "nsIDOMText.h"
#include "nsIDOMComment.h"
#include "nsIDOMProcessingInstruction.h"
#include "nsIDOMNodeList.h"

3
dom/base/nsGenericDOMDataNode.cpp
View File

@ -5,7 +5,7 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
/*
* Base class for DOM Core's nsIDOMComment, DocumentType, nsIDOMText,
* Base class for DOM Core's nsIDOMComment, DocumentType, Text,
* CDATASection and nsIDOMProcessingInstruction nodes.
*/
@ -23,7 +23,6 @@
#include "mozilla/InternalMutationEvent.h"
#include "nsIURI.h"
#include "nsIDOMEvent.h"
#include "nsIDOMText.h"
#include "nsCOMPtr.h"
#include "nsDOMString.h"
#include "nsChangeHint.h"

3
dom/base/nsGenericDOMDataNode.h
View File

@ -5,7 +5,7 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
/*
* Base class for DOM Core's nsIDOMComment, DocumentType, nsIDOMText,
* Base class for DOM Core's nsIDOMComment, DocumentType, Text,
* CDATASection, and nsIDOMProcessingInstruction nodes.
*/
@ -24,7 +24,6 @@
#include "mozilla/dom/ShadowRoot.h"
class nsIDocument;
class nsIDOMText;
namespace mozilla {
namespace dom {

4
dom/base/nsTextNode.cpp
View File

@ -5,7 +5,7 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
/*
* Implementation of DOM Core's nsIDOMText node.
* Implementation of DOM Core's Text node.
*/
#include "nsTextNode.h"
@ -100,7 +100,7 @@ nsTextNode::~nsTextNode()
// Use the CC variant of this, even though this class does not define
// a new CC participant, to make QIing to the CC interfaces faster.
NS_IMPL_ISUPPORTS_CYCLE_COLLECTION_INHERITED(nsTextNode, nsGenericDOMDataNode, nsIDOMNode,
nsIDOMText, nsIDOMCharacterData)
nsIDOMCharacterData)
JSObject*
nsTextNode::WrapNode(JSContext *aCx, JS::Handle<JSObject*> aGivenProto)

9
dom/base/nsTextNode.h
View File

@ -8,12 +8,12 @@
#define nsTextNode_h
/*
* Implementation of DOM Core's nsIDOMText node.
* Implementation of DOM Core's Text node.
*/
#include "mozilla/Attributes.h"
#include "mozilla/dom/Text.h"
#include "nsIDOMText.h"
#include "nsIDOMCharacterData.h"
#include "nsDebug.h"
class nsNodeInfoManager;
@ -22,7 +22,7 @@ class nsNodeInfoManager;
* Class used to implement DOM text nodes
*/
class nsTextNode : public mozilla::dom::Text,
public nsIDOMText
public nsIDOMCharacterData
{
private:
void Init()
@ -51,9 +51,6 @@ public:
NS_FORWARD_NSIDOMCHARACTERDATA(nsGenericDOMDataNode::)
using nsGenericDOMDataNode::SetData; // Prevent hiding overloaded virtual function.
// nsIDOMText
NS_FORWARD_NSIDOMTEXT(nsGenericDOMDataNode::)
// nsINode
virtual bool IsNodeOfType(uint32_t aFlags) const override;

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

@ -24,7 +24,6 @@ interface nsIDOMElement;
interface nsIDOMNode;
interface nsIDOMNodeList;
interface nsIDOMProcessingInstruction;
interface nsIDOMText;
// Needed for raises() in our IDL
%{C++

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

@ -18,7 +18,6 @@ XPIDL_SOURCES += [
'nsIDOMNodeList.idl',
'nsIDOMNSEditableElement.idl',
'nsIDOMProcessingInstruction.idl',
'nsIDOMText.idl',
'nsIDOMXMLDocument.idl',
]

19
dom/interfaces/core/nsIDOMText.idl
View File

@ -1,19 +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 "nsIDOMCharacterData.idl"
/**
* The nsIDOMText interface inherits from nsIDOMCharacterData and represents
* the textual content (termed character data in XML) of an Element or Attr.
*
* For more information on this interface please see
* http://dvcs.w3.org/hg/domcore/raw-file/tip/Overview.html
*/
[uuid(67273994-6aff-4091-9de9-b788a249f783)]
interface nsIDOMText : nsIDOMCharacterData
{
};

2
dom/xml/CDATASection.cpp
View File

@ -16,7 +16,7 @@ CDATASection::~CDATASection()
}
NS_IMPL_ISUPPORTS_INHERITED(CDATASection, nsGenericDOMDataNode, nsIDOMNode,
nsIDOMCharacterData, nsIDOMText)
nsIDOMCharacterData)
JSObject*
CDATASection::WrapNode(JSContext *aCx, JS::Handle<JSObject*> aGivenProto)

6
dom/xml/CDATASection.h
View File

@ -9,12 +9,13 @@
#include "mozilla/Attributes.h"
#include "mozilla/dom/Text.h"
#include "nsIDOMCharacterData.h"
namespace mozilla {
namespace dom {
class CDATASection final : public Text,
public nsIDOMText
public nsIDOMCharacterData
{
private:
void Init()
@ -47,9 +48,6 @@ public:
NS_FORWARD_NSIDOMCHARACTERDATA(nsGenericDOMDataNode::)
using nsGenericDOMDataNode::SetData; // Prevent hiding overloaded virtual function.
// nsIDOMText
NS_FORWARD_NSIDOMTEXT(nsGenericDOMDataNode::)
// nsINode
virtual bool IsNodeOfType(uint32_t aFlags) const override;

1
dom/xslt/xslt/txMozillaXSLTProcessor.cpp
View File

@ -9,7 +9,6 @@
#include "nsIChannel.h"
#include "mozilla/dom/Element.h"
#include "nsIDOMElement.h"
#include "nsIDOMText.h"
#include "nsIDocument.h"
#include "nsIDOMDocument.h"
#include "nsIDOMDocumentFragment.h"

3
xpcom/reflect/xptinfo/ShimInterfaceInfo.cpp
View File

@ -37,7 +37,6 @@
#include "nsIDOMScreen.h"
#include "nsIDOMScrollAreaEvent.h"
#include "nsIDOMSerializer.h"
#include "nsIDOMText.h"
#include "nsIDOMUIEvent.h"
#include "nsIDOMWheelEvent.h"
#include "nsIDOMXMLDocument.h"
@ -97,7 +96,6 @@
#include "mozilla/dom/StyleSheetBinding.h"
#include "mozilla/dom/StyleSheetListBinding.h"
#include "mozilla/dom/SVGElementBinding.h"
#include "mozilla/dom/TextBinding.h"
#include "mozilla/dom/TimeEventBinding.h"
#include "mozilla/dom/TreeBoxObjectBinding.h"
#include "mozilla/dom/UIEventBinding.h"
@ -195,7 +193,6 @@ const ComponentsInterfaceShimEntry kComponentsInterfaceShimMap[] =
DEFINE_SHIM(Screen),
DEFINE_SHIM(ScrollAreaEvent),
DEFINE_SHIM_WITH_CUSTOM_INTERFACE(nsIDOMSerializer, XMLSerializer),
DEFINE_SHIM(Text),
DEFINE_SHIM_WITH_CUSTOM_INTERFACE(nsITreeBoxObject, TreeBoxObject),
DEFINE_SHIM(UIEvent),
DEFINE_SHIM_WITH_CUSTOM_INTERFACE(nsIWebBrowserPersistable, FrameLoader),