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

Bug 737976: Remove nsINodeInfo. r=smaug 

--HG--
rename : content/base/src/nsNodeInfo.cpp => dom/base/NodeInfo.cpp
rename : content/base/public/nsINodeInfo.h => dom/base/NodeInfo.h
rename : content/base/src/nsNodeInfo.h => dom/base/NodeInfoInlines.h
This commit is contained in:
Kyle Huey 2014-06-19 19:01:40 -07:00
Родитель 954885e61c
Коммит b1e3198eed
355 изменённых файлов: 1166 добавлений и 1165 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

4
accessible/src/windows/msaa/AccessibleWrap.cpp
Просмотреть файл

@ -29,7 +29,7 @@
#include "nsIMutableArray.h"
#include "nsIFrame.h"
#include "nsIScrollableFrame.h"
#include "nsINodeInfo.h"
#include "mozilla/dom/NodeInfo.h"
#include "nsIServiceManager.h"
#include "nsNameSpaceManager.h"
#include "nsTextFormatter.h"
@ -416,7 +416,7 @@ AccessibleWrap::get_accRole(
if (!document)
return E_FAIL;
nsINodeInfo *nodeInfo = content->NodeInfo();
dom::NodeInfo *nodeInfo = content->NodeInfo();
nodeInfo->GetName(roleString);
// Only append name space if different from that of current document.

19
content/base/public/Element.h
Просмотреть файл

@ -42,7 +42,6 @@ class nsIFrame;
class nsIDOMMozNamedAttrMap;
class nsIDOMCSSStyleDeclaration;
class nsIURI;
class nsINodeInfo;
class nsIControllers;
class nsEventChainVisitor;
class nsIScrollableFrame;
@ -125,7 +124,7 @@ class Element : public FragmentOrElement
{
public:
#ifdef MOZILLA_INTERNAL_API
Element(already_AddRefed<nsINodeInfo>& aNodeInfo) :
Element(already_AddRefed<mozilla::dom::NodeInfo>& aNodeInfo) :
FragmentOrElement(aNodeInfo),
mState(NS_EVENT_STATE_MOZ_READONLY)
{
@ -424,7 +423,7 @@ public:
* @param aStr the unparsed attribute string
* @return the node info. May be nullptr.
*/
already_AddRefed<nsINodeInfo>
already_AddRefed<mozilla::dom::NodeInfo>
GetExistingAttrNameFromQName(const nsAString& aStr) const;
nsresult SetAttr(int32_t aNameSpaceID, nsIAtom* aName,
@ -898,7 +897,7 @@ public:
*/
virtual nsAttrInfo GetAttrInfo(int32_t aNamespaceID, nsIAtom* aName) const;
virtual void NodeInfoChanged(nsINodeInfo* aOldNodeInfo)
virtual void NodeInfoChanged(mozilla::dom::NodeInfo* aOldNodeInfo)
{
}
@ -1277,11 +1276,11 @@ inline bool nsINode::HasAttributes() const
*/
#define NS_IMPL_ELEMENT_CLONE(_elementName) \
nsresult \
_elementName::Clone(nsINodeInfo *aNodeInfo, nsINode **aResult) const \
_elementName::Clone(mozilla::dom::NodeInfo *aNodeInfo, nsINode **aResult) const \
{ \
*aResult = nullptr; \
already_AddRefed<nsINodeInfo> ni = \
nsCOMPtr<nsINodeInfo>(aNodeInfo).forget(); \
already_AddRefed<mozilla::dom::NodeInfo> ni = \
nsRefPtr<mozilla::dom::NodeInfo>(aNodeInfo).forget(); \
_elementName *it = new _elementName(ni); \
if (!it) { \
return NS_ERROR_OUT_OF_MEMORY; \
@ -1298,11 +1297,11 @@ _elementName::Clone(nsINodeInfo *aNodeInfo, nsINode **aResult) const \
#define NS_IMPL_ELEMENT_CLONE_WITH_INIT(_elementName) \
nsresult \
_elementName::Clone(nsINodeInfo *aNodeInfo, nsINode **aResult) const \
_elementName::Clone(mozilla::dom::NodeInfo *aNodeInfo, nsINode **aResult) const \
{ \
*aResult = nullptr; \
already_AddRefed<nsINodeInfo> ni = \
nsCOMPtr<nsINodeInfo>(aNodeInfo).forget(); \
already_AddRefed<mozilla::dom::NodeInfo> ni = \
nsRefPtr<mozilla::dom::NodeInfo>(aNodeInfo).forget(); \
_elementName *it = new _elementName(ni); \
if (!it) { \
return NS_ERROR_OUT_OF_MEMORY; \

5
content/base/public/FragmentOrElement.h
Просмотреть файл

@ -31,7 +31,6 @@ class nsIControllers;
class nsICSSDeclaration;
class nsIDocument;
class nsDOMStringMap;
class nsINodeInfo;
class nsIURI;
namespace mozilla {
@ -171,8 +170,8 @@ class UndoManager;
class FragmentOrElement : public nsIContent
{
public:
FragmentOrElement(already_AddRefed<nsINodeInfo>& aNodeInfo);
FragmentOrElement(already_AddRefed<nsINodeInfo>&& aNodeInfo);
FragmentOrElement(already_AddRefed<mozilla::dom::NodeInfo>& aNodeInfo);
FragmentOrElement(already_AddRefed<mozilla::dom::NodeInfo>&& aNodeInfo);
virtual ~FragmentOrElement();
NS_DECL_CYCLE_COLLECTING_ISUPPORTS

1
content/base/public/moz.build
Просмотреть файл

@ -55,7 +55,6 @@ EXPORTS += [
'nsIDocumentObserver.h',
'nsIMutationObserver.h',
'nsINode.h',
'nsINodeInfo.h',
'nsINodeList.h',
'nsIScriptElement.h',
'nsIStyleSheetLinkingElement.h',

20
content/base/public/nsContentCreatorFunctions.h
Просмотреть файл

@ -17,7 +17,6 @@
class nsAString;
class nsIContent;
class nsINodeInfo;
class imgRequestProxy;
class nsNodeInfoManager;
class nsGenericHTMLElement;
@ -25,52 +24,53 @@ class nsGenericHTMLElement;
namespace mozilla {
namespace dom {
class Element;
class NodeInfo;
} // namespace dom
} // namespace mozilla
nsresult
NS_NewElement(mozilla::dom::Element** aResult,
already_AddRefed<nsINodeInfo>&& aNodeInfo,
already_AddRefed<mozilla::dom::NodeInfo>&& aNodeInfo,
mozilla::dom::FromParser aFromParser);
nsresult
NS_NewXMLElement(mozilla::dom::Element** aResult,
already_AddRefed<nsINodeInfo>&& aNodeInfo);
already_AddRefed<mozilla::dom::NodeInfo>&& aNodeInfo);
nsresult
NS_NewHTMLElement(mozilla::dom::Element** aResult,
already_AddRefed<nsINodeInfo>&& aNodeInfo,
already_AddRefed<mozilla::dom::NodeInfo>&& aNodeInfo,
mozilla::dom::FromParser aFromParser);
// First argument should be nsHTMLTag, but that adds dependency to parser
// for a bunch of files.
already_AddRefed<nsGenericHTMLElement>
CreateHTMLElement(uint32_t aNodeType,
already_AddRefed<nsINodeInfo>&& aNodeInfo,
already_AddRefed<mozilla::dom::NodeInfo>&& aNodeInfo,
mozilla::dom::FromParser aFromParser);
nsresult
NS_NewMathMLElement(mozilla::dom::Element** aResult,
already_AddRefed<nsINodeInfo>&& aNodeInfo);
already_AddRefed<mozilla::dom::NodeInfo>&& aNodeInfo);
#ifdef MOZ_XUL
nsresult
NS_NewXULElement(mozilla::dom::Element** aResult,
already_AddRefed<nsINodeInfo>&& aNodeInfo);
already_AddRefed<mozilla::dom::NodeInfo>&& aNodeInfo);
void
NS_TrustedNewXULElement(nsIContent** aResult,
already_AddRefed<nsINodeInfo>&& aNodeInfo);
already_AddRefed<mozilla::dom::NodeInfo>&& aNodeInfo);
#endif
nsresult
NS_NewSVGElement(mozilla::dom::Element** aResult,
already_AddRefed<nsINodeInfo>&& aNodeInfo,
already_AddRefed<mozilla::dom::NodeInfo>&& aNodeInfo,
mozilla::dom::FromParser aFromParser);
nsresult
NS_NewGenConImageContent(nsIContent** aResult,
already_AddRefed<nsINodeInfo>&& aNodeInfo,
already_AddRefed<mozilla::dom::NodeInfo>&& aNodeInfo,
imgRequestProxy* aImageRequest);
#endif // nsContentCreatorFunctions_h__

8
content/base/public/nsContentUtils.h
Просмотреть файл

@ -69,7 +69,6 @@ class nsIIOService;
class nsIJSRuntimeService;
class nsILineBreaker;
class nsNameSpaceManager;
class nsINodeInfo;
class nsIObserver;
class nsIParser;
class nsIParserService;
@ -114,6 +113,7 @@ namespace dom {
class DocumentFragment;
class Element;
class EventTarget;
class NodeInfo;
class Selection;
} // namespace dom
@ -538,7 +538,7 @@ public:
const nsAString& aQualifiedName,
nsNodeInfoManager* aNodeInfoManager,
uint16_t aNodeType,
nsINodeInfo** aNodeInfo);
mozilla::dom::NodeInfo** aNodeInfo);
static void SplitExpatName(const char16_t *aExpatName, nsIAtom **aPrefix,
nsIAtom **aTagName, int32_t *aNameSpaceID);
@ -704,8 +704,8 @@ public:
* Convenience method to create a new nodeinfo that differs only by name
* from aNodeInfo.
*/
static nsresult NameChanged(nsINodeInfo* aNodeInfo, nsIAtom* aName,
nsINodeInfo** aResult);
static nsresult NameChanged(mozilla::dom::NodeInfo* aNodeInfo, nsIAtom* aName,
mozilla::dom::NodeInfo** aResult);
/**
* Returns the appropriate event argument names for the specified

4
content/base/public/nsIAttribute.h
Просмотреть файл

@ -27,7 +27,7 @@ public:
return mAttrMap;
}
nsINodeInfo *NodeInfo() const
mozilla::dom::NodeInfo *NodeInfo() const
{
return mNodeInfo;
}
@ -41,7 +41,7 @@ public:
protected:
#ifdef MOZILLA_INTERNAL_API
nsIAttribute(nsDOMAttributeMap *aAttrMap,
already_AddRefed<nsINodeInfo>& aNodeInfo,
already_AddRefed<mozilla::dom::NodeInfo>& aNodeInfo,
bool aNsAware);
#endif //MOZILLA_INTERNAL_API
virtual ~nsIAttribute();

4
content/base/public/nsIContent.h
Просмотреть файл

@ -54,7 +54,7 @@ public:
// If you're using the external API, the only thing you can know about
// nsIContent is that it exists with an IID
nsIContent(already_AddRefed<nsINodeInfo>& aNodeInfo)
nsIContent(already_AddRefed<mozilla::dom::NodeInfo>& aNodeInfo)
: nsINode(aNodeInfo)
{
MOZ_ASSERT(mNodeInfo);
@ -264,7 +264,7 @@ public:
* Get the NodeInfo for this element
* @return the nodes node info
*/
inline nsINodeInfo* NodeInfo() const
inline mozilla::dom::NodeInfo* NodeInfo() const
{
return mNodeInfo;
}

8
content/base/public/nsINode.h
Просмотреть файл

@ -10,7 +10,7 @@
#include "nsCOMPtr.h" // for member, local
#include "nsGkAtoms.h" // for nsGkAtoms::baseURIProperty
#include "nsIDOMNode.h"
#include "nsINodeInfo.h" // member (in nsCOMPtr)
#include "mozilla/dom/NodeInfo.h" // member (in nsCOMPtr)
#include "nsIVariant.h" // for use in GetUserData()
#include "nsNodeInfoManager.h" // for use in NodePrincipal()
#include "nsPropertyTable.h" // for typedefs
@ -338,7 +338,7 @@ public:
friend class nsAttrAndChildArray;
#ifdef MOZILLA_INTERNAL_API
nsINode(already_AddRefed<nsINodeInfo>& aNodeInfo)
nsINode(already_AddRefed<mozilla::dom::NodeInfo>& aNodeInfo)
: mNodeInfo(aNodeInfo),
mParent(nullptr),
mBoolFlags(0),
@ -899,7 +899,7 @@ public:
* @param aNodeInfo the nodeinfo to use for the clone
* @param aResult the clone
*/
virtual nsresult Clone(nsINodeInfo *aNodeInfo, nsINode **aResult) const = 0;
virtual nsresult Clone(mozilla::dom::NodeInfo *aNodeInfo, nsINode **aResult) const = 0;
// This class can be extended by subclasses that wish to store more
// information in the slots.
@ -1808,7 +1808,7 @@ protected:
static bool Traverse(nsINode *tmp, nsCycleCollectionTraversalCallback &cb);
static void Unlink(nsINode *tmp);
nsCOMPtr<nsINodeInfo> mNodeInfo;
nsRefPtr<mozilla::dom::NodeInfo> mNodeInfo;
nsINode* mParent;

18
content/base/public/nsNameSpaceManager.h
Просмотреть файл

@ -14,24 +14,6 @@
class nsIAtom;
class nsAString;
#define kNameSpaceID_Unknown -1
// 0 is special at C++, so use a static const int32_t for
// kNameSpaceID_None to keep if from being cast to pointers
// Note that the XBL cache assumes (and asserts) that it can treat a
// single-byte value higher than kNameSpaceID_LastBuiltin specially.
static const int32_t kNameSpaceID_None = 0;
#define kNameSpaceID_XMLNS 1 // not really a namespace, but it needs to play the game
#define kNameSpaceID_XML 2
#define kNameSpaceID_XHTML 3
#define kNameSpaceID_XLink 4
#define kNameSpaceID_XSLT 5
#define kNameSpaceID_XBL 6
#define kNameSpaceID_MathML 7
#define kNameSpaceID_RDF 8
#define kNameSpaceID_XUL 9
#define kNameSpaceID_SVG 10
#define kNameSpaceID_LastBuiltin 10 // last 'built-in' namespace
class nsNameSpaceKey : public PLDHashEntryHdr
{
public:

10
content/base/src/Attr.cpp
Просмотреть файл

@ -28,7 +28,7 @@
#include "nsWrapperCacheInlines.h"
nsIAttribute::nsIAttribute(nsDOMAttributeMap* aAttrMap,
already_AddRefed<nsINodeInfo>& aNodeInfo,
already_AddRefed<mozilla::dom::NodeInfo>& aNodeInfo,
bool aNsAware)
: nsINode(aNodeInfo), mAttrMap(aAttrMap), mNsAware(aNsAware)
{
@ -45,7 +45,7 @@ namespace dom {
bool Attr::sInitialized;
Attr::Attr(nsDOMAttributeMap *aAttrMap,
already_AddRefed<nsINodeInfo>&& aNodeInfo,
already_AddRefed<mozilla::dom::NodeInfo>&& aNodeInfo,
const nsAString &aValue, bool aNsAware)
: nsIAttribute(aAttrMap, aNodeInfo, aNsAware), mValue(aValue)
{
@ -148,7 +148,7 @@ Attr::SetOwnerDocument(nsIDocument* aDocument)
NS_ASSERTION(doc != aDocument, "bad call to Attr::SetOwnerDocument");
doc->DeleteAllPropertiesFor(this);
nsCOMPtr<nsINodeInfo> newNodeInfo;
nsRefPtr<mozilla::dom::NodeInfo> newNodeInfo;
newNodeInfo = aDocument->NodeInfoManager()->
GetNodeInfo(mNodeInfo->NameAtom(), mNodeInfo->GetPrefixAtom(),
mNodeInfo->NamespaceID(),
@ -277,12 +277,12 @@ Attr::SetNodeValueInternal(const nsAString& aNodeValue, ErrorResult& aError)
}
nsresult
Attr::Clone(nsINodeInfo *aNodeInfo, nsINode **aResult) const
Attr::Clone(mozilla::dom::NodeInfo *aNodeInfo, nsINode **aResult) const
{
nsAutoString value;
const_cast<Attr*>(this)->GetValue(value);
nsCOMPtr<nsINodeInfo> ni = aNodeInfo;
nsRefPtr<mozilla::dom::NodeInfo> ni = aNodeInfo;
*aResult = new Attr(nullptr, ni.forget(), value, mNsAware);
if (!*aResult) {
return NS_ERROR_OUT_OF_MEMORY;

5
content/base/src/Attr.h
Просмотреть файл

@ -17,7 +17,6 @@
#include "nsIDOMNodeList.h"
#include "nsString.h"
#include "nsCOMPtr.h"
#include "nsINodeInfo.h"
#include "nsCycleCollectionParticipant.h"
#include "nsStubMutationObserver.h"
#include "nsIDocument.h"
@ -33,7 +32,7 @@ class Attr MOZ_FINAL : public nsIAttribute,
{
public:
Attr(nsDOMAttributeMap* aAttrMap,
already_AddRefed<nsINodeInfo>&& aNodeInfo,
already_AddRefed<mozilla::dom::NodeInfo>&& aNodeInfo,
const nsAString& aValue,
bool aNsAware);
virtual ~Attr() {}
@ -68,7 +67,7 @@ public:
virtual nsresult InsertChildAt(nsIContent* aKid, uint32_t aIndex,
bool aNotify) MOZ_OVERRIDE;
virtual void RemoveChildAt(uint32_t aIndex, bool aNotify) MOZ_OVERRIDE;
virtual nsresult Clone(nsINodeInfo *aNodeInfo, nsINode **aResult) const MOZ_OVERRIDE;
virtual nsresult Clone(mozilla::dom::NodeInfo *aNodeInfo, nsINode **aResult) const MOZ_OVERRIDE;
virtual already_AddRefed<nsIURI> GetBaseURI(bool aTryUseXHRDocBaseURI = false) const MOZ_OVERRIDE;
static void Initialize();

4
content/base/src/Comment.cpp
Просмотреть файл

@ -32,9 +32,9 @@ Comment::IsNodeOfType(uint32_t aFlags) const
}
nsGenericDOMDataNode*
Comment::CloneDataNode(nsINodeInfo *aNodeInfo, bool aCloneText) const
Comment::CloneDataNode(mozilla::dom::NodeInfo *aNodeInfo, bool aCloneText) const
{
nsCOMPtr<nsINodeInfo> ni = aNodeInfo;
nsRefPtr<mozilla::dom::NodeInfo> ni = aNodeInfo;
Comment *it = new Comment(ni.forget());
if (it && aCloneText) {
it->mText = mText;

4
content/base/src/Comment.h
Просмотреть файл

@ -24,7 +24,7 @@ private:
}
public:
Comment(already_AddRefed<nsINodeInfo>&& aNodeInfo)
Comment(already_AddRefed<mozilla::dom::NodeInfo>&& aNodeInfo)
: nsGenericDOMDataNode(aNodeInfo)
{
Init();
@ -54,7 +54,7 @@ public:
// nsINode
virtual bool IsNodeOfType(uint32_t aFlags) const;
virtual nsGenericDOMDataNode* CloneDataNode(nsINodeInfo *aNodeInfo,
virtual nsGenericDOMDataNode* CloneDataNode(mozilla::dom::NodeInfo *aNodeInfo,
bool aCloneText) const MOZ_OVERRIDE;
virtual nsIDOMNode* AsDOMNode() MOZ_OVERRIDE { return this; }

2
content/base/src/DirectionalityUtils.cpp
Просмотреть файл

@ -235,7 +235,7 @@ using mozilla::dom::Element;
static bool
DoesNotParticipateInAutoDirection(const Element* aElement)
{
nsINodeInfo* nodeInfo = aElement->NodeInfo();
mozilla::dom::NodeInfo* nodeInfo = aElement->NodeInfo();
return (!aElement->IsHTML() ||
nodeInfo->Equals(nsGkAtoms::script) ||
nodeInfo->Equals(nsGkAtoms::style) ||

2
content/base/src/DocumentFragment.cpp
Просмотреть файл

@ -9,7 +9,7 @@
#include "mozilla/dom/DocumentFragment.h"
#include "mozilla/dom/Element.h" // for NS_IMPL_ELEMENT_CLONE
#include "nsINodeInfo.h"
#include "mozilla/dom/NodeInfo.h"
#include "nsNodeInfoManager.h"
#include "nsError.h"
#include "nsGkAtoms.h"

5
content/base/src/DocumentFragment.h
Просмотреть файл

@ -11,7 +11,6 @@
#include "mozilla/dom/FragmentOrElement.h"
#include "nsIDOMDocumentFragment.h"
class nsINodeInfo;
class nsIAtom;
class nsAString;
class nsIDocument;
@ -51,7 +50,7 @@ public:
// interface nsIDOMDocumentFragment
NS_DECL_NSIDOMDOCUMENTFRAGMENT
DocumentFragment(already_AddRefed<nsINodeInfo>& aNodeInfo)
DocumentFragment(already_AddRefed<mozilla::dom::NodeInfo>& aNodeInfo)
: FragmentOrElement(aNodeInfo), mHost(nullptr)
{
Init();
@ -141,7 +140,7 @@ public:
#endif
protected:
nsresult Clone(nsINodeInfo *aNodeInfo, nsINode **aResult) const MOZ_OVERRIDE;
nsresult Clone(mozilla::dom::NodeInfo *aNodeInfo, nsINode **aResult) const MOZ_OVERRIDE;
nsIContent* mHost; // Weak
};

8
content/base/src/DocumentType.cpp
Просмотреть файл

@ -45,7 +45,7 @@ NS_NewDOMDocumentType(nsNodeInfoManager* aNodeInfoManager,
return nullptr;
}
already_AddRefed<nsINodeInfo> ni =
already_AddRefed<mozilla::dom::NodeInfo> ni =
aNodeInfoManager->GetNodeInfo(nsGkAtoms::documentTypeNodeName, nullptr,
kNameSpaceID_None,
nsIDOMNode::DOCUMENT_TYPE_NODE,
@ -65,7 +65,7 @@ DocumentType::WrapNode(JSContext *cx)
return DocumentTypeBinding::Wrap(cx, this);
}
DocumentType::DocumentType(already_AddRefed<nsINodeInfo>& aNodeInfo,
DocumentType::DocumentType(already_AddRefed<mozilla::dom::NodeInfo>& aNodeInfo,
const nsAString& aPublicId,
const nsAString& aSystemId,
const nsAString& aInternalSubset) :
@ -139,9 +139,9 @@ DocumentType::MozRemove()
}
nsGenericDOMDataNode*
DocumentType::CloneDataNode(nsINodeInfo *aNodeInfo, bool aCloneText) const
DocumentType::CloneDataNode(mozilla::dom::NodeInfo *aNodeInfo, bool aCloneText) const
{
already_AddRefed<nsINodeInfo> ni = nsCOMPtr<nsINodeInfo>(aNodeInfo).forget();
already_AddRefed<mozilla::dom::NodeInfo> ni = nsRefPtr<mozilla::dom::NodeInfo>(aNodeInfo).forget();
return new DocumentType(ni, mPublicId, mSystemId, mInternalSubset);
}

6
content/base/src/DocumentType.h
Просмотреть файл

@ -29,7 +29,7 @@ class DocumentTypeForward : public nsGenericDOMDataNode,
public nsIDOMDocumentType
{
public:
DocumentTypeForward(already_AddRefed<nsINodeInfo>& aNodeInfo)
DocumentTypeForward(already_AddRefed<mozilla::dom::NodeInfo>& aNodeInfo)
: nsGenericDOMDataNode(aNodeInfo)
{
}
@ -41,7 +41,7 @@ public:
class DocumentType MOZ_FINAL : public DocumentTypeForward
{
public:
DocumentType(already_AddRefed<nsINodeInfo>& aNodeInfo,
DocumentType(already_AddRefed<mozilla::dom::NodeInfo>& aNodeInfo,
const nsAString& aPublicId,
const nsAString& aSystemId,
const nsAString& aInternalSubset);
@ -71,7 +71,7 @@ public:
// nsIContent overrides
virtual const nsTextFragment* GetText() MOZ_OVERRIDE;
virtual nsGenericDOMDataNode* CloneDataNode(nsINodeInfo *aNodeInfo,
virtual nsGenericDOMDataNode* CloneDataNode(mozilla::dom::NodeInfo *aNodeInfo,
bool aCloneText) const MOZ_OVERRIDE;
virtual nsIDOMNode* AsDOMNode() MOZ_OVERRIDE { return this; }

14
content/base/src/Element.cpp
Просмотреть файл

@ -17,7 +17,7 @@
#include "nsDOMAttributeMap.h"
#include "nsIAtom.h"
#include "nsIContentInlines.h"
#include "nsINodeInfo.h"
#include "mozilla/dom/NodeInfo.h"
#include "nsIDocumentInlines.h"
#include "nsIDOMNodeList.h"
#include "nsIDOMDocument.h"
@ -788,7 +788,7 @@ Element::CreateShadowRoot(ErrorResult& aError)
{
nsAutoScriptBlocker scriptBlocker;
nsCOMPtr<nsINodeInfo> nodeInfo;
nsRefPtr<mozilla::dom::NodeInfo> nodeInfo;
nodeInfo = mNodeInfo->NodeInfoManager()->GetNodeInfo(
nsGkAtoms::documentFragmentNodeName, nullptr, kNameSpaceID_None,
nsIDOMNode::DOCUMENT_FRAGMENT_NODE);
@ -1046,7 +1046,7 @@ Element::SetAttributeNS(const nsAString& aNamespaceURI,
const nsAString& aValue,
ErrorResult& aError)
{
nsCOMPtr<nsINodeInfo> ni;
nsRefPtr<mozilla::dom::NodeInfo> ni;
aError =
nsContentUtils::GetNodeInfoFromQName(aNamespaceURI, aQualifiedName,
mNodeInfo->NodeInfoManager(),
@ -1621,7 +1621,7 @@ Element::FindAttributeDependence(const nsIAtom* aAttribute,
return false;
}
already_AddRefed<nsINodeInfo>
already_AddRefed<mozilla::dom::NodeInfo>
Element::GetExistingAttrNameFromQName(const nsAString& aStr) const
{
const nsAttrName* name = InternalGetExistingAttrNameFromQName(aStr);
@ -1629,7 +1629,7 @@ Element::GetExistingAttrNameFromQName(const nsAString& aStr) const
return nullptr;
}
nsCOMPtr<nsINodeInfo> nodeInfo;
nsRefPtr<mozilla::dom::NodeInfo> nodeInfo;
if (name->IsAtom()) {
nodeInfo = mNodeInfo->NodeInfoManager()->
GetNodeInfo(name->Atom(), nullptr, kNameSpaceID_None,
@ -2001,7 +2001,7 @@ Element::SetAttrAndNotify(int32_t aNamespaceID,
}
}
else {
nsCOMPtr<nsINodeInfo> ni;
nsRefPtr<mozilla::dom::NodeInfo> ni;
ni = mNodeInfo->NodeInfoManager()->GetNodeInfo(aName, aPrefix,
aNamespaceID,
nsIDOMNode::ATTRIBUTE_NODE);
@ -2925,7 +2925,7 @@ Element::SetOuterHTML(const nsAString& aOuterHTML, ErrorResult& aError)
} else {
NS_ASSERTION(parent->NodeType() == nsIDOMNode::DOCUMENT_FRAGMENT_NODE,
"How come the parent isn't a document, a fragment or an element?");
nsCOMPtr<nsINodeInfo> info =
nsRefPtr<mozilla::dom::NodeInfo> info =
OwnerDoc()->NodeInfoManager()->GetNodeInfo(nsGkAtoms::body,
nullptr,
kNameSpaceID_XHTML,

9
content/base/src/FragmentOrElement.cpp
Просмотреть файл

@ -24,7 +24,7 @@
#include "mozilla/dom/Attr.h"
#include "nsDOMAttributeMap.h"
#include "nsIAtom.h"
#include "nsINodeInfo.h"
#include "mozilla/dom/NodeInfo.h"
#include "nsIDocumentInlines.h"
#include "nsIDocumentEncoder.h"
#include "nsIDOMNodeList.h"
@ -631,12 +631,12 @@ FragmentOrElement::nsDOMSlots::SizeOfIncludingThis(MallocSizeOf aMallocSizeOf) c
return n;
}
FragmentOrElement::FragmentOrElement(already_AddRefed<nsINodeInfo>& aNodeInfo)
FragmentOrElement::FragmentOrElement(already_AddRefed<mozilla::dom::NodeInfo>& aNodeInfo)
: nsIContent(aNodeInfo)
{
}
FragmentOrElement::FragmentOrElement(already_AddRefed<nsINodeInfo>&& aNodeInfo)
FragmentOrElement::FragmentOrElement(already_AddRefed<mozilla::dom::NodeInfo>&& aNodeInfo)
: nsIContent(aNodeInfo)
{
}
@ -1858,7 +1858,8 @@ NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN_INTERNAL(FragmentOrElement)
if (!name->IsAtom()) {
NS_CYCLE_COLLECTION_NOTE_EDGE_NAME(cb,
"mAttrsAndChildren[i]->NodeInfo()");
cb.NoteXPCOMChild(name->NodeInfo());
cb.NoteNativeChild(name->NodeInfo(),
NS_CYCLE_COLLECTION_PARTICIPANT(NodeInfo));
}
}

2
content/base/src/ShadowRoot.cpp
Просмотреть файл

@ -65,7 +65,7 @@ NS_IMPL_ADDREF_INHERITED(ShadowRoot, DocumentFragment)
NS_IMPL_RELEASE_INHERITED(ShadowRoot, DocumentFragment)
ShadowRoot::ShadowRoot(nsIContent* aContent,
already_AddRefed<nsINodeInfo>&& aNodeInfo,
already_AddRefed<mozilla::dom::NodeInfo>&& aNodeInfo,
nsXBLPrototypeBinding* aProtoBinding)
: DocumentFragment(aNodeInfo), mPoolHost(aContent),
mProtoBinding(aProtoBinding), mShadowElement(nullptr),

3
content/base/src/ShadowRoot.h
Просмотреть файл

@ -16,7 +16,6 @@
class nsIAtom;
class nsIContent;
class nsIDocument;
class nsINodeInfo;
class nsPIDOMWindow;
class nsXBLPrototypeBinding;
class nsTagNameMapEntry;
@ -43,7 +42,7 @@ public:
NS_DECL_NSIMUTATIONOBSERVER_CONTENTINSERTED
NS_DECL_NSIMUTATIONOBSERVER_CONTENTREMOVED
ShadowRoot(nsIContent* aContent, already_AddRefed<nsINodeInfo>&& aNodeInfo,
ShadowRoot(nsIContent* aContent, already_AddRefed<mozilla::dom::NodeInfo>&& aNodeInfo,
nsXBLPrototypeBinding* aProtoBinding);
virtual ~ShadowRoot();

4
content/base/src/Text.h
Просмотреть файл

@ -15,11 +15,11 @@ namespace dom {
class Text : public nsGenericDOMDataNode
{
public:
Text(already_AddRefed<nsINodeInfo>& aNodeInfo)
Text(already_AddRefed<mozilla::dom::NodeInfo>& aNodeInfo)
: nsGenericDOMDataNode(aNodeInfo)
{}
Text(already_AddRefed<nsINodeInfo>&& aNodeInfo)
Text(already_AddRefed<mozilla::dom::NodeInfo>&& aNodeInfo)
: nsGenericDOMDataNode(aNodeInfo)
{}

1
content/base/src/moz.build
Просмотреть файл

@ -146,7 +146,6 @@ UNIFIED_SOURCES += [
'nsMixedContentBlocker.cpp',
'nsNameSpaceManager.cpp',
'nsNoDataProtocolContentPolicy.cpp',
'nsNodeInfo.cpp',
'nsNodeUtils.cpp',
'nsPlainTextSerializer.cpp',
'nsPropertyTable.cpp',

2
content/base/src/nsAttrAndChildArray.cpp
Просмотреть файл

@ -413,7 +413,7 @@ nsAttrAndChildArray::SetAndTakeAttr(nsIAtom* aLocalName, nsAttrValue& aValue)
}
nsresult
nsAttrAndChildArray::SetAndTakeAttr(nsINodeInfo* aName, nsAttrValue& aValue)
nsAttrAndChildArray::SetAndTakeAttr(mozilla::dom::NodeInfo* aName, nsAttrValue& aValue)
{
int32_t namespaceID = aName->NamespaceID();
nsIAtom* localName = aName->NameAtom();

2
content/base/src/nsAttrAndChildArray.h
Просмотреть файл

@ -88,7 +88,7 @@ public:
nsCaseTreatment aCaseSensitive) const;
const nsAttrValue* AttrAt(uint32_t aPos) const;
nsresult SetAndTakeAttr(nsIAtom* aLocalName, nsAttrValue& aValue);
nsresult SetAndTakeAttr(nsINodeInfo* aName, nsAttrValue& aValue);
nsresult SetAndTakeAttr(mozilla::dom::NodeInfo* aName, nsAttrValue& aValue);
// Remove the attr at position aPos. The value of the attr is placed in
// aValue; any value that was already in aValue is destroyed.

34
content/base/src/nsAttrName.h
Просмотреть файл

@ -12,7 +12,7 @@
#ifndef nsAttrName_h___
#define nsAttrName_h___
#include "nsINodeInfo.h"
#include "mozilla/dom/NodeInfo.h"
#include "nsIAtom.h"
#include "nsDOMString.h"
@ -33,7 +33,7 @@ public:
NS_ADDREF(aAtom);
}
explicit nsAttrName(nsINodeInfo* aNodeInfo)
explicit nsAttrName(mozilla::dom::NodeInfo* aNodeInfo)
{
NS_ASSERTION(aNodeInfo, "null nodeinfo-name in nsAttrName");
if (aNodeInfo->NamespaceEquals(kNameSpaceID_None)) {
@ -52,7 +52,7 @@ public:
ReleaseInternalName();
}
void SetTo(nsINodeInfo* aNodeInfo)
void SetTo(mozilla::dom::NodeInfo* aNodeInfo)
{
NS_ASSERTION(aNodeInfo, "null nodeinfo-name in nsAttrName");
@ -82,10 +82,10 @@ public:
return !(mBits & NS_ATTRNAME_NODEINFO_BIT);
}
nsINodeInfo* NodeInfo() const
mozilla::dom::NodeInfo* NodeInfo() const
{
NS_ASSERTION(!IsAtom(), "getting nodeinfo-value of atom-name");
return reinterpret_cast<nsINodeInfo*>(mBits & ~NS_ATTRNAME_NODEINFO_BIT);
return reinterpret_cast<mozilla::dom::NodeInfo*>(mBits & ~NS_ATTRNAME_NODEINFO_BIT);
}
nsIAtom* Atom() const
@ -119,7 +119,7 @@ public:
return !IsAtom() && NodeInfo()->Equals(aLocalName, aNamespaceID);
}
bool Equals(nsINodeInfo* aNodeInfo) const
bool Equals(mozilla::dom::NodeInfo* aNodeInfo) const
{
return Equals(aNodeInfo->NameAtom(), aNodeInfo->NamespaceID());
}
@ -191,22 +191,20 @@ private:
void AddRefInternalName()
{
// Since both nsINodeInfo and nsIAtom inherit nsISupports as its first
// interface we can safely assume that it's first in the vtable
nsISupports* name = reinterpret_cast<nsISupports *>
(mBits & ~NS_ATTRNAME_NODEINFO_BIT);
NS_ADDREF(name);
if (IsAtom()) {
NS_ADDREF(Atom());
} else {
NS_ADDREF(NodeInfo());
}
}
void ReleaseInternalName()
{
// Since both nsINodeInfo and nsIAtom inherit nsISupports as its first
// interface we can safely assume that it's first in the vtable
nsISupports* name = reinterpret_cast<nsISupports *>
(mBits & ~NS_ATTRNAME_NODEINFO_BIT);
NS_RELEASE(name);
if (IsAtom()) {
Atom()->Release();
} else {
NodeInfo()->Release();
}
}
uintptr_t mBits;

1
content/base/src/nsCSPService.h
Просмотреть файл

@ -10,6 +10,7 @@
#include "nsIContentPolicy.h"
#include "nsIChannel.h"
#include "nsIChannelEventSink.h"
#include "nsDataHashtable.h"
#define CSPSERVICE_CONTRACTID "@mozilla.org/cspservice;1"
#define CSPSERVICE_CID \

3
content/base/src/nsContentList.cpp
Просмотреть файл

@ -25,6 +25,7 @@
#include "nsGenericHTMLElement.h"
#include "jsfriendapi.h"
#include <algorithm>
#include "mozilla/dom/NodeInfoInlines.h"
// Form related includes
#include "nsIDOMHTMLFormElement.h"
@ -860,7 +861,7 @@ nsContentList::Match(Element *aElement)
if (!mXMLMatchAtom)
return false;
nsINodeInfo *ni = aElement->NodeInfo();
mozilla::dom::NodeInfo *ni = aElement->NodeInfo();
bool unknown = mMatchNameSpaceId == kNameSpaceID_Unknown;
bool wildcard = mMatchNameSpaceId == kNameSpaceID_Wildcard;

10
content/base/src/nsContentUtils.cpp
Просмотреть файл

@ -128,7 +128,7 @@
#include "nsIMemoryReporter.h"
#include "nsIMIMEService.h"
#include "nsINode.h"
#include "nsINodeInfo.h"
#include "mozilla/dom/NodeInfo.h"
#include "nsIObjectLoadingContent.h"
#include "nsIObserver.h"
#include "nsIObserverService.h"
@ -2761,7 +2761,7 @@ nsContentUtils::GetNodeInfoFromQName(const nsAString& aNamespaceURI,
const nsAString& aQualifiedName,
nsNodeInfoManager* aNodeInfoManager,
uint16_t aNodeType,
nsINodeInfo** aNodeInfo)
mozilla::dom::NodeInfo** aNodeInfo)
{
const nsAFlatString& qName = PromiseFlatString(aQualifiedName);
const char16_t* colon;
@ -3125,8 +3125,8 @@ nsContentUtils::IsDraggableLink(const nsIContent* aContent) {
// static
nsresult
nsContentUtils::NameChanged(nsINodeInfo* aNodeInfo, nsIAtom* aName,
nsINodeInfo** aResult)
nsContentUtils::NameChanged(mozilla::dom::NodeInfo* aNodeInfo, nsIAtom* aName,
mozilla::dom::NodeInfo** aResult)
{
nsNodeInfoManager *niMgr = aNodeInfo->NodeInfoManager();
@ -4185,7 +4185,7 @@ nsContentUtils::CreateContextualFragment(nsINode* aContextNode,
}
if (!setDefaultNamespace) {
nsINodeInfo* info = content->NodeInfo();
mozilla::dom::NodeInfo* info = content->NodeInfo();
if (!info->GetPrefixAtom() &&
info->NamespaceID() != kNameSpaceID_None) {
// We have no namespace prefix, but have a namespace ID. Push

26
content/base/src/nsDOMAttributeMap.cpp
Просмотреть файл

@ -157,7 +157,7 @@ nsDOMAttributeMap::DropAttribute(int32_t aNamespaceID, nsIAtom* aLocalName)
}
already_AddRefed<Attr>
nsDOMAttributeMap::RemoveAttribute(nsINodeInfo* aNodeInfo)
nsDOMAttributeMap::RemoveAttribute(mozilla::dom::NodeInfo* aNodeInfo)
{
NS_ASSERTION(aNodeInfo, "RemoveAttribute() called with aNodeInfo == nullptr!");
@ -169,7 +169,7 @@ nsDOMAttributeMap::RemoveAttribute(nsINodeInfo* aNodeInfo)
// As we are removing the attribute we need to set the current value in
// the attribute node.
mContent->GetAttr(aNodeInfo->NamespaceID(), aNodeInfo->NameAtom(), value);
nsCOMPtr<nsINodeInfo> ni = aNodeInfo;
nsRefPtr<mozilla::dom::NodeInfo> ni = aNodeInfo;
node = new Attr(nullptr, ni.forget(), value, true);
}
else {
@ -184,7 +184,7 @@ nsDOMAttributeMap::RemoveAttribute(nsINodeInfo* aNodeInfo)
}
Attr*
nsDOMAttributeMap::GetAttribute(nsINodeInfo* aNodeInfo, bool aNsAware)
nsDOMAttributeMap::GetAttribute(mozilla::dom::NodeInfo* aNodeInfo, bool aNsAware)
{
NS_ASSERTION(aNodeInfo, "GetAttribute() called with aNodeInfo == nullptr!");
@ -192,7 +192,7 @@ nsDOMAttributeMap::GetAttribute(nsINodeInfo* aNodeInfo, bool aNsAware)
Attr* node = mAttributeCache.GetWeak(attr);
if (!node) {
nsCOMPtr<nsINodeInfo> ni = aNodeInfo;
nsRefPtr<mozilla::dom::NodeInfo> ni = aNodeInfo;
nsRefPtr<Attr> newAttr =
new Attr(this, ni.forget(), EmptyString(), aNsAware);
mAttributeCache.Put(attr, newAttr);
@ -208,7 +208,7 @@ nsDOMAttributeMap::NamedGetter(const nsAString& aAttrName, bool& aFound)
aFound = false;
NS_ENSURE_TRUE(mContent, nullptr);
nsCOMPtr<nsINodeInfo> ni = mContent->GetExistingAttrNameFromQName(aAttrName);
nsRefPtr<mozilla::dom::NodeInfo> ni = mContent->GetExistingAttrNameFromQName(aAttrName);
if (!ni) {
return nullptr;
}
@ -300,7 +300,7 @@ nsDOMAttributeMap::SetNamedItemInternal(Attr& aAttr,
// Get nodeinfo and preexisting attribute (if it exists)
nsAutoString name;
nsCOMPtr<nsINodeInfo> ni;
nsRefPtr<mozilla::dom::NodeInfo> ni;
nsRefPtr<Attr> attr;
// SetNamedItemNS()
@ -374,7 +374,7 @@ nsDOMAttributeMap::RemoveNamedItem(const nsAString& aName, ErrorResult& aError)
return nullptr;
}
nsCOMPtr<nsINodeInfo> ni = mContent->GetExistingAttrNameFromQName(aName);
nsRefPtr<mozilla::dom::NodeInfo> ni = mContent->GetExistingAttrNameFromQName(aName);
if (!ni) {
aError.Throw(NS_ERROR_DOM_NOT_FOUND_ERR);
return nullptr;
@ -400,7 +400,7 @@ nsDOMAttributeMap::IndexedGetter(uint32_t aIndex, bool& aFound)
aFound = true;
// Don't use the nodeinfo even if one exists since it can have the wrong
// owner document.
nsCOMPtr<nsINodeInfo> ni = mContent->NodeInfo()->NodeInfoManager()->
nsRefPtr<mozilla::dom::NodeInfo> ni = mContent->NodeInfo()->NodeInfoManager()->
GetNodeInfo(name->LocalName(), name->GetPrefix(), name->NamespaceID(),
nsIDOMNode::ATTRIBUTE_NODE);
return GetAttribute(ni, true);
@ -449,7 +449,7 @@ Attr*
nsDOMAttributeMap::GetNamedItemNS(const nsAString& aNamespaceURI,
const nsAString& aLocalName)
{
nsCOMPtr<nsINodeInfo> ni = GetAttrNodeInfo(aNamespaceURI, aLocalName);
nsRefPtr<mozilla::dom::NodeInfo> ni = GetAttrNodeInfo(aNamespaceURI, aLocalName);
if (!ni) {
return nullptr;
}
@ -457,7 +457,7 @@ nsDOMAttributeMap::GetNamedItemNS(const nsAString& aNamespaceURI,
return GetAttribute(ni, true);
}
already_AddRefed<nsINodeInfo>
already_AddRefed<mozilla::dom::NodeInfo>
nsDOMAttributeMap::GetAttrNodeInfo(const nsAString& aNamespaceURI,
const nsAString& aLocalName)
{
@ -484,7 +484,7 @@ nsDOMAttributeMap::GetAttrNodeInfo(const nsAString& aNamespaceURI,
if (nameSpaceID == attrNS &&
nameAtom->Equals(aLocalName)) {
nsCOMPtr<nsINodeInfo> ni;
nsRefPtr<mozilla::dom::NodeInfo> ni;
ni = mContent->NodeInfo()->NodeInfoManager()->
GetNodeInfo(nameAtom, name->GetPrefix(), nameSpaceID,
nsIDOMNode::ATTRIBUTE_NODE);
@ -512,14 +512,14 @@ nsDOMAttributeMap::RemoveNamedItemNS(const nsAString& aNamespaceURI,
const nsAString& aLocalName,
ErrorResult& aError)
{
nsCOMPtr<nsINodeInfo> ni = GetAttrNodeInfo(aNamespaceURI, aLocalName);
nsRefPtr<mozilla::dom::NodeInfo> ni = GetAttrNodeInfo(aNamespaceURI, aLocalName);
if (!ni) {
aError.Throw(NS_ERROR_DOM_NOT_FOUND_ERR);
return nullptr;
}
nsRefPtr<Attr> attr = RemoveAttribute(ni);
nsINodeInfo* attrNi = attr->NodeInfo();
mozilla::dom::NodeInfo* attrNi = attr->NodeInfo();
mContent->UnsetAttr(attrNi->NamespaceID(), attrNi->NameAtom(), true);
return attr.forget();

7
content/base/src/nsDOMAttributeMap.h
Просмотреть файл

@ -20,7 +20,6 @@
#include "nsWrapperCache.h"
class nsIAtom;
class nsINodeInfo;
class nsIDocument;
/**
@ -193,16 +192,16 @@ private:
already_AddRefed<Attr>
SetNamedItemInternal(Attr& aNode, bool aWithNS, ErrorResult& aError);
already_AddRefed<nsINodeInfo>
already_AddRefed<mozilla::dom::NodeInfo>
GetAttrNodeInfo(const nsAString& aNamespaceURI,
const nsAString& aLocalName);
Attr* GetAttribute(nsINodeInfo* aNodeInfo, bool aNsAware);
Attr* GetAttribute(mozilla::dom::NodeInfo* aNodeInfo, bool aNsAware);
/**
* Remove an attribute, returns the removed node.
*/
already_AddRefed<Attr> RemoveAttribute(nsINodeInfo* aNodeInfo);
already_AddRefed<Attr> RemoveAttribute(mozilla::dom::NodeInfo* aNodeInfo);
};
// XXX khuey yes this is crazy. The bindings code needs to see this include,

18
content/base/src/nsDocument.cpp
Просмотреть файл

@ -1514,7 +1514,7 @@ struct nsIDocument::FrameRequest
int32_t mHandle;
};
static already_AddRefed<nsINodeInfo> nullNodeInfo(nullptr);
static already_AddRefed<mozilla::dom::NodeInfo> nullNodeInfo(nullptr);
// ==================================================================
// =
@ -5227,7 +5227,7 @@ nsIDocument::CreateElementNS(const nsAString& aNamespaceURI,
const nsAString& aQualifiedName,
ErrorResult& rv)
{
nsCOMPtr<nsINodeInfo> nodeInfo;
nsRefPtr<mozilla::dom::NodeInfo> nodeInfo;
rv = nsContentUtils::GetNodeInfoFromQName(aNamespaceURI,
aQualifiedName,
mNodeInfoManager,
@ -5414,7 +5414,7 @@ nsIDocument::CreateAttribute(const nsAString& aName, ErrorResult& rv)
return nullptr;
}
nsCOMPtr<nsINodeInfo> nodeInfo;
nsRefPtr<mozilla::dom::NodeInfo> nodeInfo;
res = mNodeInfoManager->GetNodeInfo(aName, nullptr, kNameSpaceID_None,
nsIDOMNode::ATTRIBUTE_NODE,
getter_AddRefs(nodeInfo));
@ -5446,7 +5446,7 @@ nsIDocument::CreateAttributeNS(const nsAString& aNamespaceURI,
{
WarnOnceAbout(eCreateAttributeNS);
nsCOMPtr<nsINodeInfo> nodeInfo;
nsRefPtr<mozilla::dom::NodeInfo> nodeInfo;
rv = nsContentUtils::GetNodeInfoFromQName(aNamespaceURI,
aQualifiedName,
mNodeInfoManager,
@ -5526,7 +5526,7 @@ nsDocument::RegisterUnresolvedElement(Element* aElement, nsIAtom* aTypeName)
return NS_OK;
}
nsINodeInfo* info = aElement->NodeInfo();
mozilla::dom::NodeInfo* info = aElement->NodeInfo();
// Candidate may be a custom element through extension,
// in which case the custom element type name will not
@ -5594,7 +5594,7 @@ nsDocument::EnqueueLifecycleCallback(nsIDocument::ElementCallbackType aType,
// Let DEFINITION be ELEMENT's definition
CustomElementDefinition* definition = aDefinition;
if (!definition) {
nsINodeInfo* info = aCustomElement->NodeInfo();
mozilla::dom::NodeInfo* info = aCustomElement->NodeInfo();
// Make sure we get the correct definition in case the element
// is a extended custom element e.g. <button is="x-button">.
@ -6736,7 +6736,7 @@ nsDocument::SetTitle(const nsAString& aTitle)
return NS_OK;
{
nsCOMPtr<nsINodeInfo> titleInfo;
nsRefPtr<mozilla::dom::NodeInfo> titleInfo;
titleInfo = mNodeInfoManager->GetNodeInfo(nsGkAtoms::title, nullptr,
kNameSpaceID_XHTML,
nsIDOMNode::ELEMENT_NODE);
@ -8258,7 +8258,7 @@ nsDocument::CreateElem(const nsAString& aName, nsIAtom *aPrefix, int32_t aNamesp
*aResult = nullptr;
nsCOMPtr<nsINodeInfo> nodeInfo;
nsRefPtr<mozilla::dom::NodeInfo> nodeInfo;
mNodeInfoManager->GetNodeInfo(aName, aPrefix, aNamespaceID,
nsIDOMNode::ELEMENT_NODE,
getter_AddRefs(nodeInfo));
@ -12235,7 +12235,7 @@ nsIDocument::SetStateObject(nsIStructuredCloneContainer *scContainer)
already_AddRefed<Element>
nsIDocument::CreateHTMLElement(nsIAtom* aTag)
{
nsCOMPtr<nsINodeInfo> nodeInfo;
nsRefPtr<mozilla::dom::NodeInfo> nodeInfo;
nodeInfo = mNodeInfoManager->GetNodeInfo(aTag, nullptr, kNameSpaceID_XHTML,
nsIDOMNode::ELEMENT_NODE);
MOZ_ASSERT(nodeInfo, "GetNodeInfo should never fail");

3
content/base/src/nsDocument.h
Просмотреть файл

@ -28,7 +28,6 @@
#include "nsIPrincipal.h"
#include "nsIParser.h"
#include "nsBindingManager.h"
#include "nsINodeInfo.h"
#include "nsInterfaceHashtable.h"
#include "nsJSThingHashtable.h"
#include "nsIBoxObject.h"
@ -897,7 +896,7 @@ public:
virtual nsresult InsertChildAt(nsIContent* aKid, uint32_t aIndex,
bool aNotify) MOZ_OVERRIDE;
virtual void RemoveChildAt(uint32_t aIndex, bool aNotify) MOZ_OVERRIDE;
virtual nsresult Clone(nsINodeInfo *aNodeInfo, nsINode **aResult) const MOZ_OVERRIDE
virtual nsresult Clone(mozilla::dom::NodeInfo *aNodeInfo, nsINode **aResult) const MOZ_OVERRIDE
{
return NS_ERROR_NOT_IMPLEMENTED;
}

4
content/base/src/nsGenConImageContent.cpp
Просмотреть файл

@ -24,7 +24,7 @@ class nsGenConImageContent MOZ_FINAL : public nsXMLElement,
public nsImageLoadingContent
{
public:
nsGenConImageContent(already_AddRefed<nsINodeInfo>& aNodeInfo)
nsGenConImageContent(already_AddRefed<mozilla::dom::NodeInfo>& aNodeInfo)
: nsXMLElement(aNodeInfo)
{
// nsImageLoadingContent starts out broken, so we start out
@ -70,7 +70,7 @@ NS_IMPL_ISUPPORTS_INHERITED(nsGenConImageContent,
imgIOnloadBlocker)
nsresult
NS_NewGenConImageContent(nsIContent** aResult, already_AddRefed<nsINodeInfo>&& aNodeInfo,
NS_NewGenConImageContent(nsIContent** aResult, already_AddRefed<mozilla::dom::NodeInfo>&& aNodeInfo,
imgRequestProxy* aImageRequest)
{
NS_PRECONDITION(aImageRequest, "Must have request!");

4
content/base/src/nsGenericDOMDataNode.cpp
Просмотреть файл

@ -40,7 +40,7 @@
using namespace mozilla;
using namespace mozilla::dom;
nsGenericDOMDataNode::nsGenericDOMDataNode(already_AddRefed<nsINodeInfo>& aNodeInfo)
nsGenericDOMDataNode::nsGenericDOMDataNode(already_AddRefed<mozilla::dom::NodeInfo>& aNodeInfo)
: nsIContent(aNodeInfo)
{
NS_ABORT_IF_FALSE(mNodeInfo->NodeType() == nsIDOMNode::TEXT_NODE ||
@ -52,7 +52,7 @@ nsGenericDOMDataNode::nsGenericDOMDataNode(already_AddRefed<nsINodeInfo>& aNodeI
"Bad NodeType in aNodeInfo");
}
nsGenericDOMDataNode::nsGenericDOMDataNode(already_AddRefed<nsINodeInfo>&& aNodeInfo)
nsGenericDOMDataNode::nsGenericDOMDataNode(already_AddRefed<mozilla::dom::NodeInfo>&& aNodeInfo)
: nsIContent(aNodeInfo)
{
NS_ABORT_IF_FALSE(mNodeInfo->NodeType() == nsIDOMNode::TEXT_NODE ||

9
content/base/src/nsGenericDOMDataNode.h
Просмотреть файл

@ -27,7 +27,6 @@ class nsIDOMEventListener;
class nsIDOMNodeList;
class nsIFrame;
class nsIDOMText;
class nsINodeInfo;
class nsURI;
#define DATA_NODE_FLAG_BIT(n_) NODE_FLAG_BIT(NODE_TYPE_SPECIFIC_BITS_OFFSET + (n_))
@ -65,8 +64,8 @@ public:
NS_DECL_SIZEOF_EXCLUDING_THIS
nsGenericDOMDataNode(already_AddRefed<nsINodeInfo>& aNodeInfo);
nsGenericDOMDataNode(already_AddRefed<nsINodeInfo>&& aNodeInfo);
nsGenericDOMDataNode(already_AddRefed<mozilla::dom::NodeInfo>& aNodeInfo);
nsGenericDOMDataNode(already_AddRefed<mozilla::dom::NodeInfo>&& aNodeInfo);
virtual ~nsGenericDOMDataNode();
virtual void GetNodeValueInternal(nsAString& aNodeValue) MOZ_OVERRIDE;
@ -174,7 +173,7 @@ public:
virtual nsChangeHint GetAttributeChangeHint(const nsIAtom* aAttribute,
int32_t aModType) const;
virtual nsresult Clone(nsINodeInfo *aNodeInfo, nsINode **aResult) const MOZ_OVERRIDE
virtual nsresult Clone(mozilla::dom::NodeInfo *aNodeInfo, nsINode **aResult) const MOZ_OVERRIDE
{
*aResult = CloneDataNode(aNodeInfo, true);
if (!*aResult) {
@ -308,7 +307,7 @@ protected:
* @param aCloneText if true the text content will be cloned too
* @return the clone
*/
virtual nsGenericDOMDataNode *CloneDataNode(nsINodeInfo *aNodeInfo,
virtual nsGenericDOMDataNode *CloneDataNode(mozilla::dom::NodeInfo *aNodeInfo,
bool aCloneText) const = 0;
nsTextFragment mText;

7
content/base/src/nsINode.cpp
Просмотреть файл

@ -62,7 +62,8 @@
#include "nsIEditor.h"
#include "nsIEditorIMESupport.h"
#include "nsILinkHandler.h"
#include "nsINodeInfo.h"
#include "mozilla/dom/NodeInfo.h"
#include "mozilla/dom/NodeInfoInlines.h"
#include "nsIPresShell.h"
#include "nsIScriptError.h"
#include "nsIScriptGlobalObject.h"
@ -971,8 +972,8 @@ nsINode::IsEqualNode(nsINode* aOther)
return false;
}
nsINodeInfo* nodeInfo1 = node1->mNodeInfo;
nsINodeInfo* nodeInfo2 = node2->mNodeInfo;
mozilla::dom::NodeInfo* nodeInfo1 = node1->mNodeInfo;
mozilla::dom::NodeInfo* nodeInfo2 = node2->mNodeInfo;
if (!nodeInfo1->Equals(nodeInfo2) ||
nodeInfo1->GetExtraName() != nodeInfo2->GetExtraName()) {
return false;

2
content/base/src/nsMappedAttributeElement.h
Просмотреть файл

@ -28,7 +28,7 @@ class nsMappedAttributeElement : public nsMappedAttributeElementBase
protected:
nsMappedAttributeElement(already_AddRefed<nsINodeInfo>& aNodeInfo)
nsMappedAttributeElement(already_AddRefed<mozilla::dom::NodeInfo>& aNodeInfo)
: nsMappedAttributeElementBase(aNodeInfo)
{}

8
content/base/src/nsNameSpaceManager.cpp
Просмотреть файл

@ -12,11 +12,11 @@
#include "nscore.h"
#include "nsAutoPtr.h"
#include "nsINodeInfo.h"
#include "mozilla/dom/NodeInfo.h"
#include "nsCOMArray.h"
#include "nsContentCreatorFunctions.h"
#include "nsString.h"
#include "nsINodeInfo.h"
#include "mozilla/dom/NodeInfo.h"
#include "mozilla/ClearOnShutdown.h"
#include "mozilla/dom/XBLChildrenElement.h"
#include "mozilla/dom/Element.h"
@ -137,10 +137,10 @@ nsNameSpaceManager::GetNameSpaceID(const nsAString& aURI)
nsresult
NS_NewElement(Element** aResult,
already_AddRefed<nsINodeInfo>&& aNodeInfo,
already_AddRefed<mozilla::dom::NodeInfo>&& aNodeInfo,
FromParser aFromParser)
{
nsCOMPtr<nsINodeInfo> ni = aNodeInfo;
nsRefPtr<mozilla::dom::NodeInfo> ni = aNodeInfo;
int32_t ns = ni->NamespaceID();
if (ns == kNameSpaceID_XHTML) {
return NS_NewHTMLElement(aResult, ni.forget(), aFromParser);

62
content/base/src/nsNodeInfoManager.cpp
Просмотреть файл

@ -11,7 +11,8 @@
#include "nsNodeInfoManager.h"
#include "mozilla/DebugOnly.h"
#include "nsNodeInfo.h"
#include "mozilla/dom/NodeInfo.h"
#include "mozilla/dom/NodeInfoInlines.h"
#include "nsCOMPtr.h"
#include "nsString.h"
#include "nsIAtom.h"
@ -26,8 +27,10 @@
#include "nsBindingManager.h"
#include "nsHashKeys.h"
#include "nsCCUncollectableMarker.h"
#include "nsNameSpaceManager.h"
using namespace mozilla;
using mozilla::dom::NodeInfo;
#ifdef MOZ_LOGGING
// so we can get logging even in release builds
@ -42,10 +45,9 @@ static PRLogModuleInfo* gNodeInfoManagerLeakPRLog;
PLHashNumber
nsNodeInfoManager::GetNodeInfoInnerHashValue(const void *key)
{
NS_ASSERTION(key, "Null key passed to nsNodeInfo::GetHashValue!");
MOZ_ASSERT(key, "Null key passed to NodeInfo::GetHashValue!");
const nsINodeInfo::nsNodeInfoInner *node =
reinterpret_cast<const nsINodeInfo::nsNodeInfoInner *>(key);
auto *node = reinterpret_cast<const NodeInfo::NodeInfoInner*>(key);
return node->mName ? node->mName->hash() : HashString(*(node->mNameString));
}
@ -54,12 +56,10 @@ nsNodeInfoManager::GetNodeInfoInnerHashValue(const void *key)
int
nsNodeInfoManager::NodeInfoInnerKeyCompare(const void *key1, const void *key2)
{
NS_ASSERTION(key1 && key2, "Null key passed to NodeInfoInnerKeyCompare!");
MOZ_ASSERT(key1 && key2, "Null key passed to NodeInfoInnerKeyCompare!");
const nsINodeInfo::nsNodeInfoInner *node1 =
reinterpret_cast<const nsINodeInfo::nsNodeInfoInner *>(key1);
const nsINodeInfo::nsNodeInfoInner *node2 =
reinterpret_cast<const nsINodeInfo::nsNodeInfoInner *>(key2);
auto *node1 = reinterpret_cast<const NodeInfo::NodeInfoInner*>(key1);
auto *node2 = reinterpret_cast<const NodeInfo::NodeInfoInner*>(key2);
if (node1->mPrefix != node2->mPrefix ||
node1->mNamespaceID != node2->mNamespaceID ||
@ -203,7 +203,7 @@ nsNodeInfoManager::Init(nsIDocument *aDocument)
int
nsNodeInfoManager::DropNodeInfoDocument(PLHashEntry *he, int hashIndex, void *arg)
{
static_cast<nsINodeInfo*>(he->value)->mDocument = nullptr;
static_cast<mozilla::dom::NodeInfo*>(he->value)->mDocument = nullptr;
return HT_ENUMERATE_NEXT;
}
@ -222,33 +222,33 @@ nsNodeInfoManager::DropDocumentReference()
}
already_AddRefed<nsINodeInfo>
already_AddRefed<mozilla::dom::NodeInfo>
nsNodeInfoManager::GetNodeInfo(nsIAtom *aName, nsIAtom *aPrefix,
int32_t aNamespaceID, uint16_t aNodeType,
nsIAtom* aExtraName /* = nullptr */)
{
CheckValidNodeInfo(aNodeType, aName, aNamespaceID, aExtraName);
nsINodeInfo::nsNodeInfoInner tmpKey(aName, aPrefix, aNamespaceID, aNodeType,
aExtraName);
NodeInfo::NodeInfoInner tmpKey(aName, aPrefix, aNamespaceID, aNodeType,
aExtraName);
void *node = PL_HashTableLookup(mNodeInfoHash, &tmpKey);
if (node) {
nsCOMPtr<nsINodeInfo> nodeInfo = static_cast<nsINodeInfo*>(node);
nsRefPtr<NodeInfo> nodeInfo = static_cast<NodeInfo*>(node);
return nodeInfo.forget();
}
nsRefPtr<nsNodeInfo> newNodeInfo =
new nsNodeInfo(aName, aPrefix, aNamespaceID, aNodeType, aExtraName, this);
nsRefPtr<NodeInfo> newNodeInfo =
new NodeInfo(aName, aPrefix, aNamespaceID, aNodeType, aExtraName, this);
DebugOnly<PLHashEntry*> he =
PL_HashTableAdd(mNodeInfoHash, &newNodeInfo->mInner, newNodeInfo);
MOZ_ASSERT(he, "PL_HashTableAdd() failed");
// Have to do the swap thing, because already_AddRefed<nsNodeInfo>
// doesn't cast to already_AddRefed<nsINodeInfo>
// doesn't cast to already_AddRefed<mozilla::dom::NodeInfo>
++mNonDocumentNodeInfos;
if (mNonDocumentNodeInfos == 1) {
NS_IF_ADDREF(mDocument);
@ -261,7 +261,7 @@ nsNodeInfoManager::GetNodeInfo(nsIAtom *aName, nsIAtom *aPrefix,
nsresult
nsNodeInfoManager::GetNodeInfo(const nsAString& aName, nsIAtom *aPrefix,
int32_t aNamespaceID, uint16_t aNodeType,
nsINodeInfo** aNodeInfo)
NodeInfo** aNodeInfo)
{
#ifdef DEBUG
{
@ -270,12 +270,12 @@ nsNodeInfoManager::GetNodeInfo(const nsAString& aName, nsIAtom *aPrefix,
}
#endif
nsINodeInfo::nsNodeInfoInner tmpKey(aName, aPrefix, aNamespaceID, aNodeType);
NodeInfo::NodeInfoInner tmpKey(aName, aPrefix, aNamespaceID, aNodeType);
void *node = PL_HashTableLookup(mNodeInfoHash, &tmpKey);
if (node) {
nsINodeInfo* nodeInfo = static_cast<nsINodeInfo *>(node);
NodeInfo* nodeInfo = static_cast<NodeInfo *>(node);
NS_ADDREF(*aNodeInfo = nodeInfo);
@ -285,8 +285,8 @@ nsNodeInfoManager::GetNodeInfo(const nsAString& aName, nsIAtom *aPrefix,
nsCOMPtr<nsIAtom> nameAtom = do_GetAtom(aName);
NS_ENSURE_TRUE(nameAtom, NS_ERROR_OUT_OF_MEMORY);
nsRefPtr<nsNodeInfo> newNodeInfo =
new nsNodeInfo(nameAtom, aPrefix, aNamespaceID, aNodeType, nullptr, this);
nsRefPtr<NodeInfo> newNodeInfo =
new NodeInfo(nameAtom, aPrefix, aNamespaceID, aNodeType, nullptr, this);
NS_ENSURE_TRUE(newNodeInfo, NS_ERROR_OUT_OF_MEMORY);
PLHashEntry *he;
@ -308,7 +308,7 @@ nsresult
nsNodeInfoManager::GetNodeInfo(const nsAString& aName, nsIAtom *aPrefix,
const nsAString& aNamespaceURI,
uint16_t aNodeType,
nsINodeInfo** aNodeInfo)
NodeInfo** aNodeInfo)
{
int32_t nsid = kNameSpaceID_None;
@ -321,10 +321,10 @@ nsNodeInfoManager::GetNodeInfo(const nsAString& aName, nsIAtom *aPrefix,
return GetNodeInfo(aName, aPrefix, nsid, aNodeType, aNodeInfo);
}
already_AddRefed<nsINodeInfo>
already_AddRefed<NodeInfo>
nsNodeInfoManager::GetTextNodeInfo()
{
nsCOMPtr<nsINodeInfo> nodeInfo;
nsRefPtr<mozilla::dom::NodeInfo> nodeInfo;
if (!mTextNodeInfo) {
nodeInfo = GetNodeInfo(nsGkAtoms::textTagName, nullptr, kNameSpaceID_None,
@ -338,10 +338,10 @@ nsNodeInfoManager::GetTextNodeInfo()
return nodeInfo.forget();
}
already_AddRefed<nsINodeInfo>
already_AddRefed<NodeInfo>
nsNodeInfoManager::GetCommentNodeInfo()
{
nsCOMPtr<nsINodeInfo> nodeInfo;
nsRefPtr<NodeInfo> nodeInfo;
if (!mCommentNodeInfo) {
nodeInfo = GetNodeInfo(nsGkAtoms::commentTagName, nullptr,
@ -357,10 +357,10 @@ nsNodeInfoManager::GetCommentNodeInfo()
return nodeInfo.forget();
}
already_AddRefed<nsINodeInfo>
already_AddRefed<NodeInfo>
nsNodeInfoManager::GetDocumentNodeInfo()
{
nsCOMPtr<nsINodeInfo> nodeInfo;
nsRefPtr<NodeInfo> nodeInfo;
if (!mDocumentNodeInfo) {
NS_ASSERTION(mDocument, "Should have mDocument!");
@ -396,7 +396,7 @@ nsNodeInfoManager::SetDocumentPrincipal(nsIPrincipal *aPrincipal)
}
void
nsNodeInfoManager::RemoveNodeInfo(nsNodeInfo *aNodeInfo)
nsNodeInfoManager::RemoveNodeInfo(NodeInfo *aNodeInfo)
{
NS_PRECONDITION(aNodeInfo, "Trying to remove null nodeinfo from manager!");
@ -425,5 +425,5 @@ nsNodeInfoManager::RemoveNodeInfo(nsNodeInfo *aNodeInfo)
#endif
PL_HashTableRemove(mNodeInfoHash, &aNodeInfo->mInner);
NS_POSTCONDITION(ret, "Can't find nsINodeInfo to remove!!!");
NS_POSTCONDITION(ret, "Can't find mozilla::dom::NodeInfo to remove!!!");
}

33
content/base/src/nsNodeInfoManager.h
Просмотреть файл

@ -21,13 +21,17 @@ class nsBindingManager;
class nsIAtom;
class nsIDocument;
class nsIDOMDocumentType;
class nsINodeInfo;
class nsIPrincipal;
class nsNodeInfo;
struct PLHashEntry;
struct PLHashTable;
template<class T> struct already_AddRefed;
namespace mozilla {
namespace dom {
class NodeInfo;
}
}
class nsNodeInfoManager MOZ_FINAL
{
public:
@ -52,31 +56,30 @@ public:
/**
* Methods for creating nodeinfo's from atoms and/or strings.
*/
already_AddRefed<nsINodeInfo> GetNodeInfo(nsIAtom *aName, nsIAtom *aPrefix,
int32_t aNamespaceID,
uint16_t aNodeType,
nsIAtom* aExtraName = nullptr);
already_AddRefed<mozilla::dom::NodeInfo>
GetNodeInfo(nsIAtom *aName, nsIAtom *aPrefix, int32_t aNamespaceID,
uint16_t aNodeType, nsIAtom* aExtraName = nullptr);
nsresult GetNodeInfo(const nsAString& aName, nsIAtom *aPrefix,
int32_t aNamespaceID, uint16_t aNodeType,
nsINodeInfo** aNodeInfo);
mozilla::dom::NodeInfo** aNodeInfo);
nsresult GetNodeInfo(const nsAString& aName, nsIAtom *aPrefix,
const nsAString& aNamespaceURI, uint16_t aNodeType,
nsINodeInfo** aNodeInfo);
mozilla::dom::NodeInfo** aNodeInfo);
/**
* Returns the nodeinfo for text nodes. Can return null if OOM.
*/
already_AddRefed<nsINodeInfo> GetTextNodeInfo();
already_AddRefed<mozilla::dom::NodeInfo> GetTextNodeInfo();
/**
* Returns the nodeinfo for comment nodes. Can return null if OOM.
*/
already_AddRefed<nsINodeInfo> GetCommentNodeInfo();
already_AddRefed<mozilla::dom::NodeInfo> GetCommentNodeInfo();
/**
* Returns the nodeinfo for the document node. Can return null if OOM.
*/
already_AddRefed<nsINodeInfo> GetDocumentNodeInfo();
already_AddRefed<mozilla::dom::NodeInfo> GetDocumentNodeInfo();
/**
* Retrieve a pointer to the document that owns this node info
@ -95,7 +98,7 @@ public:
return mPrincipal;
}
void RemoveNodeInfo(nsNodeInfo *aNodeInfo);
void RemoveNodeInfo(mozilla::dom::NodeInfo *aNodeInfo);
nsBindingManager* GetBindingManager() const
{
@ -128,9 +131,9 @@ private:
uint32_t mNonDocumentNodeInfos;
nsCOMPtr<nsIPrincipal> mPrincipal; // Never null after Init() succeeds.
nsCOMPtr<nsIPrincipal> mDefaultPrincipal; // Never null after Init() succeeds
nsINodeInfo *mTextNodeInfo; // WEAK to avoid circular ownership
nsINodeInfo *mCommentNodeInfo; // WEAK to avoid circular ownership
nsINodeInfo *mDocumentNodeInfo; // WEAK to avoid circular ownership
mozilla::dom::NodeInfo *mTextNodeInfo; // WEAK to avoid circular ownership
mozilla::dom::NodeInfo *mCommentNodeInfo; // WEAK to avoid circular ownership
mozilla::dom::NodeInfo *mDocumentNodeInfo; // WEAK to avoid circular ownership
nsRefPtr<nsBindingManager> mBindingManager;
};

4
content/base/src/nsNodeUtils.cpp
Просмотреть файл

@ -418,8 +418,8 @@ nsNodeUtils::CloneAndAdopt(nsINode *aNode, bool aClone, bool aDeep,
nsNodeInfoManager *nodeInfoManager = aNewNodeInfoManager;
// aNode.
nsINodeInfo *nodeInfo = aNode->mNodeInfo;
nsCOMPtr<nsINodeInfo> newNodeInfo;
NodeInfo *nodeInfo = aNode->mNodeInfo;
nsRefPtr<NodeInfo> newNodeInfo;
if (nodeInfoManager) {
// Don't allow importing/adopting nodes from non-privileged "scriptable"

4
content/base/src/nsStyledElement.h
Просмотреть файл

@ -30,7 +30,7 @@ class nsStyledElementNotElementCSSInlineStyle : public nsStyledElementBase
protected:
inline nsStyledElementNotElementCSSInlineStyle(already_AddRefed<nsINodeInfo>& aNodeInfo)
inline nsStyledElementNotElementCSSInlineStyle(already_AddRefed<mozilla::dom::NodeInfo>& aNodeInfo)
: nsStyledElementBase(aNodeInfo)
{}
@ -72,7 +72,7 @@ protected:
class nsStyledElement : public nsStyledElementNotElementCSSInlineStyle {
protected:
inline nsStyledElement(already_AddRefed<nsINodeInfo>& aNodeInfo)
inline nsStyledElement(already_AddRefed<mozilla::dom::NodeInfo>& aNodeInfo)
: nsStyledElementNotElementCSSInlineStyle(aNodeInfo)
{}
};

14
content/base/src/nsTextNode.cpp
Просмотреть файл

@ -33,7 +33,7 @@ class nsAttributeTextNode MOZ_FINAL : public nsTextNode,
public:
NS_DECL_ISUPPORTS_INHERITED
nsAttributeTextNode(already_AddRefed<nsINodeInfo>& aNodeInfo,
nsAttributeTextNode(already_AddRefed<mozilla::dom::NodeInfo>& aNodeInfo,
int32_t aNameSpaceID,
nsIAtom* aAttrName) :
nsTextNode(aNodeInfo),
@ -58,11 +58,11 @@ public:
NS_DECL_NSIMUTATIONOBSERVER_ATTRIBUTECHANGED
NS_DECL_NSIMUTATIONOBSERVER_NODEWILLBEDESTROYED
virtual nsGenericDOMDataNode *CloneDataNode(nsINodeInfo *aNodeInfo,
virtual nsGenericDOMDataNode *CloneDataNode(mozilla::dom::NodeInfo *aNodeInfo,
bool aCloneText) const
{
already_AddRefed<nsINodeInfo> ni =
nsCOMPtr<nsINodeInfo>(aNodeInfo).forget();
already_AddRefed<mozilla::dom::NodeInfo> ni =
nsRefPtr<mozilla::dom::NodeInfo>(aNodeInfo).forget();
nsAttributeTextNode *it = new nsAttributeTextNode(ni,
mNameSpaceID,
mAttrName);
@ -112,9 +112,9 @@ nsTextNode::IsNodeOfType(uint32_t aFlags) const
}
nsGenericDOMDataNode*
nsTextNode::CloneDataNode(nsINodeInfo *aNodeInfo, bool aCloneText) const
nsTextNode::CloneDataNode(mozilla::dom::NodeInfo *aNodeInfo, bool aCloneText) const
{
already_AddRefed<nsINodeInfo> ni = nsCOMPtr<nsINodeInfo>(aNodeInfo).forget();
already_AddRefed<mozilla::dom::NodeInfo> ni = nsRefPtr<mozilla::dom::NodeInfo>(aNodeInfo).forget();
nsTextNode *it = new nsTextNode(ni);
if (aCloneText) {
it->mText = mText;
@ -208,7 +208,7 @@ NS_NewAttributeContent(nsNodeInfoManager *aNodeInfoManager,
*aResult = nullptr;
already_AddRefed<nsINodeInfo> ni = aNodeInfoManager->GetTextNodeInfo();
already_AddRefed<mozilla::dom::NodeInfo> ni = aNodeInfoManager->GetTextNodeInfo();
nsAttributeTextNode* textNode = new nsAttributeTextNode(ni,
aNameSpaceID,

4
content/base/src/nsTextNode.h
Просмотреть файл

@ -31,7 +31,7 @@ private:
}
public:
nsTextNode(already_AddRefed<nsINodeInfo>& aNodeInfo)
nsTextNode(already_AddRefed<mozilla::dom::NodeInfo>& aNodeInfo)
: mozilla::dom::Text(aNodeInfo)
{
Init();
@ -61,7 +61,7 @@ public:
// nsINode
virtual bool IsNodeOfType(uint32_t aFlags) const;
virtual nsGenericDOMDataNode* CloneDataNode(nsINodeInfo *aNodeInfo,
virtual nsGenericDOMDataNode* CloneDataNode(mozilla::dom::NodeInfo *aNodeInfo,
bool aCloneText) const MOZ_OVERRIDE;
virtual nsresult BindToTree(nsIDocument* aDocument, nsIContent* aParent,

2
content/base/src/nsTreeSanitizer.cpp
Просмотреть файл

@ -1376,7 +1376,7 @@ nsTreeSanitizer::SanitizeChildren(nsINode* aRoot)
while (node) {
if (node->IsElement()) {
mozilla::dom::Element* elt = node->AsElement();
nsINodeInfo* nodeInfo = node->NodeInfo();
mozilla::dom::NodeInfo* nodeInfo = node->NodeInfo();
nsIAtom* localName = nodeInfo->NameAtom();
int32_t ns = nodeInfo->NamespaceID();

1
content/base/src/nsXMLNameSpaceMap.cpp
Просмотреть файл

@ -11,6 +11,7 @@
#include "nsContentUtils.h"
#include "nsGkAtoms.h"
#include "nsNameSpaceManager.h"
#include "mozilla/dom/NameSpaceConstants.h"
template <>
class nsDefaultComparator <nsNameSpaceEntry, nsIAtom*> {

4
content/html/content/public/HTMLAudioElement.h
Просмотреть файл

@ -21,7 +21,7 @@ class HTMLAudioElement MOZ_FINAL : public HTMLMediaElement,
public nsIDOMHTMLAudioElement
{
public:
HTMLAudioElement(already_AddRefed<nsINodeInfo>& aNodeInfo);
HTMLAudioElement(already_AddRefed<mozilla::dom::NodeInfo>& aNodeInfo);
virtual ~HTMLAudioElement();
// nsISupports
@ -31,7 +31,7 @@ public:
using HTMLMediaElement::GetPaused;
NS_FORWARD_NSIDOMHTMLMEDIAELEMENT(HTMLMediaElement::)
virtual nsresult Clone(nsINodeInfo *aNodeInfo, nsINode **aResult) const;
virtual nsresult Clone(mozilla::dom::NodeInfo *aNodeInfo, nsINode **aResult) const;
virtual nsresult SetAcceptHeader(nsIHttpChannel* aChannel);
virtual nsIDOMNode* AsDOMNode() MOZ_OVERRIDE { return this; }

4
content/html/content/public/HTMLCanvasElement.h
Просмотреть файл

@ -47,7 +47,7 @@ class HTMLCanvasElement MOZ_FINAL : public nsGenericHTMLElement,
typedef layers::LayerManager LayerManager;
public:
HTMLCanvasElement(already_AddRefed<nsINodeInfo>& aNodeInfo);
HTMLCanvasElement(already_AddRefed<mozilla::dom::NodeInfo>& aNodeInfo);
virtual ~HTMLCanvasElement();
NS_IMPL_FROMCONTENT_HTML_WITH_TAG(HTMLCanvasElement, canvas)
@ -182,7 +182,7 @@ public:
virtual nsresult UnsetAttr(int32_t aNameSpaceID, nsIAtom* aName,
bool aNotify) MOZ_OVERRIDE;
virtual nsresult Clone(nsINodeInfo *aNodeInfo, nsINode **aResult) const MOZ_OVERRIDE;
virtual nsresult Clone(mozilla::dom::NodeInfo *aNodeInfo, nsINode **aResult) const MOZ_OVERRIDE;
nsresult CopyInnerTo(mozilla::dom::Element* aDest);
virtual nsresult PreHandleEvent(mozilla::EventChainPreVisitor& aVisitor) MOZ_OVERRIDE;

2
content/html/content/public/HTMLMediaElement.h
Просмотреть файл

@ -86,7 +86,7 @@ public:
return mCORSMode;
}
HTMLMediaElement(already_AddRefed<nsINodeInfo>& aNodeInfo);
HTMLMediaElement(already_AddRefed<mozilla::dom::NodeInfo>& aNodeInfo);
virtual ~HTMLMediaElement();
/**

4
content/html/content/public/HTMLVideoElement.h
Просмотреть файл

@ -21,7 +21,7 @@ class HTMLVideoElement MOZ_FINAL : public HTMLMediaElement,
public nsIDOMHTMLVideoElement
{
public:
HTMLVideoElement(already_AddRefed<nsINodeInfo>& aNodeInfo);
HTMLVideoElement(already_AddRefed<mozilla::dom::NodeInfo>& aNodeInfo);
virtual ~HTMLVideoElement();
NS_IMPL_FROMCONTENT_HTML_WITH_TAG(HTMLVideoElement, video)
@ -46,7 +46,7 @@ public:
virtual nsMapRuleToAttributesFunc GetAttributeMappingFunction() const MOZ_OVERRIDE;
virtual nsresult Clone(nsINodeInfo *aNodeInfo, nsINode **aResult) const MOZ_OVERRIDE;
virtual nsresult Clone(mozilla::dom::NodeInfo *aNodeInfo, nsINode **aResult) const MOZ_OVERRIDE;
// Set size with the current video frame's height and width.
// If there is no video frame, returns NS_ERROR_FAILURE.

4
content/html/content/src/HTMLAnchorElement.h
Просмотреть файл

@ -26,7 +26,7 @@ public:
using Element::GetText;
using Element::SetText;
HTMLAnchorElement(already_AddRefed<nsINodeInfo>& aNodeInfo)
HTMLAnchorElement(already_AddRefed<mozilla::dom::NodeInfo>& aNodeInfo)
: nsGenericHTMLElement(aNodeInfo)
, Link(MOZ_THIS_IN_INITIALIZER_LIST())
{
@ -78,7 +78,7 @@ public:
const nsAString& aValue,
nsAttrValue& aResult) MOZ_OVERRIDE;
virtual nsresult Clone(nsINodeInfo *aNodeInfo, nsINode **aResult) const MOZ_OVERRIDE;
virtual nsresult Clone(mozilla::dom::NodeInfo *aNodeInfo, nsINode **aResult) const MOZ_OVERRIDE;
virtual EventStates IntrinsicState() const MOZ_OVERRIDE;

2
content/html/content/src/HTMLAreaElement.cpp
Просмотреть файл

@ -17,7 +17,7 @@ NS_IMPL_NS_NEW_HTML_ELEMENT(Area)
namespace mozilla {
namespace dom {
HTMLAreaElement::HTMLAreaElement(already_AddRefed<nsINodeInfo>& aNodeInfo)
HTMLAreaElement::HTMLAreaElement(already_AddRefed<mozilla::dom::NodeInfo>& aNodeInfo)
: nsGenericHTMLElement(aNodeInfo)
, Link(MOZ_THIS_IN_INITIALIZER_LIST())
{

4
content/html/content/src/HTMLAreaElement.h
Просмотреть файл

@ -27,7 +27,7 @@ class HTMLAreaElement MOZ_FINAL : public nsGenericHTMLElement,
public Link
{
public:
HTMLAreaElement(already_AddRefed<nsINodeInfo>& aNodeInfo);
HTMLAreaElement(already_AddRefed<mozilla::dom::NodeInfo>& aNodeInfo);
virtual ~HTMLAreaElement();
// nsISupports
@ -67,7 +67,7 @@ public:
virtual nsresult UnsetAttr(int32_t aNameSpaceID, nsIAtom* aAttribute,
bool aNotify) MOZ_OVERRIDE;
virtual nsresult Clone(nsINodeInfo* aNodeInfo, nsINode** aResult) const MOZ_OVERRIDE;
virtual nsresult Clone(mozilla::dom::NodeInfo* aNodeInfo, nsINode** aResult) const MOZ_OVERRIDE;
virtual EventStates IntrinsicState() const MOZ_OVERRIDE;

4
content/html/content/src/HTMLAudioElement.cpp
Просмотреть файл

@ -35,7 +35,7 @@ NS_IMPL_ISUPPORTS_INHERITED(HTMLAudioElement, HTMLMediaElement,
NS_IMPL_ELEMENT_CLONE(HTMLAudioElement)
HTMLAudioElement::HTMLAudioElement(already_AddRefed<nsINodeInfo>& aNodeInfo)
HTMLAudioElement::HTMLAudioElement(already_AddRefed<mozilla::dom::NodeInfo>& aNodeInfo)
: HTMLMediaElement(aNodeInfo)
{
}
@ -57,7 +57,7 @@ HTMLAudioElement::Audio(const GlobalObject& aGlobal,
return nullptr;
}
already_AddRefed<nsINodeInfo> nodeInfo =
already_AddRefed<mozilla::dom::NodeInfo> nodeInfo =
doc->NodeInfoManager()->GetNodeInfo(nsGkAtoms::audio, nullptr,
kNameSpaceID_XHTML,
nsIDOMNode::ELEMENT_NODE);

2
content/html/content/src/HTMLBRElement.cpp
Просмотреть файл

@ -17,7 +17,7 @@ NS_IMPL_NS_NEW_HTML_ELEMENT(BR)
namespace mozilla {
namespace dom {
HTMLBRElement::HTMLBRElement(already_AddRefed<nsINodeInfo>& aNodeInfo)
HTMLBRElement::HTMLBRElement(already_AddRefed<mozilla::dom::NodeInfo>& aNodeInfo)
: nsGenericHTMLElement(aNodeInfo)
{
}

4
content/html/content/src/HTMLBRElement.h
Просмотреть файл

@ -18,7 +18,7 @@ class HTMLBRElement MOZ_FINAL : public nsGenericHTMLElement,
public nsIDOMHTMLBRElement
{
public:
HTMLBRElement(already_AddRefed<nsINodeInfo>& aNodeInfo);
HTMLBRElement(already_AddRefed<mozilla::dom::NodeInfo>& aNodeInfo);
virtual ~HTMLBRElement();
// nsISupports
@ -33,7 +33,7 @@ public:
nsAttrValue& aResult) MOZ_OVERRIDE;
NS_IMETHOD_(bool) IsAttributeMapped(const nsIAtom* aAttribute) const MOZ_OVERRIDE;
virtual nsMapRuleToAttributesFunc GetAttributeMappingFunction() const MOZ_OVERRIDE;
virtual nsresult Clone(nsINodeInfo *aNodeInfo, nsINode **aResult) const MOZ_OVERRIDE;
virtual nsresult Clone(mozilla::dom::NodeInfo *aNodeInfo, nsINode **aResult) const MOZ_OVERRIDE;
bool Clear()
{

4
content/html/content/src/HTMLBodyElement.h
Просмотреть файл

@ -40,7 +40,7 @@ public:
using Element::GetText;
using Element::SetText;
HTMLBodyElement(already_AddRefed<nsINodeInfo>& aNodeInfo)
HTMLBodyElement(already_AddRefed<mozilla::dom::NodeInfo>& aNodeInfo)
: nsGenericHTMLElement(aNodeInfo)
{
}
@ -127,7 +127,7 @@ public:
NS_IMETHOD WalkContentStyleRules(nsRuleWalker* aRuleWalker) MOZ_OVERRIDE;
NS_IMETHOD_(bool) IsAttributeMapped(const nsIAtom* aAttribute) const MOZ_OVERRIDE;
virtual already_AddRefed<nsIEditor> GetAssociatedEditor() MOZ_OVERRIDE;
virtual nsresult Clone(nsINodeInfo *aNodeInfo, nsINode **aResult) const MOZ_OVERRIDE;
virtual nsresult Clone(mozilla::dom::NodeInfo *aNodeInfo, nsINode **aResult) const MOZ_OVERRIDE;
virtual bool IsEventAttributeName(nsIAtom* aName) MOZ_OVERRIDE;

2
content/html/content/src/HTMLButtonElement.cpp
Просмотреть файл

@ -55,7 +55,7 @@ static const nsAttrValue::EnumTable* kButtonDefaultType = &kButtonTypeTable[2];
// Construction, destruction
HTMLButtonElement::HTMLButtonElement(already_AddRefed<nsINodeInfo>& aNodeInfo,
HTMLButtonElement::HTMLButtonElement(already_AddRefed<mozilla::dom::NodeInfo>& aNodeInfo,
FromParser aFromParser)
: nsGenericHTMLFormElementWithState(aNodeInfo),
mType(kButtonDefaultType->value),

4
content/html/content/src/HTMLButtonElement.h
Просмотреть файл

@ -23,7 +23,7 @@ class HTMLButtonElement MOZ_FINAL : public nsGenericHTMLFormElementWithState,
public:
using nsIConstraintValidation::GetValidationMessage;
HTMLButtonElement(already_AddRefed<nsINodeInfo>& aNodeInfo,
HTMLButtonElement(already_AddRefed<mozilla::dom::NodeInfo>& aNodeInfo,
FromParser aFromParser = NOT_FROM_PARSER);
virtual ~HTMLButtonElement();
@ -56,7 +56,7 @@ public:
EventChainPostVisitor& aVisitor) MOZ_OVERRIDE;
// nsINode
virtual nsresult Clone(nsINodeInfo* aNodeInfo, nsINode** aResult) const MOZ_OVERRIDE;
virtual nsresult Clone(mozilla::dom::NodeInfo* aNodeInfo, nsINode** aResult) const MOZ_OVERRIDE;
virtual JSObject* WrapNode(JSContext* aCx) MOZ_OVERRIDE;
// nsIContent

2
content/html/content/src/HTMLCanvasElement.cpp
Просмотреть файл

@ -116,7 +116,7 @@ HTMLCanvasPrintState::NotifyDone()
// ---------------------------------------------------------------------------
HTMLCanvasElement::HTMLCanvasElement(already_AddRefed<nsINodeInfo>& aNodeInfo)
HTMLCanvasElement::HTMLCanvasElement(already_AddRefed<mozilla::dom::NodeInfo>& aNodeInfo)
: nsGenericHTMLElement(aNodeInfo),
mWriteOnly(false)
{

2
content/html/content/src/HTMLContentElement.cpp
Просмотреть файл

@ -21,7 +21,7 @@ NS_IMPL_NS_NEW_HTML_ELEMENT(Content)
using namespace mozilla::dom;
HTMLContentElement::HTMLContentElement(already_AddRefed<nsINodeInfo>& aNodeInfo)
HTMLContentElement::HTMLContentElement(already_AddRefed<mozilla::dom::NodeInfo>& aNodeInfo)
: nsGenericHTMLElement(aNodeInfo), mValidSelector(true), mIsInsertionPoint(false)
{
SetIsDOMBinding();

4
content/html/content/src/HTMLContentElement.h
Просмотреть файл

@ -19,7 +19,7 @@ class DistributedContentList;
class HTMLContentElement MOZ_FINAL : public nsGenericHTMLElement
{
public:
HTMLContentElement(already_AddRefed<nsINodeInfo>& aNodeInfo);
HTMLContentElement(already_AddRefed<mozilla::dom::NodeInfo>& aNodeInfo);
virtual ~HTMLContentElement();
// nsISupports
@ -28,7 +28,7 @@ public:
NS_DECL_CYCLE_COLLECTION_CLASS_INHERITED(HTMLContentElement,
nsGenericHTMLElement)
virtual nsresult Clone(nsINodeInfo *aNodeInfo, nsINode **aResult) const;
virtual nsresult Clone(mozilla::dom::NodeInfo *aNodeInfo, nsINode **aResult) const;
virtual nsIDOMNode* AsDOMNode() { return this; }

2
content/html/content/src/HTMLDataElement.cpp
Просмотреть файл

@ -12,7 +12,7 @@ NS_IMPL_NS_NEW_HTML_ELEMENT(Data)
namespace mozilla {
namespace dom {
HTMLDataElement::HTMLDataElement(already_AddRefed<nsINodeInfo>& aNodeInfo)
HTMLDataElement::HTMLDataElement(already_AddRefed<mozilla::dom::NodeInfo>& aNodeInfo)
: nsGenericHTMLElement(aNodeInfo)
{
}

4
content/html/content/src/HTMLDataElement.h
Просмотреть файл

@ -17,7 +17,7 @@ namespace dom {
class HTMLDataElement MOZ_FINAL : public nsGenericHTMLElement
{
public:
HTMLDataElement(already_AddRefed<nsINodeInfo>& aNodeInfo);
HTMLDataElement(already_AddRefed<mozilla::dom::NodeInfo>& aNodeInfo);
virtual ~HTMLDataElement();
// HTMLDataElement WebIDL
@ -33,7 +33,7 @@ public:
virtual void GetItemValueText(nsAString& text) MOZ_OVERRIDE;
virtual void SetItemValueText(const nsAString& text) MOZ_OVERRIDE;
virtual nsresult Clone(nsINodeInfo* aNodeInfo, nsINode** aResult) const MOZ_OVERRIDE;
virtual nsresult Clone(mozilla::dom::NodeInfo* aNodeInfo, nsINode** aResult) const MOZ_OVERRIDE;
protected:
virtual JSObject* WrapNode(JSContext* aCx) MOZ_OVERRIDE;

4
content/html/content/src/HTMLDataListElement.h
Просмотреть файл

@ -15,7 +15,7 @@ namespace dom {
class HTMLDataListElement MOZ_FINAL : public nsGenericHTMLElement
{
public:
HTMLDataListElement(already_AddRefed<nsINodeInfo>& aNodeInfo)
HTMLDataListElement(already_AddRefed<mozilla::dom::NodeInfo>& aNodeInfo)
: nsGenericHTMLElement(aNodeInfo)
{
}
@ -34,7 +34,7 @@ public:
}
virtual nsresult Clone(nsINodeInfo *aNodeInfo, nsINode **aResult) const MOZ_OVERRIDE;
virtual nsresult Clone(mozilla::dom::NodeInfo *aNodeInfo, nsINode **aResult) const MOZ_OVERRIDE;
// This function is used to generate the nsContentList (option elements).
static bool MatchOptions(nsIContent* aContent, int32_t aNamespaceID,

4
content/html/content/src/HTMLDivElement.h
Просмотреть файл

@ -16,7 +16,7 @@ class HTMLDivElement MOZ_FINAL : public nsGenericHTMLElement,
public nsIDOMHTMLDivElement
{
public:
HTMLDivElement(already_AddRefed<nsINodeInfo>& aNodeInfo)
HTMLDivElement(already_AddRefed<mozilla::dom::NodeInfo>& aNodeInfo)
: nsGenericHTMLElement(aNodeInfo)
{
}
@ -55,7 +55,7 @@ public:
nsAttrValue& aResult) MOZ_OVERRIDE;
NS_IMETHOD_(bool) IsAttributeMapped(const nsIAtom* aAttribute) const MOZ_OVERRIDE;
virtual nsMapRuleToAttributesFunc GetAttributeMappingFunction() const MOZ_OVERRIDE;
virtual nsresult Clone(nsINodeInfo *aNodeInfo, nsINode **aResult) const MOZ_OVERRIDE;
virtual nsresult Clone(mozilla::dom::NodeInfo *aNodeInfo, nsINode **aResult) const MOZ_OVERRIDE;
protected:
virtual JSObject* WrapNode(JSContext *aCx) MOZ_OVERRIDE;

8
content/html/content/src/HTMLElement.cpp
Просмотреть файл

@ -13,19 +13,19 @@ namespace dom {
class HTMLElement MOZ_FINAL : public nsGenericHTMLElement
{
public:
HTMLElement(already_AddRefed<nsINodeInfo>& aNodeInfo);
HTMLElement(already_AddRefed<mozilla::dom::NodeInfo>& aNodeInfo);
virtual ~HTMLElement();
NS_IMETHOD GetInnerHTML(nsAString& aInnerHTML) MOZ_OVERRIDE;
virtual nsresult Clone(nsINodeInfo* aNodeInfo,
virtual nsresult Clone(mozilla::dom::NodeInfo* aNodeInfo,
nsINode** aResult) const MOZ_OVERRIDE;
protected:
virtual JSObject* WrapNode(JSContext *aCx) MOZ_OVERRIDE;
};
HTMLElement::HTMLElement(already_AddRefed<nsINodeInfo>& aNodeInfo)
HTMLElement::HTMLElement(already_AddRefed<mozilla::dom::NodeInfo>& aNodeInfo)
: nsGenericHTMLElement(aNodeInfo)
{
}
@ -69,7 +69,7 @@ HTMLElement::WrapNode(JSContext *aCx)
// Here, we expand 'NS_IMPL_NS_NEW_HTML_ELEMENT()' by hand.
// (Calling the macro directly (with no args) produces compiler warnings.)
nsGenericHTMLElement*
NS_NewHTMLElement(already_AddRefed<nsINodeInfo>&& aNodeInfo,
NS_NewHTMLElement(already_AddRefed<mozilla::dom::NodeInfo>&& aNodeInfo,
mozilla::dom::FromParser aFromParser)
{
return new mozilla::dom::HTMLElement(aNodeInfo);

2
content/html/content/src/HTMLFieldSetElement.cpp
Просмотреть файл

@ -15,7 +15,7 @@ NS_IMPL_NS_NEW_HTML_ELEMENT(FieldSet)
namespace mozilla {
namespace dom {
HTMLFieldSetElement::HTMLFieldSetElement(already_AddRefed<nsINodeInfo>& aNodeInfo)
HTMLFieldSetElement::HTMLFieldSetElement(already_AddRefed<mozilla::dom::NodeInfo>& aNodeInfo)
: nsGenericHTMLFormElement(aNodeInfo)
, mElements(nullptr)
, mFirstLegend(nullptr)

4
content/html/content/src/HTMLFieldSetElement.h
Просмотреть файл

@ -27,7 +27,7 @@ public:
using nsIConstraintValidation::CheckValidity;
using nsIConstraintValidation::GetValidationMessage;
HTMLFieldSetElement(already_AddRefed<nsINodeInfo>& aNodeInfo);
HTMLFieldSetElement(already_AddRefed<mozilla::dom::NodeInfo>& aNodeInfo);
virtual ~HTMLFieldSetElement();
NS_IMPL_FROMCONTENT_HTML_WITH_TAG(HTMLFieldSetElement, fieldset)
@ -52,7 +52,7 @@ public:
NS_IMETHOD Reset() MOZ_OVERRIDE;
NS_IMETHOD SubmitNamesValues(nsFormSubmission* aFormSubmission) MOZ_OVERRIDE;
virtual bool IsDisabledForEvents(uint32_t aMessage) MOZ_OVERRIDE;
virtual nsresult Clone(nsINodeInfo *aNodeInfo, nsINode **aResult) const MOZ_OVERRIDE;
virtual nsresult Clone(mozilla::dom::NodeInfo *aNodeInfo, nsINode **aResult) const MOZ_OVERRIDE;
const nsIContent* GetFirstLegend() const { return mFirstLegend; }

4
content/html/content/src/HTMLFontElement.h
Просмотреть файл

@ -14,7 +14,7 @@ namespace dom {
class HTMLFontElement MOZ_FINAL : public nsGenericHTMLElement
{
public:
HTMLFontElement(already_AddRefed<nsINodeInfo>& aNodeInfo)
HTMLFontElement(already_AddRefed<mozilla::dom::NodeInfo>& aNodeInfo)
: nsGenericHTMLElement(aNodeInfo)
{
}
@ -51,7 +51,7 @@ public:
nsAttrValue& aResult) MOZ_OVERRIDE;
NS_IMETHOD_(bool) IsAttributeMapped(const nsIAtom* aAttribute) const MOZ_OVERRIDE;
virtual nsMapRuleToAttributesFunc GetAttributeMappingFunction() const MOZ_OVERRIDE;
virtual nsresult Clone(nsINodeInfo *aNodeInfo, nsINode **aResult) const MOZ_OVERRIDE;
virtual nsresult Clone(mozilla::dom::NodeInfo *aNodeInfo, nsINode **aResult) const MOZ_OVERRIDE;
protected:
virtual JSObject* WrapNode(JSContext *aCx) MOZ_OVERRIDE;

4
content/html/content/src/HTMLFormElement.cpp
Просмотреть файл

@ -64,7 +64,7 @@
// construction, destruction
nsGenericHTMLElement*
NS_NewHTMLFormElement(already_AddRefed<nsINodeInfo>&& aNodeInfo,
NS_NewHTMLFormElement(already_AddRefed<mozilla::dom::NodeInfo>&& aNodeInfo,
mozilla::dom::FromParser aFromParser)
{
mozilla::dom::HTMLFormElement* it = new mozilla::dom::HTMLFormElement(aNodeInfo);
@ -96,7 +96,7 @@ static const nsAttrValue::EnumTable* kFormDefaultAutocomplete = &kFormAutocomple
bool HTMLFormElement::gFirstFormSubmitted = false;
bool HTMLFormElement::gPasswordManagerInitialized = false;
HTMLFormElement::HTMLFormElement(already_AddRefed<nsINodeInfo>& aNodeInfo)
HTMLFormElement::HTMLFormElement(already_AddRefed<mozilla::dom::NodeInfo>& aNodeInfo)
: nsGenericHTMLElement(aNodeInfo),
mSelectedRadioButtons(4),
mRequiredRadioButtonCounts(4),

4
content/html/content/src/HTMLFormElement.h
Просмотреть файл

@ -42,7 +42,7 @@ class HTMLFormElement MOZ_FINAL : public nsGenericHTMLElement,
friend class HTMLFormControlsCollection;
public:
HTMLFormElement(already_AddRefed<nsINodeInfo>& aNodeInfo);
HTMLFormElement(already_AddRefed<mozilla::dom::NodeInfo>& aNodeInfo);
virtual ~HTMLFormElement();
nsresult Init();
@ -119,7 +119,7 @@ public:
*/
void ForgetCurrentSubmission();
virtual nsresult Clone(nsINodeInfo *aNodeInfo, nsINode **aResult) const MOZ_OVERRIDE;
virtual nsresult Clone(mozilla::dom::NodeInfo *aNodeInfo, nsINode **aResult) const MOZ_OVERRIDE;
NS_DECL_CYCLE_COLLECTION_SCRIPT_HOLDER_CLASS_INHERITED(HTMLFormElement,
nsGenericHTMLElement)

2
content/html/content/src/HTMLFrameElement.cpp
Просмотреть файл

@ -13,7 +13,7 @@ NS_IMPL_NS_NEW_HTML_ELEMENT_CHECK_PARSER(Frame)
namespace mozilla {
namespace dom {
HTMLFrameElement::HTMLFrameElement(already_AddRefed<nsINodeInfo>& aNodeInfo,
HTMLFrameElement::HTMLFrameElement(already_AddRefed<mozilla::dom::NodeInfo>& aNodeInfo,
FromParser aFromParser)
: nsGenericHTMLFrameElement(aNodeInfo, aFromParser)
{

4
content/html/content/src/HTMLFrameElement.h
Просмотреть файл

@ -22,7 +22,7 @@ class HTMLFrameElement MOZ_FINAL : public nsGenericHTMLFrameElement,
public:
using nsGenericHTMLFrameElement::SwapFrameLoaders;
HTMLFrameElement(already_AddRefed<nsINodeInfo>& aNodeInfo,
HTMLFrameElement(already_AddRefed<mozilla::dom::NodeInfo>& aNodeInfo,
FromParser aFromParser = NOT_FROM_PARSER);
virtual ~HTMLFrameElement();
@ -37,7 +37,7 @@ public:
nsIAtom* aAttribute,
const nsAString& aValue,
nsAttrValue& aResult) MOZ_OVERRIDE;
virtual nsresult Clone(nsINodeInfo *aNodeInfo, nsINode **aResult) const MOZ_OVERRIDE;
virtual nsresult Clone(mozilla::dom::NodeInfo *aNodeInfo, nsINode **aResult) const MOZ_OVERRIDE;
// WebIDL API
// The XPCOM GetFrameBorder is OK for us

4
content/html/content/src/HTMLFrameSetElement.h
Просмотреть файл

@ -46,7 +46,7 @@ class HTMLFrameSetElement MOZ_FINAL : public nsGenericHTMLElement,
public nsIDOMHTMLFrameSetElement
{
public:
HTMLFrameSetElement(already_AddRefed<nsINodeInfo>& aNodeInfo)
HTMLFrameSetElement(already_AddRefed<mozilla::dom::NodeInfo>& aNodeInfo)
: nsGenericHTMLElement(aNodeInfo),
mNumRows(0),
mNumCols(0),
@ -135,7 +135,7 @@ public:
virtual nsChangeHint GetAttributeChangeHint(const nsIAtom* aAttribute,
int32_t aModType) const MOZ_OVERRIDE;
virtual nsresult Clone(nsINodeInfo *aNodeInfo, nsINode **aResult) const MOZ_OVERRIDE;
virtual nsresult Clone(mozilla::dom::NodeInfo *aNodeInfo, nsINode **aResult) const MOZ_OVERRIDE;
protected:
virtual JSObject* WrapNode(JSContext *aCx) MOZ_OVERRIDE;

2
content/html/content/src/HTMLHRElement.cpp
Просмотреть файл

@ -11,7 +11,7 @@ NS_IMPL_NS_NEW_HTML_ELEMENT(HR)
namespace mozilla {
namespace dom {
HTMLHRElement::HTMLHRElement(already_AddRefed<nsINodeInfo>& aNodeInfo)
HTMLHRElement::HTMLHRElement(already_AddRefed<mozilla::dom::NodeInfo>& aNodeInfo)
: nsGenericHTMLElement(aNodeInfo)
{
}

4
content/html/content/src/HTMLHRElement.h
Просмотреть файл

@ -20,7 +20,7 @@ class HTMLHRElement MOZ_FINAL : public nsGenericHTMLElement,
public nsIDOMHTMLHRElement
{
public:
HTMLHRElement(already_AddRefed<nsINodeInfo>& aNodeInfo);
HTMLHRElement(already_AddRefed<mozilla::dom::NodeInfo>& aNodeInfo);
virtual ~HTMLHRElement();
// nsISupports
@ -35,7 +35,7 @@ public:
nsAttrValue& aResult) MOZ_OVERRIDE;
NS_IMETHOD_(bool) IsAttributeMapped(const nsIAtom* aAttribute) const MOZ_OVERRIDE;
virtual nsMapRuleToAttributesFunc GetAttributeMappingFunction() const MOZ_OVERRIDE;
virtual nsresult Clone(nsINodeInfo *aNodeInfo, nsINode **aResult) const MOZ_OVERRIDE;
virtual nsresult Clone(mozilla::dom::NodeInfo *aNodeInfo, nsINode **aResult) const MOZ_OVERRIDE;
// WebIDL API
void SetAlign(const nsAString& aAlign, ErrorResult& aError)

4
content/html/content/src/HTMLHeadingElement.h
Просмотреть файл

@ -17,7 +17,7 @@ class HTMLHeadingElement MOZ_FINAL : public nsGenericHTMLElement,
public nsIDOMHTMLHeadingElement
{
public:
HTMLHeadingElement(already_AddRefed<nsINodeInfo>& aNodeInfo)
HTMLHeadingElement(already_AddRefed<mozilla::dom::NodeInfo>& aNodeInfo)
: nsGenericHTMLElement(aNodeInfo)
{
}
@ -35,7 +35,7 @@ public:
nsAttrValue& aResult) MOZ_OVERRIDE;
NS_IMETHOD_(bool) IsAttributeMapped(const nsIAtom* aAttribute) const MOZ_OVERRIDE;
nsMapRuleToAttributesFunc GetAttributeMappingFunction() const MOZ_OVERRIDE;
virtual nsresult Clone(nsINodeInfo *aNodeInfo, nsINode **aResult) const MOZ_OVERRIDE;
virtual nsresult Clone(mozilla::dom::NodeInfo *aNodeInfo, nsINode **aResult) const MOZ_OVERRIDE;
// The XPCOM versions of GetAlign and SetAlign are fine for us for
// use from WebIDL.

2
content/html/content/src/HTMLIFrameElement.cpp
Просмотреть файл

@ -17,7 +17,7 @@ NS_IMPL_NS_NEW_HTML_ELEMENT_CHECK_PARSER(IFrame)
namespace mozilla {
namespace dom {
HTMLIFrameElement::HTMLIFrameElement(already_AddRefed<nsINodeInfo>& aNodeInfo,
HTMLIFrameElement::HTMLIFrameElement(already_AddRefed<mozilla::dom::NodeInfo>& aNodeInfo,
FromParser aFromParser)
: nsGenericHTMLFrameElement(aNodeInfo, aFromParser)
{

4
content/html/content/src/HTMLIFrameElement.h
Просмотреть файл

@ -18,7 +18,7 @@ class HTMLIFrameElement MOZ_FINAL : public nsGenericHTMLFrameElement
, public nsIDOMHTMLIFrameElement
{
public:
HTMLIFrameElement(already_AddRefed<nsINodeInfo>& aNodeInfo,
HTMLIFrameElement(already_AddRefed<mozilla::dom::NodeInfo>& aNodeInfo,
FromParser aFromParser = NOT_FROM_PARSER);
virtual ~HTMLIFrameElement();
@ -38,7 +38,7 @@ public:
NS_IMETHOD_(bool) IsAttributeMapped(const nsIAtom* aAttribute) const MOZ_OVERRIDE;
virtual nsMapRuleToAttributesFunc GetAttributeMappingFunction() const MOZ_OVERRIDE;
virtual nsresult Clone(nsINodeInfo *aNodeInfo, nsINode **aResult) const MOZ_OVERRIDE;
virtual nsresult Clone(mozilla::dom::NodeInfo *aNodeInfo, nsINode **aResult) const MOZ_OVERRIDE;
nsresult SetAttr(int32_t aNameSpaceID, nsIAtom* aName,
const nsAString& aValue, bool aNotify)

4
content/html/content/src/HTMLImageElement.cpp
Просмотреть файл

@ -49,7 +49,7 @@ NS_IMPL_NS_NEW_HTML_ELEMENT(Image)
namespace mozilla {
namespace dom {
HTMLImageElement::HTMLImageElement(already_AddRefed<nsINodeInfo>& aNodeInfo)
HTMLImageElement::HTMLImageElement(already_AddRefed<mozilla::dom::NodeInfo>& aNodeInfo)
: nsGenericHTMLElement(aNodeInfo)
, mForm(nullptr)
{
@ -615,7 +615,7 @@ HTMLImageElement::Image(const GlobalObject& aGlobal,
return nullptr;
}
already_AddRefed<nsINodeInfo> nodeInfo =
already_AddRefed<mozilla::dom::NodeInfo> nodeInfo =
doc->NodeInfoManager()->GetNodeInfo(nsGkAtoms::img, nullptr,
kNameSpaceID_XHTML,
nsIDOMNode::ELEMENT_NODE);

4
content/html/content/src/HTMLImageElement.h
Просмотреть файл

@ -23,7 +23,7 @@ class HTMLImageElement MOZ_FINAL : public nsGenericHTMLElement,
public nsIDOMHTMLImageElement
{
public:
explicit HTMLImageElement(already_AddRefed<nsINodeInfo>& aNodeInfo);
explicit HTMLImageElement(already_AddRefed<mozilla::dom::NodeInfo>& aNodeInfo);
virtual ~HTMLImageElement();
static already_AddRefed<HTMLImageElement>
@ -74,7 +74,7 @@ public:
virtual void UnbindFromTree(bool aDeep, bool aNullParent) MOZ_OVERRIDE;
virtual EventStates IntrinsicState() const MOZ_OVERRIDE;
virtual nsresult Clone(nsINodeInfo *aNodeInfo, nsINode **aResult) const MOZ_OVERRIDE;
virtual nsresult Clone(mozilla::dom::NodeInfo *aNodeInfo, nsINode **aResult) const MOZ_OVERRIDE;
nsresult CopyInnerTo(Element* aDest);

6
content/html/content/src/HTMLInputElement.cpp
Просмотреть файл

@ -1095,7 +1095,7 @@ static nsresult FireEventForAccessibility(nsIDOMHTMLInputElement* aTarget,
// construction, destruction
//
HTMLInputElement::HTMLInputElement(already_AddRefed<nsINodeInfo>& aNodeInfo,
HTMLInputElement::HTMLInputElement(already_AddRefed<mozilla::dom::NodeInfo>& aNodeInfo,
FromParser aFromParser)
: nsGenericHTMLFormElementWithState(aNodeInfo)
, mType(kInputDefaultType->value)
@ -1228,11 +1228,11 @@ NS_IMPL_NSICONSTRAINTVALIDATION_EXCEPT_SETCUSTOMVALIDITY(HTMLInputElement)
// nsIDOMNode
nsresult
HTMLInputElement::Clone(nsINodeInfo* aNodeInfo, nsINode** aResult) const
HTMLInputElement::Clone(mozilla::dom::NodeInfo* aNodeInfo, nsINode** aResult) const
{
*aResult = nullptr;
already_AddRefed<nsINodeInfo> ni = nsCOMPtr<nsINodeInfo>(aNodeInfo).forget();
already_AddRefed<mozilla::dom::NodeInfo> ni = nsRefPtr<mozilla::dom::NodeInfo>(aNodeInfo).forget();
nsRefPtr<HTMLInputElement> it = new HTMLInputElement(ni, NOT_FROM_PARSER);
nsresult rv = const_cast<HTMLInputElement*>(this)->CopyInnerTo(it);

4
content/html/content/src/HTMLInputElement.h
Просмотреть файл

@ -102,7 +102,7 @@ public:
using nsIConstraintValidation::Validity;
using nsGenericHTMLFormElementWithState::GetForm;
HTMLInputElement(already_AddRefed<nsINodeInfo>& aNodeInfo,
HTMLInputElement(already_AddRefed<mozilla::dom::NodeInfo>& aNodeInfo,
mozilla::dom::FromParser aFromParser);
virtual ~HTMLInputElement();
@ -235,7 +235,7 @@ public:
*/
already_AddRefed<nsIDOMHTMLInputElement> GetSelectedRadioButton();
virtual nsresult Clone(nsINodeInfo *aNodeInfo, nsINode **aResult) const MOZ_OVERRIDE;
virtual nsresult Clone(mozilla::dom::NodeInfo *aNodeInfo, nsINode **aResult) const MOZ_OVERRIDE;
NS_DECL_CYCLE_COLLECTION_CLASS_INHERITED(HTMLInputElement,
nsGenericHTMLFormElementWithState)

4
content/html/content/src/HTMLLIElement.h
Просмотреть файл

@ -18,7 +18,7 @@ class HTMLLIElement MOZ_FINAL : public nsGenericHTMLElement,
public nsIDOMHTMLLIElement
{
public:
HTMLLIElement(already_AddRefed<nsINodeInfo>& aNodeInfo)
HTMLLIElement(already_AddRefed<mozilla::dom::NodeInfo>& aNodeInfo)
: nsGenericHTMLElement(aNodeInfo)
{
}
@ -36,7 +36,7 @@ public:
nsAttrValue& aResult) MOZ_OVERRIDE;
NS_IMETHOD_(bool) IsAttributeMapped(const nsIAtom* aAttribute) const MOZ_OVERRIDE;
virtual nsMapRuleToAttributesFunc GetAttributeMappingFunction() const MOZ_OVERRIDE;
virtual nsresult Clone(nsINodeInfo *aNodeInfo, nsINode **aResult) const MOZ_OVERRIDE;
virtual nsresult Clone(mozilla::dom::NodeInfo *aNodeInfo, nsINode **aResult) const MOZ_OVERRIDE;
// WebIDL API
void GetType(nsString& aType)

4
content/html/content/src/HTMLLabelElement.h
Просмотреть файл

@ -21,7 +21,7 @@ class HTMLLabelElement MOZ_FINAL : public nsGenericHTMLFormElement,
public nsIDOMHTMLLabelElement
{
public:
HTMLLabelElement(already_AddRefed<nsINodeInfo>& aNodeInfo)
HTMLLabelElement(already_AddRefed<mozilla::dom::NodeInfo>& aNodeInfo)
: nsGenericHTMLFormElement(aNodeInfo),
mHandlingEvent(false)
{
@ -65,7 +65,7 @@ public:
EventChainPostVisitor& aVisitor) MOZ_OVERRIDE;
virtual void PerformAccesskey(bool aKeyCausesActivation,
bool aIsTrustedEvent) MOZ_OVERRIDE;
virtual nsresult Clone(nsINodeInfo *aNodeInfo, nsINode **aResult) const MOZ_OVERRIDE;
virtual nsresult Clone(mozilla::dom::NodeInfo *aNodeInfo, nsINode **aResult) const MOZ_OVERRIDE;
nsGenericHTMLElement* GetLabeledElement() const;
protected:

4
content/html/content/src/HTMLLegendElement.h
Просмотреть файл

@ -16,7 +16,7 @@ namespace dom {
class HTMLLegendElement MOZ_FINAL : public nsGenericHTMLElement
{
public:
HTMLLegendElement(already_AddRefed<nsINodeInfo>& aNodeInfo)
HTMLLegendElement(already_AddRefed<mozilla::dom::NodeInfo>& aNodeInfo)
: nsGenericHTMLElement(aNodeInfo)
{
}
@ -53,7 +53,7 @@ public:
virtual nsresult UnsetAttr(int32_t aNameSpaceID, nsIAtom* aAttribute,
bool aNotify) MOZ_OVERRIDE;
virtual nsresult Clone(nsINodeInfo* aNodeInfo, nsINode** aResult) const MOZ_OVERRIDE;
virtual nsresult Clone(mozilla::dom::NodeInfo* aNodeInfo, nsINode** aResult) const MOZ_OVERRIDE;
Element* GetFormElement()
{

2
content/html/content/src/HTMLLinkElement.cpp
Просмотреть файл

@ -35,7 +35,7 @@ NS_IMPL_NS_NEW_HTML_ELEMENT(Link)
namespace mozilla {
namespace dom {
HTMLLinkElement::HTMLLinkElement(already_AddRefed<nsINodeInfo>& aNodeInfo)
HTMLLinkElement::HTMLLinkElement(already_AddRefed<mozilla::dom::NodeInfo>& aNodeInfo)
: nsGenericHTMLElement(aNodeInfo)
, Link(MOZ_THIS_IN_INITIALIZER_LIST())
{

4
content/html/content/src/HTMLLinkElement.h
Просмотреть файл

@ -24,7 +24,7 @@ class HTMLLinkElement MOZ_FINAL : public nsGenericHTMLElement,
public Link
{
public:
HTMLLinkElement(already_AddRefed<nsINodeInfo>& aNodeInfo);
HTMLLinkElement(already_AddRefed<mozilla::dom::NodeInfo>& aNodeInfo);
virtual ~HTMLLinkElement();
// nsISupports
@ -51,7 +51,7 @@ public:
EventChainPostVisitor& aVisitor) MOZ_OVERRIDE;
// nsINode
virtual nsresult Clone(nsINodeInfo* aNodeInfo, nsINode** aResult) const MOZ_OVERRIDE;
virtual nsresult Clone(mozilla::dom::NodeInfo* aNodeInfo, nsINode** aResult) const MOZ_OVERRIDE;
virtual JSObject* WrapNode(JSContext* aCx) MOZ_OVERRIDE;
// nsIContent

2
content/html/content/src/HTMLMapElement.cpp
Просмотреть файл

@ -15,7 +15,7 @@ NS_IMPL_NS_NEW_HTML_ELEMENT(Map)
namespace mozilla {
namespace dom {
HTMLMapElement::HTMLMapElement(already_AddRefed<nsINodeInfo>& aNodeInfo)
HTMLMapElement::HTMLMapElement(already_AddRefed<mozilla::dom::NodeInfo>& aNodeInfo)
: nsGenericHTMLElement(aNodeInfo)
{
}

4
content/html/content/src/HTMLMapElement.h
Просмотреть файл

@ -21,7 +21,7 @@ class HTMLMapElement MOZ_FINAL : public nsGenericHTMLElement,
public nsIDOMHTMLMapElement
{
public:
HTMLMapElement(already_AddRefed<nsINodeInfo>& aNodeInfo);
HTMLMapElement(already_AddRefed<mozilla::dom::NodeInfo>& aNodeInfo);
// nsISupports
NS_DECL_ISUPPORTS_INHERITED
@ -29,7 +29,7 @@ public:
// nsIDOMHTMLMapElement
NS_DECL_NSIDOMHTMLMAPELEMENT
virtual nsresult Clone(nsINodeInfo *aNodeInfo, nsINode **aResult) const MOZ_OVERRIDE;
virtual nsresult Clone(mozilla::dom::NodeInfo *aNodeInfo, nsINode **aResult) const MOZ_OVERRIDE;
NS_DECL_CYCLE_COLLECTION_CLASS_INHERITED_NO_UNLINK(HTMLMapElement,
nsGenericHTMLElement)

2
content/html/content/src/HTMLMediaElement.cpp
Просмотреть файл

@ -1967,7 +1967,7 @@ HTMLMediaElement::LookupMediaElementURITable(nsIURI* aURI)
return nullptr;
}
HTMLMediaElement::HTMLMediaElement(already_AddRefed<nsINodeInfo>& aNodeInfo)
HTMLMediaElement::HTMLMediaElement(already_AddRefed<mozilla::dom::NodeInfo>& aNodeInfo)
: nsGenericHTMLElement(aNodeInfo),
mSrcStreamListener(nullptr),
mCurrentLoadID(0),

2
content/html/content/src/HTMLMenuElement.cpp
Просмотреть файл

@ -45,7 +45,7 @@ enum SeparatorType
HTMLMenuElement::HTMLMenuElement(already_AddRefed<nsINodeInfo>& aNodeInfo)
HTMLMenuElement::HTMLMenuElement(already_AddRefed<mozilla::dom::NodeInfo>& aNodeInfo)
: nsGenericHTMLElement(aNodeInfo), mType(MENU_TYPE_LIST)
{
}

4
content/html/content/src/HTMLMenuElement.h
Просмотреть файл

@ -19,7 +19,7 @@ class HTMLMenuElement MOZ_FINAL : public nsGenericHTMLElement,
public nsIHTMLMenu
{
public:
HTMLMenuElement(already_AddRefed<nsINodeInfo>& aNodeInfo);
HTMLMenuElement(already_AddRefed<mozilla::dom::NodeInfo>& aNodeInfo);
virtual ~HTMLMenuElement();
NS_IMPL_FROMCONTENT_HTML_WITH_TAG(HTMLMenuElement, menu)
@ -38,7 +38,7 @@ public:
const nsAString& aValue,
nsAttrValue& aResult) MOZ_OVERRIDE;
virtual nsresult Clone(nsINodeInfo *aNodeInfo, nsINode **aResult) const MOZ_OVERRIDE;
virtual nsresult Clone(mozilla::dom::NodeInfo *aNodeInfo, nsINode **aResult) const MOZ_OVERRIDE;
uint8_t GetType() const { return mType; }

6
content/html/content/src/HTMLMenuItemElement.cpp
Просмотреть файл

@ -156,7 +156,7 @@ protected:
HTMLMenuItemElement::HTMLMenuItemElement(
already_AddRefed<nsINodeInfo>& aNodeInfo, FromParser aFromParser)
already_AddRefed<mozilla::dom::NodeInfo>& aNodeInfo, FromParser aFromParser)
: nsGenericHTMLElement(aNodeInfo),
mType(kMenuItemDefaultType->value),
mParserCreating(false),
@ -177,10 +177,10 @@ NS_IMPL_ISUPPORTS_INHERITED(HTMLMenuItemElement, nsGenericHTMLElement,
//NS_IMPL_ELEMENT_CLONE(HTMLMenuItemElement)
nsresult
HTMLMenuItemElement::Clone(nsINodeInfo *aNodeInfo, nsINode **aResult) const
HTMLMenuItemElement::Clone(mozilla::dom::NodeInfo *aNodeInfo, nsINode **aResult) const
{
*aResult = nullptr;
already_AddRefed<nsINodeInfo> ni = nsCOMPtr<nsINodeInfo>(aNodeInfo).forget();
already_AddRefed<mozilla::dom::NodeInfo> ni = nsRefPtr<mozilla::dom::NodeInfo>(aNodeInfo).forget();
nsRefPtr<HTMLMenuItemElement> it =
new HTMLMenuItemElement(ni, NOT_FROM_PARSER);
nsresult rv = const_cast<HTMLMenuItemElement*>(this)->CopyInnerTo(it);

4
content/html/content/src/HTMLMenuItemElement.h
Просмотреть файл

@ -24,7 +24,7 @@ class HTMLMenuItemElement MOZ_FINAL : public nsGenericHTMLElement,
public:
using mozilla::dom::Element::GetText;
HTMLMenuItemElement(already_AddRefed<nsINodeInfo>& aNodeInfo,
HTMLMenuItemElement(already_AddRefed<mozilla::dom::NodeInfo>& aNodeInfo,
mozilla::dom::FromParser aFromParser);
virtual ~HTMLMenuItemElement();
@ -51,7 +51,7 @@ public:
virtual void DoneCreatingElement() MOZ_OVERRIDE;
virtual nsresult Clone(nsINodeInfo *aNodeInfo, nsINode **aResult) const MOZ_OVERRIDE;
virtual nsresult Clone(mozilla::dom::NodeInfo *aNodeInfo, nsINode **aResult) const MOZ_OVERRIDE;
uint8_t GetType() const { return mType; }

2
content/html/content/src/HTMLMetaElement.cpp
Просмотреть файл

@ -14,7 +14,7 @@ NS_IMPL_NS_NEW_HTML_ELEMENT(Meta)
namespace mozilla {
namespace dom {
HTMLMetaElement::HTMLMetaElement(already_AddRefed<nsINodeInfo>& aNodeInfo)
HTMLMetaElement::HTMLMetaElement(already_AddRefed<mozilla::dom::NodeInfo>& aNodeInfo)
: nsGenericHTMLElement(aNodeInfo)
{
}

Некоторые файлы не были показаны из-за слишком большого количества измененных файлов Показать больше