Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-01-26 23:23:33 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Backed out changeset a966aadd9ae3 (bug 856822) for Windows bustage on a CLOSED TREE.

Browse Source
This commit is contained in:
Ryan VanderMeulen 2013-05-29 17:56:10 -04:00
parent ffe7ef726b
commit 0a2c0872da
220 changed files with 1668 additions and 1858 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
content/base/public/Element.h
View File

@ -396,14 +396,14 @@ private:
NotifyStateChange(aStates);
}
public:
virtual void UpdateEditableState(bool aNotify) MOZ_OVERRIDE;
virtual void UpdateEditableState(bool aNotify);
virtual nsresult BindToTree(nsIDocument* aDocument, nsIContent* aParent,
nsIContent* aBindingParent,
bool aCompileEventHandlers) MOZ_OVERRIDE;
bool aCompileEventHandlers);
virtual void UnbindFromTree(bool aDeep = true,
bool aNullParent = true) MOZ_OVERRIDE;
virtual already_AddRefed<nsINodeInfo> GetExistingAttrNameFromQName(const nsAString& aStr) const MOZ_OVERRIDE;
bool aNullParent = true);
virtual already_AddRefed<nsINodeInfo> GetExistingAttrNameFromQName(const nsAString& aStr) const;
nsresult SetAttr(int32_t aNameSpaceID, nsIAtom* aName,
const nsAString& aValue, bool aNotify)
{
@ -439,7 +439,7 @@ public:
uint8_t* aModType, bool* aHasListeners);
virtual nsresult SetAttr(int32_t aNameSpaceID, nsIAtom* aName, nsIAtom* aPrefix,
const nsAString& aValue, bool aNotify) MOZ_OVERRIDE;
const nsAString& aValue, bool aNotify);
nsresult SetParsedAttr(int32_t aNameSpaceID, nsIAtom* aName, nsIAtom* aPrefix,
nsAttrValue& aParsedValue, bool aNotify);
// GetAttr is not inlined on purpose, to keep down codesize from all
@ -457,19 +457,19 @@ public:
virtual int32_t FindAttrValueIn(int32_t aNameSpaceID,
nsIAtom* aName,
AttrValuesArray* aValues,
nsCaseTreatment aCaseSensitive) const MOZ_OVERRIDE;
nsCaseTreatment aCaseSensitive) const;
virtual nsresult UnsetAttr(int32_t aNameSpaceID, nsIAtom* aAttribute,
bool aNotify) MOZ_OVERRIDE;
virtual const nsAttrName* GetAttrNameAt(uint32_t aIndex) const MOZ_OVERRIDE;
virtual uint32_t GetAttrCount() const MOZ_OVERRIDE;
virtual bool IsNodeOfType(uint32_t aFlags) const MOZ_OVERRIDE;
bool aNotify);
virtual const nsAttrName* GetAttrNameAt(uint32_t aIndex) const;
virtual uint32_t GetAttrCount() const;
virtual bool IsNodeOfType(uint32_t aFlags) const;
#ifdef DEBUG
virtual void List(FILE* out = stdout, int32_t aIndent = 0) const MOZ_OVERRIDE
virtual void List(FILE* out = stdout, int32_t aIndent = 0) const
{
List(out, aIndent, EmptyCString());
}
virtual void DumpContent(FILE* out, int32_t aIndent, bool aDumpAll) const MOZ_OVERRIDE;
virtual void DumpContent(FILE* out, int32_t aIndent, bool aDumpAll) const;
void List(FILE* out, int32_t aIndent, const nsCString& aPrefix) const;
void ListAttributes(FILE* out) const;
#endif

55
content/base/public/FragmentOrElement.h
View File

@ -12,7 +12,6 @@
#ifndef FragmentOrElement_h___
#define FragmentOrElement_h___
#include "mozilla/Attributes.h"
#include "nsAttrAndChildArray.h" // member
#include "nsCycleCollectionParticipant.h" // NS_DECL_CYCLE_*
#include "nsIContent.h" // base class
@ -61,15 +60,15 @@ public:
NS_DECL_NSIDOMNODELIST
// nsINodeList interface
virtual int32_t IndexOf(nsIContent* aContent) MOZ_OVERRIDE;
virtual nsIContent* Item(uint32_t aIndex) MOZ_OVERRIDE;
virtual int32_t IndexOf(nsIContent* aContent);
virtual nsIContent* Item(uint32_t aIndex);
void DropReference()
{
mNode = nullptr;
}
virtual nsINode* GetParentObject() MOZ_OVERRIDE
virtual nsINode* GetParentObject()
{
return mNode;
}
@ -187,40 +186,40 @@ public:
nsresult PostQueryInterface(REFNSIID aIID, void** aInstancePtr);
// nsINode interface methods
virtual uint32_t GetChildCount() const MOZ_OVERRIDE;
virtual nsIContent *GetChildAt(uint32_t aIndex) const MOZ_OVERRIDE;
virtual nsIContent * const * GetChildArray(uint32_t* aChildCount) const MOZ_OVERRIDE;
virtual uint32_t GetChildCount() const;
virtual nsIContent *GetChildAt(uint32_t aIndex) const;
virtual nsIContent * const * GetChildArray(uint32_t* aChildCount) const;
virtual int32_t IndexOf(const nsINode* aPossibleChild) const MOZ_OVERRIDE;
virtual nsresult InsertChildAt(nsIContent* aKid, uint32_t aIndex,
bool aNotify) MOZ_OVERRIDE;
virtual void RemoveChildAt(uint32_t aIndex, bool aNotify) MOZ_OVERRIDE;
virtual void GetTextContentInternal(nsAString& aTextContent) MOZ_OVERRIDE;
bool aNotify);
virtual void RemoveChildAt(uint32_t aIndex, bool aNotify);
virtual void GetTextContentInternal(nsAString& aTextContent);
virtual void SetTextContentInternal(const nsAString& aTextContent,
mozilla::ErrorResult& aError) MOZ_OVERRIDE;
mozilla::ErrorResult& aError);
// nsIContent interface methods
virtual already_AddRefed<nsINodeList> GetChildren(uint32_t aFilter) MOZ_OVERRIDE;
virtual const nsTextFragment *GetText() MOZ_OVERRIDE;
virtual uint32_t TextLength() const MOZ_OVERRIDE;
virtual already_AddRefed<nsINodeList> GetChildren(uint32_t aFilter);
virtual const nsTextFragment *GetText();
virtual uint32_t TextLength() const;
virtual nsresult SetText(const PRUnichar* aBuffer, uint32_t aLength,
bool aNotify) MOZ_OVERRIDE;
bool aNotify);
// Need to implement this here too to avoid hiding.
nsresult SetText(const nsAString& aStr, bool aNotify)
{
return SetText(aStr.BeginReading(), aStr.Length(), aNotify);
}
virtual nsresult AppendText(const PRUnichar* aBuffer, uint32_t aLength,
bool aNotify) MOZ_OVERRIDE;
virtual bool TextIsOnlyWhitespace() MOZ_OVERRIDE;
virtual void AppendTextTo(nsAString& aResult) MOZ_OVERRIDE;
virtual nsIContent *GetBindingParent() const MOZ_OVERRIDE;
virtual bool IsLink(nsIURI** aURI) const MOZ_OVERRIDE;
bool aNotify);
virtual bool TextIsOnlyWhitespace();
virtual void AppendTextTo(nsAString& aResult);
virtual nsIContent *GetBindingParent() const;
virtual bool IsLink(nsIURI** aURI) const;
virtual void DestroyContent() MOZ_OVERRIDE;
virtual void SaveSubtreeState() MOZ_OVERRIDE;
virtual void DestroyContent();
virtual void SaveSubtreeState();
virtual const nsAttrValue* DoGetClasses() const MOZ_OVERRIDE;
NS_IMETHOD WalkContentStyleRules(nsRuleWalker* aRuleWalker) MOZ_OVERRIDE;
virtual const nsAttrValue* DoGetClasses() const;
NS_IMETHOD WalkContentStyleRules(nsRuleWalker* aRuleWalker);
nsIHTMLCollection* Children();
@ -240,7 +239,7 @@ public:
*/
void FireNodeRemovedForChildren();
virtual bool OwnedOnlyByTheDOMTree() MOZ_OVERRIDE
virtual bool OwnedOnlyByTheDOMTree()
{
uint32_t rc = mRefCnt.get();
if (GetParent()) {
@ -250,12 +249,12 @@ public:
return rc == 0;
}
virtual bool IsPurple() MOZ_OVERRIDE
virtual bool IsPurple()
{
return mRefCnt.IsPurple();
}
virtual void RemovePurple() MOZ_OVERRIDE
virtual void RemovePurple()
{
mRefCnt.RemovePurple();
}
@ -362,7 +361,7 @@ public:
protected:
// Override from nsINode
virtual nsINode::nsSlots* CreateSlots() MOZ_OVERRIDE;
virtual nsINode::nsSlots* CreateSlots();
nsDOMSlots *DOMSlots()
{

23
content/base/public/nsDOMFile.h
View File

@ -6,7 +6,6 @@
#ifndef nsDOMFile_h__
#define nsDOMFile_h__
#include "mozilla/Attributes.h"
#include "nsICharsetDetectionObserver.h"
#include "nsIFile.h"
#include "nsIDOMFile.h"
@ -291,12 +290,12 @@ public:
}
// Overrides
NS_IMETHOD GetSize(uint64_t* aSize) MOZ_OVERRIDE;
NS_IMETHOD GetType(nsAString& aType) MOZ_OVERRIDE;
NS_IMETHOD GetLastModifiedDate(JSContext* cx, JS::Value* aLastModifiedDate) MOZ_OVERRIDE;
NS_IMETHOD GetMozLastModifiedDate(uint64_t* aLastModifiedDate) MOZ_OVERRIDE;
NS_IMETHOD GetMozFullPathInternal(nsAString& aFullPath) MOZ_OVERRIDE;
NS_IMETHOD GetInternalStream(nsIInputStream**) MOZ_OVERRIDE;
NS_IMETHOD GetSize(uint64_t* aSize);
NS_IMETHOD GetType(nsAString& aType);
NS_IMETHOD GetLastModifiedDate(JSContext* cx, JS::Value* aLastModifiedDate);
NS_IMETHOD GetMozLastModifiedDate(uint64_t* aLastModifiedDate);
NS_IMETHOD GetMozFullPathInternal(nsAString& aFullPath);
NS_IMETHOD GetInternalStream(nsIInputStream**);
protected:
// Create slice
@ -328,14 +327,14 @@ protected:
virtual already_AddRefed<nsIDOMBlob>
CreateSlice(uint64_t aStart, uint64_t aLength,
const nsAString& aContentType) MOZ_OVERRIDE;
const nsAString& aContentType);
virtual bool IsStoredFile() const MOZ_OVERRIDE
virtual bool IsStoredFile() const
{
return mStoredFile;
}
virtual bool IsWholeFile() const MOZ_OVERRIDE
virtual bool IsWholeFile() const
{
return mWholeFile;
}
@ -373,7 +372,7 @@ public:
NS_ASSERTION(mDataOwner && mDataOwner->mData, "must have data");
}
NS_IMETHOD GetInternalStream(nsIInputStream**) MOZ_OVERRIDE;
NS_IMETHOD GetInternalStream(nsIInputStream**);
protected:
// Create slice
@ -387,7 +386,7 @@ protected:
}
virtual already_AddRefed<nsIDOMBlob>
CreateSlice(uint64_t aStart, uint64_t aLength,
const nsAString& aContentType) MOZ_OVERRIDE;
const nsAString& aContentType);
// These classes need to see DataOwner.
friend class DataOwnerAdapter;

3
content/base/public/nsDocElementCreatedNotificationRunner.h
View File

@ -6,7 +6,6 @@
#ifndef nsDocElementCreatedNotificationRunner_h
#define nsDocElementCreatedNotificationRunner_h
#include "mozilla/Attributes.h"
#include "nsThreadUtils.h" /* nsRunnable */
#include "nsContentSink.h"
@ -21,7 +20,7 @@ public:
{
}
NS_IMETHOD Run() MOZ_OVERRIDE
NS_IMETHOD Run()
{
nsContentSink::NotifyDocElementCreated(mDoc);
return NS_OK;

15
content/base/public/nsHostObjectProtocolHandler.h
View File

@ -5,7 +5,6 @@
#ifndef nsHostObjectProtocolHandler_h
#define nsHostObjectProtocolHandler_h
#include "mozilla/Attributes.h"
#include "nsIProtocolHandler.h"
#include "nsIURI.h"
#include "nsCOMPtr.h"
@ -26,11 +25,11 @@ public:
// nsIProtocolHandler methods, except for GetScheme which is only defined
// in subclasses.
NS_IMETHOD GetDefaultPort(int32_t *aDefaultPort) MOZ_OVERRIDE;
NS_IMETHOD GetProtocolFlags(uint32_t *aProtocolFlags) MOZ_OVERRIDE;
NS_IMETHOD NewURI(const nsACString & aSpec, const char * aOriginCharset, nsIURI *aBaseURI, nsIURI * *_retval) MOZ_OVERRIDE;
NS_IMETHOD NewChannel(nsIURI *aURI, nsIChannel * *_retval) MOZ_OVERRIDE;
NS_IMETHOD AllowPort(int32_t port, const char * scheme, bool *_retval) MOZ_OVERRIDE;
NS_IMETHOD GetDefaultPort(int32_t *aDefaultPort);
NS_IMETHOD GetProtocolFlags(uint32_t *aProtocolFlags);
NS_IMETHOD NewURI(const nsACString & aSpec, const char * aOriginCharset, nsIURI *aBaseURI, nsIURI * *_retval);
NS_IMETHOD NewChannel(nsIURI *aURI, nsIChannel * *_retval);
NS_IMETHOD AllowPort(int32_t port, const char * scheme, bool *_retval);
// Methods for managing uri->object mapping
// AddDataEntry creates the URI with the given scheme and returns it in aUri
@ -46,13 +45,13 @@ public:
class nsBlobProtocolHandler : public nsHostObjectProtocolHandler
{
public:
NS_IMETHOD GetScheme(nsACString &result) MOZ_OVERRIDE;
NS_IMETHOD GetScheme(nsACString &result);
};
class nsMediaStreamProtocolHandler : public nsHostObjectProtocolHandler
{
public:
NS_IMETHOD GetScheme(nsACString &result) MOZ_OVERRIDE;
NS_IMETHOD GetScheme(nsACString &result);
};
inline bool IsBlobURI(nsIURI* aUri)

5
content/base/public/nsIContent.h
View File

@ -5,7 +5,6 @@
#ifndef nsIContent_h___
#define nsIContent_h___
#include "mozilla/Attributes.h"
#include "nsCaseTreatment.h" // for enum, cannot be forward-declared
#include "nsIDocument.h"
@ -847,9 +846,9 @@ public:
}
// Overloaded from nsINode
virtual already_AddRefed<nsIURI> GetBaseURI() const MOZ_OVERRIDE;
virtual already_AddRefed<nsIURI> GetBaseURI() const;
virtual nsresult PreHandleEvent(nsEventChainPreVisitor& aVisitor) MOZ_OVERRIDE;
virtual nsresult PreHandleEvent(nsEventChainPreVisitor& aVisitor);
virtual bool IsPurple() = 0;
virtual void RemovePurple() = 0;

3
content/base/public/nsIDocument.h
View File

@ -5,7 +5,6 @@
#ifndef nsIDocument_h___
#define nsIDocument_h___
#include "mozilla/Attributes.h"
#include "mozFlushType.h" // for enum
#include "nsAutoPtr.h" // for member
#include "nsCOMArray.h" // for member
@ -261,7 +260,7 @@ public:
{
return mDocumentBaseURI ? mDocumentBaseURI : mDocumentURI;
}
virtual already_AddRefed<nsIURI> GetBaseURI() const MOZ_OVERRIDE
virtual already_AddRefed<nsIURI> GetBaseURI() const
{
nsCOMPtr<nsIURI> uri = GetDocBaseURI();

3
content/base/public/nsReferencedElement.h
View File

@ -7,7 +7,6 @@
#ifndef NSREFERENCEDELEMENT_H_
#define NSREFERENCEDELEMENT_H_
#include "mozilla/Attributes.h"
#include "mozilla/dom/Element.h"
#include "nsIAtom.h"
#include "nsIDocument.h"
@ -135,7 +134,7 @@ private:
virtual ~ChangeNotification() {}
NS_DECL_ISUPPORTS_INHERITED
NS_IMETHOD Run() MOZ_OVERRIDE {
NS_IMETHOD Run() {
if (mTarget) {
mTarget->mPendingNotification = nullptr;
mTarget->ElementChanged(mFrom, mTo);

33
content/base/src/Attr.h
View File

@ -10,7 +10,6 @@
#ifndef mozilla_dom_Attr_h
#define mozilla_dom_Attr_h
#include "mozilla/Attributes.h"
#include "nsIAttribute.h"
#include "nsIDOMAttr.h"
#include "nsIDOMText.h"
@ -40,34 +39,34 @@ public:
// nsIDOMNode interface
NS_FORWARD_NSIDOMNODE_TO_NSINODE
virtual void GetTextContentInternal(nsAString& aTextContent) MOZ_OVERRIDE;
virtual void GetTextContentInternal(nsAString& aTextContent);
virtual void SetTextContentInternal(const nsAString& aTextContent,
ErrorResult& aError) MOZ_OVERRIDE;
virtual void GetNodeValueInternal(nsAString& aNodeValue) MOZ_OVERRIDE;
ErrorResult& aError);
virtual void GetNodeValueInternal(nsAString& aNodeValue);
virtual void SetNodeValueInternal(const nsAString& aNodeValue,
ErrorResult& aError) MOZ_OVERRIDE;
ErrorResult& aError);
// nsIDOMAttr interface
NS_DECL_NSIDOMATTR
virtual nsresult PreHandleEvent(nsEventChainPreVisitor& aVisitor) MOZ_OVERRIDE;
virtual nsresult PreHandleEvent(nsEventChainPreVisitor& aVisitor);
// nsIAttribute interface
void SetMap(nsDOMAttributeMap *aMap) MOZ_OVERRIDE;
nsIContent *GetContent() const MOZ_OVERRIDE;
nsresult SetOwnerDocument(nsIDocument* aDocument) MOZ_OVERRIDE;
void SetMap(nsDOMAttributeMap *aMap);
nsIContent *GetContent() const;
nsresult SetOwnerDocument(nsIDocument* aDocument);
// nsINode interface
virtual bool IsNodeOfType(uint32_t aFlags) const MOZ_OVERRIDE;
virtual uint32_t GetChildCount() const MOZ_OVERRIDE;
virtual nsIContent *GetChildAt(uint32_t aIndex) const MOZ_OVERRIDE;
virtual nsIContent * const * GetChildArray(uint32_t* aChildCount) const MOZ_OVERRIDE;
virtual bool IsNodeOfType(uint32_t aFlags) const;
virtual uint32_t GetChildCount() const;
virtual nsIContent *GetChildAt(uint32_t aIndex) const;
virtual nsIContent * const * GetChildArray(uint32_t* aChildCount) const;
virtual int32_t IndexOf(const nsINode* aPossibleChild) const MOZ_OVERRIDE;
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 already_AddRefed<nsIURI> GetBaseURI() const MOZ_OVERRIDE;
bool aNotify);
virtual void RemoveChildAt(uint32_t aIndex, bool aNotify);
virtual nsresult Clone(nsINodeInfo *aNodeInfo, nsINode **aResult) const;
virtual already_AddRefed<nsIURI> GetBaseURI() const;
static void Initialize();
static void Shutdown();

9
content/base/src/Comment.h
View File

@ -6,7 +6,6 @@
#ifndef mozilla_dom_Comment_h
#define mozilla_dom_Comment_h
#include "mozilla/Attributes.h"
#include "nsIDOMComment.h"
#include "nsGenericDOMDataNode.h"
@ -55,13 +54,13 @@ public:
virtual bool IsNodeOfType(uint32_t aFlags) const;
virtual nsGenericDOMDataNode* CloneDataNode(nsINodeInfo *aNodeInfo,
bool aCloneText) const MOZ_OVERRIDE;
bool aCloneText) const;
virtual nsIDOMNode* AsDOMNode() MOZ_OVERRIDE { return this; }
virtual nsIDOMNode* AsDOMNode() { return this; }
#ifdef DEBUG
virtual void List(FILE* out, int32_t aIndent) const MOZ_OVERRIDE;
virtual void List(FILE* out, int32_t aIndent) const;
virtual void DumpContent(FILE* out = stdout, int32_t aIndent = 0,
bool aDumpAll = true) const MOZ_OVERRIDE
bool aDumpAll = true) const
{
return;
}

29
content/base/src/DocumentFragment.h
View File

@ -7,7 +7,6 @@
#ifndef mozilla_dom_DocumentFragment_h__
#define mozilla_dom_DocumentFragment_h__
#include "mozilla/Attributes.h"
#include "mozilla/dom/FragmentOrElement.h"
#include "nsIDOMDocumentFragment.h"
@ -76,7 +75,7 @@ public:
// nsIContent
virtual already_AddRefed<nsINodeInfo>
GetExistingAttrNameFromQName(const nsAString& aStr) const MOZ_OVERRIDE
GetExistingAttrNameFromQName(const nsAString& aStr) const
{
return nullptr;
}
@ -88,40 +87,40 @@ public:
}
virtual nsresult SetAttr(int32_t aNameSpaceID, nsIAtom* aName,
nsIAtom* aPrefix, const nsAString& aValue,
bool aNotify) MOZ_OVERRIDE
bool aNotify)
{
return NS_OK;
}
virtual nsresult UnsetAttr(int32_t aNameSpaceID, nsIAtom* aAttribute,
bool aNotify) MOZ_OVERRIDE
bool aNotify)
{
return NS_OK;
}
virtual const nsAttrName* GetAttrNameAt(uint32_t aIndex) const MOZ_OVERRIDE
virtual const nsAttrName* GetAttrNameAt(uint32_t aIndex) const
{
return nullptr;
}
virtual uint32_t GetAttrCount() const MOZ_OVERRIDE
virtual uint32_t GetAttrCount() const
{
return 0;
}
virtual bool IsNodeOfType(uint32_t aFlags) const MOZ_OVERRIDE;
virtual bool IsNodeOfType(uint32_t aFlags) const;
virtual nsIDOMNode* AsDOMNode() MOZ_OVERRIDE { return this; }
virtual nsIDOMNode* AsDOMNode() { return this; }
virtual nsIAtom* DoGetID() const MOZ_OVERRIDE;
virtual nsIAtom *GetIDAttributeName() const MOZ_OVERRIDE;
virtual nsIAtom* DoGetID() const;
virtual nsIAtom *GetIDAttributeName() const;
virtual nsresult BindToTree(nsIDocument* aDocument, nsIContent* aParent,
nsIContent* aBindingParent,
bool aCompileEventHandlers) MOZ_OVERRIDE
bool aCompileEventHandlers)
{
NS_ASSERTION(false, "Trying to bind a fragment to a tree");
return NS_ERROR_NOT_IMPLEMENTED;
}
virtual void UnbindFromTree(bool aDeep, bool aNullParent) MOZ_OVERRIDE
virtual void UnbindFromTree(bool aDeep, bool aNullParent)
{
NS_ASSERTION(false, "Trying to unbind a fragment from a tree");
return;
@ -146,12 +145,12 @@ public:
Constructor(const GlobalObject& aGlobal, ErrorResult& aRv);
#ifdef DEBUG
virtual void List(FILE* out, int32_t aIndent) const MOZ_OVERRIDE;
virtual void DumpContent(FILE* out, int32_t aIndent, bool aDumpAll) const MOZ_OVERRIDE;
virtual void List(FILE* out, int32_t aIndent) const;
virtual void DumpContent(FILE* out, int32_t aIndent, bool aDumpAll) const;
#endif
protected:
nsresult Clone(nsINodeInfo *aNodeInfo, nsINode **aResult) const MOZ_OVERRIDE;
nsresult Clone(nsINodeInfo *aNodeInfo, nsINode **aResult) const;
mozilla::dom::HTMLTemplateElement* mHost; // Weak
};

13
content/base/src/DocumentType.h
View File

@ -10,7 +10,6 @@
#ifndef DocumentType_h
#define DocumentType_h
#include "mozilla/Attributes.h"
#include "nsCOMPtr.h"
#include "nsIDOMDocumentType.h"
#include "nsIContent.h"
@ -58,23 +57,23 @@ public:
NS_DECL_NSIDOMDOCUMENTTYPE
// nsINode
virtual bool IsNodeOfType(uint32_t aFlags) const MOZ_OVERRIDE;
virtual void GetNodeValueInternal(nsAString& aNodeValue) MOZ_OVERRIDE
virtual bool IsNodeOfType(uint32_t aFlags) const;
virtual void GetNodeValueInternal(nsAString& aNodeValue)
{
SetDOMStringToNull(aNodeValue);
}
virtual void SetNodeValueInternal(const nsAString& aNodeValue,
mozilla::ErrorResult& aError) MOZ_OVERRIDE
mozilla::ErrorResult& aError)
{
}
// nsIContent overrides
virtual const nsTextFragment* GetText() MOZ_OVERRIDE;
virtual const nsTextFragment* GetText();
virtual nsGenericDOMDataNode* CloneDataNode(nsINodeInfo *aNodeInfo,
bool aCloneText) const MOZ_OVERRIDE;
bool aCloneText) const;
virtual nsIDOMNode* AsDOMNode() MOZ_OVERRIDE { return this; }
virtual nsIDOMNode* AsDOMNode() { return this; }
protected:
virtual JSObject* WrapNode(JSContext *cx,

3
content/base/src/EventSource.h
View File

@ -13,7 +13,6 @@
#ifndef mozilla_dom_EventSource_h
#define mozilla_dom_EventSource_h
#include "mozilla/Attributes.h"
#include "nsDOMEventTargetHelper.h"
#include "nsIObserver.h"
#include "nsIStreamListener.h"
@ -107,7 +106,7 @@ public:
// Determine if preferences allow EventSource
static bool PrefEnabled();
virtual void DisconnectFromOwner() MOZ_OVERRIDE;
virtual void DisconnectFromOwner();
protected:
nsresult Init(nsISupports* aOwner,

3
content/base/src/WebSocket.h
View File

@ -7,7 +7,6 @@
#ifndef WebSocket_h__
#define WebSocket_h__
#include "mozilla/Attributes.h"
#include "mozilla/Util.h"
#include "nsWrapperCache.h"
@ -76,7 +75,7 @@ public:
virtual void EventListenerAdded(nsIAtom* aType) MOZ_OVERRIDE;
virtual void EventListenerRemoved(nsIAtom* aType) MOZ_OVERRIDE;
virtual void DisconnectFromOwner() MOZ_OVERRIDE;
virtual void DisconnectFromOwner();
// nsWrapperCache
nsPIDOMWindow* GetParentObject() { return GetOwner(); }

23
content/base/src/nsContentList.h
View File

@ -12,7 +12,6 @@
#ifndef nsContentList_h___
#define nsContentList_h___
#include "mozilla/Attributes.h"
#include "nsContentListDeclarations.h"
#include "nsISupports.h"
#include "nsTArray.h"
@ -50,8 +49,8 @@ public:
NS_DECL_NSIDOMNODELIST
// nsINodeList
virtual int32_t IndexOf(nsIContent* aContent) MOZ_OVERRIDE;
virtual nsIContent* Item(uint32_t aIndex) MOZ_OVERRIDE;
virtual int32_t IndexOf(nsIContent* aContent);
virtual nsIContent* Item(uint32_t aIndex);
uint32_t Length() const {
return mElements.Length();
@ -112,7 +111,7 @@ public:
NS_DECL_CYCLE_COLLECTION_CLASS_INHERITED(nsSimpleContentList,
nsBaseContentList)
virtual nsINode* GetParentObject() MOZ_OVERRIDE
virtual nsINode* GetParentObject()
{
return mRoot;
}
@ -255,18 +254,18 @@ public:
NS_DECL_NSIDOMHTMLCOLLECTION
// nsBaseContentList overrides
virtual int32_t IndexOf(nsIContent *aContent, bool aDoFlush) MOZ_OVERRIDE;
virtual int32_t IndexOf(nsIContent* aContent) MOZ_OVERRIDE;
virtual nsINode* GetParentObject() MOZ_OVERRIDE
virtual int32_t IndexOf(nsIContent *aContent, bool aDoFlush);
virtual int32_t IndexOf(nsIContent* aContent);
virtual nsINode* GetParentObject()
{
return mRootNode;
}
virtual nsIContent* Item(uint32_t aIndex) MOZ_OVERRIDE;
virtual mozilla::dom::Element* GetElementAt(uint32_t index) MOZ_OVERRIDE;
virtual nsIContent* Item(uint32_t aIndex);
virtual mozilla::dom::Element* GetElementAt(uint32_t index);
virtual JSObject* NamedItem(JSContext* cx, const nsAString& name,
mozilla::ErrorResult& error) MOZ_OVERRIDE;
virtual void GetSupportedNames(nsTArray<nsString>& aNames) MOZ_OVERRIDE;
mozilla::ErrorResult& error);
virtual void GetSupportedNames(nsTArray<nsString>& aNames);
// nsContentList public methods
NS_HIDDEN_(uint32_t) Length(bool aDoFlush);
@ -493,7 +492,7 @@ protected:
MOZ_ASSERT(mData);
}
virtual void RemoveFromCaches() MOZ_OVERRIDE {
virtual void RemoveFromCaches() {
RemoveFromFuncStringHashtable();
}
void RemoveFromFuncStringHashtable();

3
content/base/src/nsContentSink.h
View File

@ -13,7 +13,6 @@
// Base class for contentsink implementations.
#include "mozilla/Attributes.h"
#include "nsICSSLoaderObserver.h"
#include "nsWeakReference.h"
#include "nsCOMPtr.h"
@ -87,7 +86,7 @@ class nsContentSink : public nsICSSLoaderObserver,
// nsICSSLoaderObserver
NS_IMETHOD StyleSheetLoaded(nsCSSStyleSheet* aSheet, bool aWasAlternate,
nsresult aStatus) MOZ_OVERRIDE;
nsresult aStatus);
virtual nsresult ProcessMETATag(nsIContent* aContent);

10
content/base/src/nsDOMBlobBuilder.h
View File

@ -51,7 +51,7 @@ public:
NS_IMETHOD Initialize(nsISupports* aOwner,
JSContext* aCx,
JSObject* aObj,
const JS::CallArgs& aArgs) MOZ_OVERRIDE;
const JS::CallArgs& aArgs);
typedef nsIDOMBlob* (*UnwrapFuncPtr)(JSContext*, JSObject*);
nsresult InitBlob(JSContext* aCx,
@ -63,10 +63,10 @@ public:
JS::Value* aArgv);
already_AddRefed<nsIDOMBlob>
CreateSlice(uint64_t aStart, uint64_t aLength, const nsAString& aContentType) MOZ_OVERRIDE;
CreateSlice(uint64_t aStart, uint64_t aLength, const nsAString& aContentType);
NS_IMETHOD GetSize(uint64_t*) MOZ_OVERRIDE;
NS_IMETHOD GetInternalStream(nsIInputStream**) MOZ_OVERRIDE;
NS_IMETHOD GetSize(uint64_t*);
NS_IMETHOD GetInternalStream(nsIInputStream**);
static nsresult
NewFile(const nsAString& aName, nsISupports* *aNewObject);
@ -86,7 +86,7 @@ public:
}
virtual const nsTArray<nsCOMPtr<nsIDOMBlob> >*
GetSubBlobs() const MOZ_OVERRIDE { return &mBlobs; }
GetSubBlobs() const { return &mBlobs; }
protected:
nsTArray<nsCOMPtr<nsIDOMBlob> > mBlobs;

9
content/base/src/nsDOMDataChannel.h
View File

@ -7,7 +7,6 @@
#ifndef nsDOMDataChannel_h
#define nsDOMDataChannel_h
#include "mozilla/Attributes.h"
#include "mozilla/dom/DataChannelBinding.h"
#include "mozilla/dom/TypedArray.h"
#include "mozilla/net/DataChannel.h"
@ -78,18 +77,18 @@ public:
DoOnMessageAvailable(const nsACString& aMessage, bool aBinary);
virtual nsresult
OnMessageAvailable(nsISupports* aContext, const nsACString& aMessage) MOZ_OVERRIDE;
OnMessageAvailable(nsISupports* aContext, const nsACString& aMessage);
virtual nsresult
OnBinaryMessageAvailable(nsISupports* aContext, const nsACString& aMessage) MOZ_OVERRIDE;
OnBinaryMessageAvailable(nsISupports* aContext, const nsACString& aMessage);
virtual nsresult OnSimpleEvent(nsISupports* aContext, const nsAString& aName);
virtual nsresult
OnChannelConnected(nsISupports* aContext) MOZ_OVERRIDE;
OnChannelConnected(nsISupports* aContext);
virtual nsresult
OnChannelClosed(nsISupports* aContext) MOZ_OVERRIDE;
OnChannelClosed(nsISupports* aContext);
virtual void
AppReady();

5
content/base/src/nsDOMFileReader.h
View File

@ -6,7 +6,6 @@
#ifndef nsDOMFileReader_h__
#define nsDOMFileReader_h__
#include "mozilla/Attributes.h"
#include "nsISupportsUtils.h"
#include "nsString.h"
#include "nsWeakReference.h"
@ -51,10 +50,10 @@ public:
virtual void DoAbort(nsAString& aEvent) MOZ_OVERRIDE;
NS_IMETHOD DoOnStopRequest(nsIRequest* aRequest, nsISupports* aContext,
nsresult aStatus, nsAString& aSuccessEvent,
nsAString& aTerminationEvent) MOZ_OVERRIDE;
nsAString& aTerminationEvent);
NS_IMETHOD DoOnDataAvailable(nsIRequest* aRequest, nsISupports* aContext,
nsIInputStream* aInputStream, uint64_t aOffset,
uint32_t aCount) MOZ_OVERRIDE;
uint32_t aCount);
nsPIDOMWindow* GetParentObject() const
{

3
content/base/src/nsDOMMutationObserver.h
View File

@ -7,7 +7,6 @@
#ifndef nsDOMMutationObserver_h
#define nsDOMMutationObserver_h
#include "mozilla/Attributes.h"
#include "nsCycleCollectionParticipant.h"
#include "nsPIDOMWindow.h"
#include "nsIScriptContext.h"
@ -329,7 +328,7 @@ public:
virtual void AttributeSetToCurrentValue(nsIDocument* aDocument,
mozilla::dom::Element* aElement,
int32_t aNameSpaceID,
nsIAtom* aAttribute) MOZ_OVERRIDE
nsIAtom* aAttribute)
{
// We can reuse AttributeWillChange implementation.
AttributeWillChange(aDocument, aElement, aNameSpaceID, aAttribute,

304
content/base/src/nsDocument.h
View File

@ -516,9 +516,9 @@ public:
NS_DECL_SIZEOF_EXCLUDING_THIS
virtual void Reset(nsIChannel *aChannel, nsILoadGroup *aLoadGroup) MOZ_OVERRIDE;
virtual void Reset(nsIChannel *aChannel, nsILoadGroup *aLoadGroup);
virtual void ResetToURI(nsIURI *aURI, nsILoadGroup *aLoadGroup,
nsIPrincipal* aPrincipal) MOZ_OVERRIDE;
nsIPrincipal* aPrincipal);
// StartDocumentLoad is pure virtual so that subclasses must override it.
// The nsDocument StartDocumentLoad does some setup, but does NOT set
@ -529,18 +529,18 @@ public:
nsISupports* aContainer,
nsIStreamListener **aDocListener,
bool aReset = true,
nsIContentSink* aContentSink = nullptr) MOZ_OVERRIDE = 0;
nsIContentSink* aContentSink = nullptr) = 0;
virtual void StopDocumentLoad() MOZ_OVERRIDE;
virtual void StopDocumentLoad();
virtual void NotifyPossibleTitleChange(bool aBoundTitleElement) MOZ_OVERRIDE;
virtual void NotifyPossibleTitleChange(bool aBoundTitleElement);
virtual void SetDocumentURI(nsIURI* aURI) MOZ_OVERRIDE;
virtual void SetDocumentURI(nsIURI* aURI);
/**
* Set the principal responsible for this document.
*/
virtual void SetPrincipal(nsIPrincipal *aPrincipal) MOZ_OVERRIDE;
virtual void SetPrincipal(nsIPrincipal *aPrincipal);
/**
* Get the Content-Type of this document.
@ -551,43 +551,43 @@ public:
/**
* Set the Content-Type of this document.
*/
virtual void SetContentType(const nsAString& aContentType) MOZ_OVERRIDE;
virtual void SetContentType(const nsAString& aContentType);
virtual nsresult SetBaseURI(nsIURI* aURI) MOZ_OVERRIDE;
virtual nsresult SetBaseURI(nsIURI* aURI);
/**
* Get/Set the base target of a link in a document.
*/
virtual void GetBaseTarget(nsAString &aBaseTarget) MOZ_OVERRIDE;
virtual void GetBaseTarget(nsAString &aBaseTarget);
/**
* Return a standard name for the document's character set. This will
* trigger a startDocumentLoad if necessary to answer the question.
*/
virtual void SetDocumentCharacterSet(const nsACString& aCharSetID) MOZ_OVERRIDE;
virtual void SetDocumentCharacterSet(const nsACString& aCharSetID);
/**
* Add an observer that gets notified whenever the charset changes.
*/
virtual nsresult AddCharSetObserver(nsIObserver* aObserver) MOZ_OVERRIDE;
virtual nsresult AddCharSetObserver(nsIObserver* aObserver);
/**
* Remove a charset observer.
*/
virtual void RemoveCharSetObserver(nsIObserver* aObserver) MOZ_OVERRIDE;
virtual void RemoveCharSetObserver(nsIObserver* aObserver);
virtual Element* AddIDTargetObserver(nsIAtom* aID, IDTargetObserver aObserver,
void* aData, bool aForImage) MOZ_OVERRIDE;
void* aData, bool aForImage);
virtual void RemoveIDTargetObserver(nsIAtom* aID, IDTargetObserver aObserver,
void* aData, bool aForImage) MOZ_OVERRIDE;
void* aData, bool aForImage);
/**
* Access HTTP header data (this may also get set from other sources, like
* HTML META tags).
*/
virtual void GetHeaderData(nsIAtom* aHeaderField, nsAString& aData) const MOZ_OVERRIDE;
virtual void GetHeaderData(nsIAtom* aHeaderField, nsAString& aData) const;
virtual void SetHeaderData(nsIAtom* aheaderField,
const nsAString& aData) MOZ_OVERRIDE;
const nsAString& aData);
/**
* Create a new presentation shell that will use aContext for
@ -597,47 +597,47 @@ public:
virtual already_AddRefed<nsIPresShell> CreateShell(nsPresContext* aContext,
nsViewManager* aViewManager,
nsStyleSet* aStyleSet) MOZ_OVERRIDE;
virtual void DeleteShell() MOZ_OVERRIDE;
virtual void DeleteShell();
virtual nsresult GetAllowPlugins(bool* aAllowPlugins) MOZ_OVERRIDE;
virtual nsresult GetAllowPlugins(bool* aAllowPlugins);
virtual already_AddRefed<mozilla::dom::UndoManager> GetUndoManager() MOZ_OVERRIDE;
virtual already_AddRefed<mozilla::dom::UndoManager> GetUndoManager();
virtual nsresult SetSubDocumentFor(Element* aContent,
nsIDocument* aSubDoc) MOZ_OVERRIDE;
virtual nsIDocument* GetSubDocumentFor(nsIContent* aContent) const MOZ_OVERRIDE;
virtual Element* FindContentForSubDocument(nsIDocument *aDocument) const MOZ_OVERRIDE;
virtual Element* GetRootElementInternal() const MOZ_OVERRIDE;
nsIDocument* aSubDoc);
virtual nsIDocument* GetSubDocumentFor(nsIContent* aContent) const;
virtual Element* FindContentForSubDocument(nsIDocument *aDocument) const;
virtual Element* GetRootElementInternal() const;
/**
* Get the style sheets owned by this document.
* These are ordered, highest priority last
*/
virtual int32_t GetNumberOfStyleSheets() const MOZ_OVERRIDE;
virtual nsIStyleSheet* GetStyleSheetAt(int32_t aIndex) const MOZ_OVERRIDE;
virtual int32_t GetIndexOfStyleSheet(nsIStyleSheet* aSheet) const MOZ_OVERRIDE;
virtual void AddStyleSheet(nsIStyleSheet* aSheet) MOZ_OVERRIDE;
virtual void RemoveStyleSheet(nsIStyleSheet* aSheet) MOZ_OVERRIDE;
virtual int32_t GetNumberOfStyleSheets() const;
virtual nsIStyleSheet* GetStyleSheetAt(int32_t aIndex) const;
virtual int32_t GetIndexOfStyleSheet(nsIStyleSheet* aSheet) const;
virtual void AddStyleSheet(nsIStyleSheet* aSheet);
virtual void RemoveStyleSheet(nsIStyleSheet* aSheet);
virtual void UpdateStyleSheets(nsCOMArray<nsIStyleSheet>& aOldSheets,
nsCOMArray<nsIStyleSheet>& aNewSheets) MOZ_OVERRIDE;
nsCOMArray<nsIStyleSheet>& aNewSheets);
virtual void AddStyleSheetToStyleSets(nsIStyleSheet* aSheet);
virtual void RemoveStyleSheetFromStyleSets(nsIStyleSheet* aSheet);
virtual void InsertStyleSheetAt(nsIStyleSheet* aSheet, int32_t aIndex) MOZ_OVERRIDE;
virtual void InsertStyleSheetAt(nsIStyleSheet* aSheet, int32_t aIndex);
virtual void SetStyleSheetApplicableState(nsIStyleSheet* aSheet,
bool aApplicable) MOZ_OVERRIDE;
bool aApplicable);
virtual int32_t GetNumberOfCatalogStyleSheets() const MOZ_OVERRIDE;
virtual nsIStyleSheet* GetCatalogStyleSheetAt(int32_t aIndex) const MOZ_OVERRIDE;
virtual void AddCatalogStyleSheet(nsCSSStyleSheet* aSheet) MOZ_OVERRIDE;
virtual void EnsureCatalogStyleSheet(const char *aStyleSheetURI) MOZ_OVERRIDE;
virtual int32_t GetNumberOfCatalogStyleSheets() const;
virtual nsIStyleSheet* GetCatalogStyleSheetAt(int32_t aIndex) const;
virtual void AddCatalogStyleSheet(nsCSSStyleSheet* aSheet);
virtual void EnsureCatalogStyleSheet(const char *aStyleSheetURI);
virtual nsresult LoadAdditionalStyleSheet(additionalSheetType aType, nsIURI* aSheetURI) MOZ_OVERRIDE;
virtual void RemoveAdditionalStyleSheet(additionalSheetType aType, nsIURI* sheetURI) MOZ_OVERRIDE;
virtual nsIStyleSheet* FirstAdditionalAuthorSheet() MOZ_OVERRIDE;
virtual nsresult LoadAdditionalStyleSheet(additionalSheetType aType, nsIURI* aSheetURI);
virtual void RemoveAdditionalStyleSheet(additionalSheetType aType, nsIURI* sheetURI);
virtual nsIStyleSheet* FirstAdditionalAuthorSheet();
virtual nsIChannel* GetChannel() const MOZ_OVERRIDE {
virtual nsIChannel* GetChannel() const {
return mChannel;
}
@ -645,7 +645,7 @@ public:
* Get this document's inline style sheet. May return null if there
* isn't one
*/
virtual nsHTMLCSSStyleSheet* GetInlineStyleSheet() const MOZ_OVERRIDE {
virtual nsHTMLCSSStyleSheet* GetInlineStyleSheet() const {
return mStyleAttrStyleSheet;
}
@ -654,87 +654,87 @@ public:
* This is the context within which all scripts (during document
* creation and during event handling) will run.
*/
virtual nsIScriptGlobalObject* GetScriptGlobalObject() const MOZ_OVERRIDE;
virtual void SetScriptGlobalObject(nsIScriptGlobalObject* aGlobalObject) MOZ_OVERRIDE;
virtual nsIScriptGlobalObject* GetScriptGlobalObject() const;
virtual void SetScriptGlobalObject(nsIScriptGlobalObject* aGlobalObject);
virtual void SetScriptHandlingObject(nsIScriptGlobalObject* aScriptObject) MOZ_OVERRIDE;
virtual void SetScriptHandlingObject(nsIScriptGlobalObject* aScriptObject);
virtual nsIGlobalObject* GetScopeObject() const MOZ_OVERRIDE;
void SetScopeObject(nsIGlobalObject* aGlobal) MOZ_OVERRIDE;
virtual nsIGlobalObject* GetScopeObject() const;
void SetScopeObject(nsIGlobalObject* aGlobal);
/**
* Get the script loader for this document
*/
virtual nsScriptLoader* ScriptLoader() MOZ_OVERRIDE;
virtual nsScriptLoader* ScriptLoader();
/**
* Add/Remove an element to the document's id and name hashes
*/
virtual void AddToIdTable(Element* aElement, nsIAtom* aId) MOZ_OVERRIDE;
virtual void RemoveFromIdTable(Element* aElement, nsIAtom* aId) MOZ_OVERRIDE;
virtual void AddToNameTable(Element* aElement, nsIAtom* aName) MOZ_OVERRIDE;
virtual void RemoveFromNameTable(Element* aElement, nsIAtom* aName) MOZ_OVERRIDE;
virtual void AddToIdTable(Element* aElement, nsIAtom* aId);
virtual void RemoveFromIdTable(Element* aElement, nsIAtom* aId);
virtual void AddToNameTable(Element* aElement, nsIAtom* aName);
virtual void RemoveFromNameTable(Element* aElement, nsIAtom* aName);
/**
* Add a new observer of document change notifications. Whenever
* content is changed, appended, inserted or removed the observers are
* informed.
*/
virtual void AddObserver(nsIDocumentObserver* aObserver) MOZ_OVERRIDE;
virtual void AddObserver(nsIDocumentObserver* aObserver);
/**
* Remove an observer of document change notifications. This will
* return false if the observer cannot be found.
*/
virtual bool RemoveObserver(nsIDocumentObserver* aObserver) MOZ_OVERRIDE;
virtual bool RemoveObserver(nsIDocumentObserver* aObserver);
// Observation hooks used to propagate notifications to document
// observers.
virtual void BeginUpdate(nsUpdateType aUpdateType) MOZ_OVERRIDE;
virtual void EndUpdate(nsUpdateType aUpdateType) MOZ_OVERRIDE;
virtual void BeginLoad() MOZ_OVERRIDE;
virtual void EndLoad() MOZ_OVERRIDE;
virtual void BeginUpdate(nsUpdateType aUpdateType);
virtual void EndUpdate(nsUpdateType aUpdateType);
virtual void BeginLoad();
virtual void EndLoad();
virtual void SetReadyStateInternal(ReadyState rs) MOZ_OVERRIDE;
virtual void SetReadyStateInternal(ReadyState rs);
virtual void ContentStateChanged(nsIContent* aContent,
nsEventStates aStateMask) MOZ_OVERRIDE;
virtual void DocumentStatesChanged(nsEventStates aStateMask) MOZ_OVERRIDE;
nsEventStates aStateMask);
virtual void DocumentStatesChanged(nsEventStates aStateMask);
virtual void StyleRuleChanged(nsIStyleSheet* aStyleSheet,
nsIStyleRule* aOldStyleRule,
nsIStyleRule* aNewStyleRule) MOZ_OVERRIDE;
nsIStyleRule* aNewStyleRule);
virtual void StyleRuleAdded(nsIStyleSheet* aStyleSheet,
nsIStyleRule* aStyleRule) MOZ_OVERRIDE;
nsIStyleRule* aStyleRule);
virtual void StyleRuleRemoved(nsIStyleSheet* aStyleSheet,
nsIStyleRule* aStyleRule) MOZ_OVERRIDE;
nsIStyleRule* aStyleRule);
virtual void FlushPendingNotifications(mozFlushType aType) MOZ_OVERRIDE;
virtual void FlushExternalResources(mozFlushType aType) MOZ_OVERRIDE;
virtual void FlushPendingNotifications(mozFlushType aType);
virtual void FlushExternalResources(mozFlushType aType);
virtual void SetXMLDeclaration(const PRUnichar *aVersion,
const PRUnichar *aEncoding,
const int32_t aStandalone) MOZ_OVERRIDE;
const int32_t aStandalone);
virtual void GetXMLDeclaration(nsAString& aVersion,
nsAString& aEncoding,
nsAString& Standalone) MOZ_OVERRIDE;
virtual bool IsScriptEnabled() MOZ_OVERRIDE;
nsAString& Standalone);
virtual bool IsScriptEnabled();
virtual void OnPageShow(bool aPersisted, mozilla::dom::EventTarget* aDispatchStartTarget) MOZ_OVERRIDE;
virtual void OnPageHide(bool aPersisted, mozilla::dom::EventTarget* aDispatchStartTarget) MOZ_OVERRIDE;
virtual void OnPageShow(bool aPersisted, mozilla::dom::EventTarget* aDispatchStartTarget);
virtual void OnPageHide(bool aPersisted, mozilla::dom::EventTarget* aDispatchStartTarget);
virtual void WillDispatchMutationEvent(nsINode* aTarget) MOZ_OVERRIDE;
virtual void MutationEventDispatched(nsINode* aTarget) MOZ_OVERRIDE;
virtual void WillDispatchMutationEvent(nsINode* aTarget);
virtual void MutationEventDispatched(nsINode* aTarget);
// nsINode
virtual bool IsNodeOfType(uint32_t aFlags) const MOZ_OVERRIDE;
virtual nsIContent *GetChildAt(uint32_t aIndex) const MOZ_OVERRIDE;
virtual nsIContent * const * GetChildArray(uint32_t* aChildCount) const MOZ_OVERRIDE;
virtual bool IsNodeOfType(uint32_t aFlags) const;
virtual nsIContent *GetChildAt(uint32_t aIndex) const;
virtual nsIContent * const * GetChildArray(uint32_t* aChildCount) const;
virtual int32_t IndexOf(const nsINode* aPossibleChild) const MOZ_OVERRIDE;
virtual uint32_t GetChildCount() const MOZ_OVERRIDE;
virtual uint32_t GetChildCount() const;
virtual nsresult InsertChildAt(nsIContent* aKid, uint32_t aIndex,
bool aNotify) MOZ_OVERRIDE;
bool aNotify);
virtual nsresult AppendChildTo(nsIContent* aKid, bool aNotify);
virtual void RemoveChildAt(uint32_t aIndex, bool aNotify) MOZ_OVERRIDE;
virtual nsresult Clone(nsINodeInfo *aNodeInfo, nsINode **aResult) const MOZ_OVERRIDE
virtual void RemoveChildAt(uint32_t aIndex, bool aNotify);
virtual nsresult Clone(nsINodeInfo *aNodeInfo, nsINode **aResult) const
{
return NS_ERROR_NOT_IMPLEMENTED;
}
@ -742,30 +742,30 @@ public:
// nsIRadioGroupContainer
NS_IMETHOD WalkRadioGroup(const nsAString& aName,
nsIRadioVisitor* aVisitor,
bool aFlushContent) MOZ_OVERRIDE;
bool aFlushContent);
virtual void SetCurrentRadioButton(const nsAString& aName,
nsIDOMHTMLInputElement* aRadio) MOZ_OVERRIDE;
virtual nsIDOMHTMLInputElement* GetCurrentRadioButton(const nsAString& aName) MOZ_OVERRIDE;
nsIDOMHTMLInputElement* aRadio);
virtual nsIDOMHTMLInputElement* GetCurrentRadioButton(const nsAString& aName);
NS_IMETHOD GetNextRadioButton(const nsAString& aName,
const bool aPrevious,
nsIDOMHTMLInputElement* aFocusedRadio,
nsIDOMHTMLInputElement** aRadioOut) MOZ_OVERRIDE;
nsIDOMHTMLInputElement** aRadioOut);
virtual void AddToRadioGroup(const nsAString& aName,
nsIFormControl* aRadio) MOZ_OVERRIDE;
nsIFormControl* aRadio);
virtual void RemoveFromRadioGroup(const nsAString& aName,
nsIFormControl* aRadio) MOZ_OVERRIDE;
virtual uint32_t GetRequiredRadioCount(const nsAString& aName) const MOZ_OVERRIDE;
nsIFormControl* aRadio);
virtual uint32_t GetRequiredRadioCount(const nsAString& aName) const;
virtual void RadioRequiredChanged(const nsAString& aName,
nsIFormControl* aRadio) MOZ_OVERRIDE;
virtual bool GetValueMissingState(const nsAString& aName) const MOZ_OVERRIDE;
virtual void SetValueMissingState(const nsAString& aName, bool aValue) MOZ_OVERRIDE;
nsIFormControl* aRadio);
virtual bool GetValueMissingState(const nsAString& aName) const;
virtual void SetValueMissingState(const nsAString& aName, bool aValue);
// for radio group
nsRadioGroupStruct* GetRadioGroup(const nsAString& aName) const;
nsRadioGroupStruct* GetOrCreateRadioGroup(const nsAString& aName);
virtual nsViewportInfo GetViewportInfo(uint32_t aDisplayWidth,
uint32_t aDisplayHeight) MOZ_OVERRIDE;
uint32_t aDisplayHeight);
private:
@ -785,12 +785,12 @@ public:
NS_DECL_NSIDOMDOCUMENTXBL
// nsIDOMEventTarget
virtual nsresult PreHandleEvent(nsEventChainPreVisitor& aVisitor) MOZ_OVERRIDE;
virtual nsresult PreHandleEvent(nsEventChainPreVisitor& aVisitor);
virtual nsEventListenerManager*
GetListenerManager(bool aCreateIfNotFound) MOZ_OVERRIDE;
GetListenerManager(bool aCreateIfNotFound);
// nsIScriptObjectPrincipal
virtual nsIPrincipal* GetPrincipal() MOZ_OVERRIDE;
virtual nsIPrincipal* GetPrincipal();
// nsIApplicationCacheContainer
NS_DECL_NSIAPPLICATIONCACHECONTAINER
@ -814,7 +814,7 @@ public:
virtual nsresult CreateElem(const nsAString& aName, nsIAtom *aPrefix,
int32_t aNamespaceID,
nsIContent **aResult) MOZ_OVERRIDE;
nsIContent **aResult);
virtual NS_HIDDEN_(void) Sanitize();
@ -834,7 +834,7 @@ public:
NS_HIDDEN_(void) ClearBoxObjectFor(nsIContent* aContent);
already_AddRefed<nsIBoxObject> GetBoxObjectFor(mozilla::dom::Element* aElement,
mozilla::ErrorResult& aRv) MOZ_OVERRIDE;
mozilla::ErrorResult& aRv);
virtual NS_HIDDEN_(nsresult) GetXBLChildNodesFor(nsIContent* aContent,
nsIDOMNodeList** aResult);
@ -873,20 +873,20 @@ public:
// Returns our (lazily-initialized) animation controller.
// If HasAnimationController is true, this is guaranteed to return non-null.
nsSMILAnimationController* GetAnimationController() MOZ_OVERRIDE;
nsSMILAnimationController* GetAnimationController();
void SetImagesNeedAnimating(bool aAnimating) MOZ_OVERRIDE;
void SetImagesNeedAnimating(bool aAnimating);
virtual void SuppressEventHandling(uint32_t aIncrease) MOZ_OVERRIDE;
virtual void SuppressEventHandling(uint32_t aIncrease);
virtual void UnsuppressEventHandlingAndFireEvents(bool aFireEvents) MOZ_OVERRIDE;
virtual void UnsuppressEventHandlingAndFireEvents(bool aFireEvents);
void DecreaseEventSuppression() {
--mEventsSuppressed;
MaybeRescheduleAnimationFrameNotifications();
}
virtual nsIDocument* GetTemplateContentsOwner() MOZ_OVERRIDE;
virtual nsIDocument* GetTemplateContentsOwner();
NS_DECL_CYCLE_COLLECTION_SKIPPABLE_SCRIPT_HOLDER_CLASS_AMBIGUOUS(nsDocument,
nsIDocument)
@ -911,35 +911,35 @@ public:
void MaybeEndOutermostXBLUpdate();
virtual void MaybePreLoadImage(nsIURI* uri,
const nsAString &aCrossOriginAttr) MOZ_OVERRIDE;
const nsAString &aCrossOriginAttr);
virtual void PreloadStyle(nsIURI* uri, const nsAString& charset,
const nsAString& aCrossOriginAttr) MOZ_OVERRIDE;
const nsAString& aCrossOriginAttr);
virtual nsresult LoadChromeSheetSync(nsIURI* uri, bool isAgentSheet,
nsCSSStyleSheet** sheet) MOZ_OVERRIDE;
nsCSSStyleSheet** sheet);
virtual nsISupports* GetCurrentContentSink() MOZ_OVERRIDE;
virtual nsISupports* GetCurrentContentSink();
virtual nsEventStates GetDocumentState() MOZ_OVERRIDE;
virtual nsEventStates GetDocumentState();
virtual void RegisterHostObjectUri(const nsACString& aUri) MOZ_OVERRIDE;
virtual void UnregisterHostObjectUri(const nsACString& aUri) MOZ_OVERRIDE;
virtual void RegisterHostObjectUri(const nsACString& aUri);
virtual void UnregisterHostObjectUri(const nsACString& aUri);
// Only BlockOnload should call this!
void AsyncBlockOnload();
virtual void SetScrollToRef(nsIURI *aDocumentURI) MOZ_OVERRIDE;
virtual void ScrollToRef() MOZ_OVERRIDE;
virtual void ResetScrolledToRefAlready() MOZ_OVERRIDE;
virtual void SetChangeScrollPosWhenScrollingToRef(bool aValue) MOZ_OVERRIDE;
virtual void SetScrollToRef(nsIURI *aDocumentURI);
virtual void ScrollToRef();
virtual void ResetScrolledToRefAlready();
virtual void SetChangeScrollPosWhenScrollingToRef(bool aValue);
virtual Element *GetElementById(const nsAString& aElementId) MOZ_OVERRIDE;
virtual const nsSmallVoidArray* GetAllElementsForId(const nsAString& aElementId) const MOZ_OVERRIDE;
virtual Element *GetElementById(const nsAString& aElementId);
virtual const nsSmallVoidArray* GetAllElementsForId(const nsAString& aElementId) const;
virtual Element *LookupImageElement(const nsAString& aElementId) MOZ_OVERRIDE;
virtual Element *LookupImageElement(const nsAString& aElementId);
virtual void MozSetImageElement(const nsAString& aImageElementId,
Element* aElement) MOZ_OVERRIDE;
Element* aElement);
virtual NS_HIDDEN_(nsresult) AddImage(imgIRequest* aImage);
virtual NS_HIDDEN_(nsresult) RemoveImage(imgIRequest* aImage, uint32_t aFlags);
@ -947,40 +947,40 @@ public:
// AddPlugin adds a plugin-related element to mPlugins when the element is
// added to the tree.
virtual nsresult AddPlugin(nsIObjectLoadingContent* aPlugin) MOZ_OVERRIDE;
virtual nsresult AddPlugin(nsIObjectLoadingContent* aPlugin);
// RemovePlugin removes a plugin-related element to mPlugins when the
// element is removed from the tree.
virtual void RemovePlugin(nsIObjectLoadingContent* aPlugin) MOZ_OVERRIDE;
virtual void RemovePlugin(nsIObjectLoadingContent* aPlugin);
// GetPlugins returns the plugin-related elements from
// the frame and any subframes.
virtual void GetPlugins(nsTArray<nsIObjectLoadingContent*>& aPlugins) MOZ_OVERRIDE;
virtual void GetPlugins(nsTArray<nsIObjectLoadingContent*>& aPlugins);
virtual nsresult GetStateObject(nsIVariant** aResult) MOZ_OVERRIDE;
virtual nsresult GetStateObject(nsIVariant** aResult);
virtual nsDOMNavigationTiming* GetNavigationTiming() const MOZ_OVERRIDE;
virtual nsresult SetNavigationTiming(nsDOMNavigationTiming* aTiming) MOZ_OVERRIDE;
virtual nsDOMNavigationTiming* GetNavigationTiming() const;
virtual nsresult SetNavigationTiming(nsDOMNavigationTiming* aTiming);
virtual Element* FindImageMap(const nsAString& aNormalizedMapName) MOZ_OVERRIDE;
virtual Element* FindImageMap(const nsAString& aNormalizedMapName);
virtual void NotifyAudioAvailableListener() MOZ_OVERRIDE;
virtual void NotifyAudioAvailableListener();
bool HasAudioAvailableListeners() MOZ_OVERRIDE
bool HasAudioAvailableListeners()
{
return mHasAudioAvailableListener;
}
virtual Element* GetFullScreenElement() MOZ_OVERRIDE;
virtual void AsyncRequestFullScreen(Element* aElement) MOZ_OVERRIDE;
virtual void RestorePreviousFullScreenState() MOZ_OVERRIDE;
virtual bool IsFullscreenLeaf() MOZ_OVERRIDE;
virtual bool IsFullScreenDoc() MOZ_OVERRIDE;
virtual void SetApprovedForFullscreen(bool aIsApproved) MOZ_OVERRIDE;
virtual Element* GetFullScreenElement();
virtual void AsyncRequestFullScreen(Element* aElement);
virtual void RestorePreviousFullScreenState();
virtual bool IsFullscreenLeaf();
virtual bool IsFullScreenDoc();
virtual void SetApprovedForFullscreen(bool aIsApproved);
virtual nsresult RemoteFrameFullscreenChanged(nsIDOMElement* aFrameElement,
const nsAString& aNewOrigin) MOZ_OVERRIDE;
const nsAString& aNewOrigin);
virtual nsresult RemoteFrameFullscreenReverted() MOZ_OVERRIDE;
virtual nsIDocument* GetFullscreenRoot() MOZ_OVERRIDE;
virtual void SetFullscreenRoot(nsIDocument* aRoot) MOZ_OVERRIDE;
virtual nsresult RemoteFrameFullscreenReverted();
virtual nsIDocument* GetFullscreenRoot();
virtual void SetFullscreenRoot(nsIDocument* aRoot);
static void ExitFullscreen(nsIDocument* aDoc);
@ -1023,10 +1023,10 @@ public:
Element* FullScreenStackTop();
// DOM-exposed fullscreen API
virtual bool MozFullScreenEnabled() MOZ_OVERRIDE;
virtual Element* GetMozFullScreenElement(mozilla::ErrorResult& rv) MOZ_OVERRIDE;
virtual bool MozFullScreenEnabled();
virtual Element* GetMozFullScreenElement(mozilla::ErrorResult& rv);
void RequestPointerLock(Element* aElement) MOZ_OVERRIDE;
void RequestPointerLock(Element* aElement);
bool ShouldLockPointer(Element* aElement, Element* aCurrentLock,
bool aNoFocusCheck = false);
bool SetPointerLock(Element* aElement, int aCursorStyle);
@ -1036,12 +1036,12 @@ public:
// synchronously.
void UpdateVisibilityState();
// Posts an event to call UpdateVisibilityState
virtual void PostVisibilityUpdateEvent() MOZ_OVERRIDE;
virtual void PostVisibilityUpdateEvent();
virtual void DocSizeOfExcludingThis(nsWindowSizes* aWindowSizes) const MOZ_OVERRIDE;
virtual void DocSizeOfExcludingThis(nsWindowSizes* aWindowSizes) const;
// DocSizeOfIncludingThis is inherited from nsIDocument.
virtual nsIDOMNode* AsDOMNode() MOZ_OVERRIDE { return this; }
virtual nsIDOMNode* AsDOMNode() { return this; }
void GetCustomPrototype(const nsAString& aElementName, JS::MutableHandle<JSObject*> prototype)
{
@ -1052,16 +1052,16 @@ public:
// WebIDL bits
virtual mozilla::dom::DOMImplementation*
GetImplementation(mozilla::ErrorResult& rv) MOZ_OVERRIDE;
GetImplementation(mozilla::ErrorResult& rv);
virtual JSObject*
Register(JSContext* aCx, const nsAString& aName,
const mozilla::dom::ElementRegistrationOptions& aOptions,
mozilla::ErrorResult& rv) MOZ_OVERRIDE;
virtual nsIDOMStyleSheetList* StyleSheets() MOZ_OVERRIDE;
virtual void SetSelectedStyleSheetSet(const nsAString& aSheetSet) MOZ_OVERRIDE;
virtual void GetLastStyleSheetSet(nsString& aSheetSet) MOZ_OVERRIDE;
virtual nsIDOMDOMStringList* StyleSheetSets() MOZ_OVERRIDE;
virtual void EnableStyleSheetsForSet(const nsAString& aSheetSet) MOZ_OVERRIDE;
mozilla::ErrorResult& rv);
virtual nsIDOMStyleSheetList* StyleSheets();
virtual void SetSelectedStyleSheetSet(const nsAString& aSheetSet);
virtual void GetLastStyleSheetSet(nsString& aSheetSet);
virtual nsIDOMDOMStringList* StyleSheetSets();
virtual void EnableStyleSheetsForSet(const nsAString& aSheetSet);
protected:
friend class nsNodeUtils;
@ -1133,9 +1133,9 @@ protected:
void GetTitleFromElement(uint32_t aNodeType, nsAString& aTitle);
public:
// Get our title
virtual void GetTitle(nsString& aTitle) MOZ_OVERRIDE;
virtual void GetTitle(nsString& aTitle);
// Set our title
virtual void SetTitle(const nsAString& aTitle, mozilla::ErrorResult& rv) MOZ_OVERRIDE;
virtual void SetTitle(const nsAString& aTitle, mozilla::ErrorResult& rv);
static void XPCOMShutdown();
@ -1160,9 +1160,9 @@ protected:
const nsAString& aType,
bool aPersisted);
virtual nsPIDOMWindow *GetWindowInternal() const MOZ_OVERRIDE;
virtual nsIScriptGlobalObject* GetScriptHandlingObjectInternal() const MOZ_OVERRIDE;
virtual bool InternalAllowXULXBL() MOZ_OVERRIDE;
virtual nsPIDOMWindow *GetWindowInternal() const;
virtual nsIScriptGlobalObject* GetScriptHandlingObjectInternal() const;
virtual bool InternalAllowXULXBL();
#define NS_DOCUMENT_NOTIFY_OBSERVERS(func_, params_) \
NS_OBSERVER_ARRAY_NOTIFY_XPCOM_OBSERVERS(mObservers, nsIDocumentObserver, \

7
content/base/src/nsFormData.h
View File

@ -5,7 +5,6 @@
#ifndef nsFormData_h__
#define nsFormData_h__
#include "mozilla/Attributes.h"
#include "nsIDOMFormData.h"
#include "nsIXMLHttpRequest.h"
#include "nsFormSubmission.h"
@ -60,9 +59,9 @@ public:
// nsFormSubmission
virtual nsresult GetEncodedSubmission(nsIURI* aURI,
nsIInputStream** aPostDataStream) MOZ_OVERRIDE;
nsIInputStream** aPostDataStream);
virtual nsresult AddNameValuePair(const nsAString& aName,
const nsAString& aValue) MOZ_OVERRIDE
const nsAString& aValue)
{
FormDataTuple* data = mFormData.AppendElement();
data->name = aName;
@ -72,7 +71,7 @@ public:
}
virtual nsresult AddNameFilePair(const nsAString& aName,
nsIDOMBlob* aBlob,
const nsString& aFilename) MOZ_OVERRIDE
const nsString& aFilename)
{
FormDataTuple* data = mFormData.AppendElement();
data->name = aName;

10
content/base/src/nsFrameLoader.h
View File

@ -185,12 +185,12 @@ public:
/**
* MessageManagerCallback methods that we override.
*/
virtual bool DoLoadFrameScript(const nsAString& aURL) MOZ_OVERRIDE;
virtual bool DoLoadFrameScript(const nsAString& aURL);
virtual bool DoSendAsyncMessage(const nsAString& aMessage,
const mozilla::dom::StructuredCloneData& aData) MOZ_OVERRIDE;
virtual bool CheckPermission(const nsAString& aPermission) MOZ_OVERRIDE;
virtual bool CheckManifestURL(const nsAString& aManifestURL) MOZ_OVERRIDE;
virtual bool CheckAppHasPermission(const nsAString& aPermission) MOZ_OVERRIDE;
const mozilla::dom::StructuredCloneData& aData);
virtual bool CheckPermission(const nsAString& aPermission);
virtual bool CheckManifestURL(const nsAString& aManifestURL);
virtual bool CheckAppHasPermission(const nsAString& aPermission);
/**
* Called from the layout frame associated with this frame loader;

81
content/base/src/nsGenericDOMDataNode.h
View File

@ -11,7 +11,6 @@
#ifndef nsGenericDOMDataNode_h___
#define nsGenericDOMDataNode_h___
#include "mozilla/Attributes.h"
#include "nsIContent.h"
#include "nsTextFragment.h"
@ -59,9 +58,9 @@ public:
nsGenericDOMDataNode(already_AddRefed<nsINodeInfo> aNodeInfo);
virtual ~nsGenericDOMDataNode();
virtual void GetNodeValueInternal(nsAString& aNodeValue) MOZ_OVERRIDE;
virtual void GetNodeValueInternal(nsAString& aNodeValue);
virtual void SetNodeValueInternal(const nsAString& aNodeValue,
mozilla::ErrorResult& aError) MOZ_OVERRIDE;
mozilla::ErrorResult& aError);
// Implementation for nsIDOMCharacterData
nsresult GetData(nsAString& aData) const;
@ -77,19 +76,19 @@ public:
NS_IMETHOD MozRemove();
// nsINode methods
virtual uint32_t GetChildCount() const MOZ_OVERRIDE;
virtual nsIContent *GetChildAt(uint32_t aIndex) const MOZ_OVERRIDE;
virtual nsIContent * const * GetChildArray(uint32_t* aChildCount) const MOZ_OVERRIDE;
virtual int32_t IndexOf(const nsINode* aPossibleChild) const MOZ_OVERRIDE;
virtual uint32_t GetChildCount() const;
virtual nsIContent *GetChildAt(uint32_t aIndex) const;
virtual nsIContent * const * GetChildArray(uint32_t* aChildCount) const;
virtual int32_t IndexOf(const nsINode* aPossibleChild) const;
virtual nsresult InsertChildAt(nsIContent* aKid, uint32_t aIndex,
bool aNotify) MOZ_OVERRIDE;
virtual void RemoveChildAt(uint32_t aIndex, bool aNotify) MOZ_OVERRIDE;
virtual void GetTextContentInternal(nsAString& aTextContent) MOZ_OVERRIDE
bool aNotify);
virtual void RemoveChildAt(uint32_t aIndex, bool aNotify);
virtual void GetTextContentInternal(nsAString& aTextContent)
{
GetNodeValue(aTextContent);
}
virtual void SetTextContentInternal(const nsAString& aTextContent,
mozilla::ErrorResult& aError) MOZ_OVERRIDE
mozilla::ErrorResult& aError)
{
// Batch possible DOMSubtreeModified events.
mozAutoSubtreeModified subtree(OwnerDoc(), nullptr);
@ -99,14 +98,14 @@ public:
// Implementation for nsIContent
virtual nsresult BindToTree(nsIDocument* aDocument, nsIContent* aParent,
nsIContent* aBindingParent,
bool aCompileEventHandlers) MOZ_OVERRIDE;
bool aCompileEventHandlers);
virtual void UnbindFromTree(bool aDeep = true,
bool aNullParent = true) MOZ_OVERRIDE;
bool aNullParent = true);
virtual already_AddRefed<nsINodeList> GetChildren(uint32_t aFilter) MOZ_OVERRIDE;
virtual already_AddRefed<nsINodeList> GetChildren(uint32_t aFilter);
virtual nsIAtom *GetIDAttributeName() const MOZ_OVERRIDE;
virtual already_AddRefed<nsINodeInfo> GetExistingAttrNameFromQName(const nsAString& aStr) const MOZ_OVERRIDE;
virtual nsIAtom *GetIDAttributeName() const;
virtual already_AddRefed<nsINodeInfo> GetExistingAttrNameFromQName(const nsAString& aStr) const;
nsresult SetAttr(int32_t aNameSpaceID, nsIAtom* aName,
const nsAString& aValue, bool aNotify)
{
@ -114,45 +113,45 @@ public:
}
virtual nsresult SetAttr(int32_t aNameSpaceID, nsIAtom* aAttribute,
nsIAtom* aPrefix, const nsAString& aValue,
bool aNotify) MOZ_OVERRIDE;
bool aNotify);
virtual nsresult UnsetAttr(int32_t aNameSpaceID, nsIAtom* aAttribute,
bool aNotify) MOZ_OVERRIDE;
virtual const nsAttrName* GetAttrNameAt(uint32_t aIndex) const MOZ_OVERRIDE;
virtual uint32_t GetAttrCount() const MOZ_OVERRIDE;
virtual const nsTextFragment *GetText() MOZ_OVERRIDE;
virtual uint32_t TextLength() const MOZ_OVERRIDE;
bool aNotify);
virtual const nsAttrName* GetAttrNameAt(uint32_t aIndex) const;
virtual uint32_t GetAttrCount() const;
virtual const nsTextFragment *GetText();
virtual uint32_t TextLength() const;
virtual nsresult SetText(const PRUnichar* aBuffer, uint32_t aLength,
bool aNotify) MOZ_OVERRIDE;
bool aNotify);
// Need to implement this here too to avoid hiding.
nsresult SetText(const nsAString& aStr, bool aNotify)
{
return SetText(aStr.BeginReading(), aStr.Length(), aNotify);
}
virtual nsresult AppendText(const PRUnichar* aBuffer, uint32_t aLength,
bool aNotify) MOZ_OVERRIDE;
virtual bool TextIsOnlyWhitespace() MOZ_OVERRIDE;
virtual void AppendTextTo(nsAString& aResult) MOZ_OVERRIDE;
virtual void DestroyContent() MOZ_OVERRIDE;
virtual void SaveSubtreeState() MOZ_OVERRIDE;
bool aNotify);
virtual bool TextIsOnlyWhitespace();
virtual void AppendTextTo(nsAString& aResult);
virtual void DestroyContent();
virtual void SaveSubtreeState();
#ifdef DEBUG
virtual void List(FILE* out, int32_t aIndent) const MOZ_OVERRIDE;
virtual void DumpContent(FILE* out, int32_t aIndent, bool aDumpAll) const MOZ_OVERRIDE;
virtual void List(FILE* out, int32_t aIndent) const;
virtual void DumpContent(FILE* out, int32_t aIndent, bool aDumpAll) const;
#endif
virtual nsIContent *GetBindingParent() const MOZ_OVERRIDE;
virtual bool IsNodeOfType(uint32_t aFlags) const MOZ_OVERRIDE;
virtual bool IsLink(nsIURI** aURI) const MOZ_OVERRIDE;
virtual nsIContent *GetBindingParent() const;
virtual bool IsNodeOfType(uint32_t aFlags) const;
virtual bool IsLink(nsIURI** aURI) const;
virtual nsIAtom* DoGetID() const MOZ_OVERRIDE;
virtual const nsAttrValue* DoGetClasses() const MOZ_OVERRIDE;
NS_IMETHOD WalkContentStyleRules(nsRuleWalker* aRuleWalker) MOZ_OVERRIDE;
virtual nsIAtom* DoGetID() const;
virtual const nsAttrValue* DoGetClasses() const;
NS_IMETHOD WalkContentStyleRules(nsRuleWalker* aRuleWalker);
NS_IMETHOD_(bool) IsAttributeMapped(const nsIAtom* aAttribute) const;
virtual nsChangeHint GetAttributeChangeHint(const nsIAtom* aAttribute,
int32_t aModType) const;
virtual nsIAtom *GetClassAttributeName() const;
virtual nsresult Clone(nsINodeInfo *aNodeInfo, nsINode **aResult) const MOZ_OVERRIDE
virtual nsresult Clone(nsINodeInfo *aNodeInfo, nsINode **aResult) const
{
*aResult = CloneDataNode(aNodeInfo, true);
if (!*aResult) {
@ -236,7 +235,7 @@ protected:
};
// Override from nsINode
virtual nsINode::nsSlots* CreateSlots() MOZ_OVERRIDE;
virtual nsINode::nsSlots* CreateSlots();
nsDataSlots* DataSlots()
{
@ -278,16 +277,16 @@ protected:
nsTextFragment mText;
public:
virtual bool OwnedOnlyByTheDOMTree() MOZ_OVERRIDE
virtual bool OwnedOnlyByTheDOMTree()
{
return GetParent() && mRefCnt.get() == 1;
}
virtual bool IsPurple() MOZ_OVERRIDE
virtual bool IsPurple()
{
return mRefCnt.IsPurple();
}
virtual void RemovePurple() MOZ_OVERRIDE
virtual void RemovePurple()
{
mRefCnt.RemovePurple();
}

9
content/base/src/nsHTMLContentSerializer.h
View File

@ -12,7 +12,6 @@
#ifndef nsHTMLContentSerializer_h__
#define nsHTMLContentSerializer_h__
#include "mozilla/Attributes.h"
#include "nsXHTMLContentSerializer.h"
#include "nsIEntityConverter.h"
#include "nsString.h"
@ -27,13 +26,13 @@ class nsHTMLContentSerializer : public nsXHTMLContentSerializer {
NS_IMETHOD AppendElementStart(mozilla::dom::Element* aElement,
mozilla::dom::Element* aOriginalElement,
nsAString& aStr) MOZ_OVERRIDE;
nsAString& aStr);
NS_IMETHOD AppendElementEnd(mozilla::dom::Element* aElement,
nsAString& aStr) MOZ_OVERRIDE;
nsAString& aStr);
NS_IMETHOD AppendDocumentStart(nsIDocument *aDocument,
nsAString& aStr) MOZ_OVERRIDE;
nsAString& aStr);
protected:
virtual void SerializeHTMLAttributes(nsIContent* aContent,
@ -45,7 +44,7 @@ class nsHTMLContentSerializer : public nsXHTMLContentSerializer {
nsAString& aStr);
virtual void AppendAndTranslateEntities(const nsAString& aStr,
nsAString& aOutputStr) MOZ_OVERRIDE;
nsAString& aOutputStr);
};

7
content/base/src/nsHostObjectURI.h
View File

@ -5,7 +5,6 @@
#ifndef nsHostObjectURI_h
#define nsHostObjectURI_h
#include "mozilla/Attributes.h"
#include "nsCOMPtr.h"
#include "nsIClassInfo.h"
#include "nsIPrincipal.h"
@ -36,13 +35,13 @@ public:
// Override CloneInternal() and EqualsInternal()
virtual nsresult CloneInternal(RefHandlingEnum aRefHandlingMode,
nsIURI** aClone) MOZ_OVERRIDE;
nsIURI** aClone);
virtual nsresult EqualsInternal(nsIURI* aOther,
RefHandlingEnum aRefHandlingMode,
bool* aResult) MOZ_OVERRIDE;
bool* aResult);
// Override StartClone to hand back a nsHostObjectURI
virtual nsSimpleURI* StartClone(RefHandlingEnum /* unused */) MOZ_OVERRIDE
virtual nsSimpleURI* StartClone(RefHandlingEnum /* unused */)
{ return new nsHostObjectURI(); }
nsCOMPtr<nsIPrincipal> mPrincipal;

27
content/base/src/nsInProcessTabChildGlobal.h
View File

@ -7,7 +7,6 @@
#ifndef nsInProcessTabChildGlobal_h
#define nsInProcessTabChildGlobal_h
#include "mozilla/Attributes.h"
#include "nsCOMPtr.h"
#include "nsFrameMessageManager.h"
#include "nsIScriptContext.h"
@ -49,17 +48,17 @@ public:
? mMessageManager->SendSyncMessage(aMessageName, aObject, aCx, aArgc, aRetval)
: NS_ERROR_NULL_POINTER;
}
NS_IMETHOD GetContent(nsIDOMWindow** aContent) MOZ_OVERRIDE;
NS_IMETHOD GetDocShell(nsIDocShell** aDocShell) MOZ_OVERRIDE;
NS_IMETHOD Dump(const nsAString& aStr) MOZ_OVERRIDE
NS_IMETHOD GetContent(nsIDOMWindow** aContent);
NS_IMETHOD GetDocShell(nsIDocShell** aDocShell);
NS_IMETHOD Dump(const nsAString& aStr)
{
return mMessageManager ? mMessageManager->Dump(aStr) : NS_OK;
}
NS_IMETHOD PrivateNoteIntentionalCrash() MOZ_OVERRIDE;
NS_IMETHOD PrivateNoteIntentionalCrash();
NS_IMETHOD Btoa(const nsAString& aBinaryData,
nsAString& aAsciiBase64String) MOZ_OVERRIDE;
nsAString& aAsciiBase64String);
NS_IMETHOD Atob(const nsAString& aAsciiString,
nsAString& aBinaryData) MOZ_OVERRIDE;
nsAString& aBinaryData);
NS_DECL_NSIINPROCESSCONTENTFRAMEMESSAGEMANAGER
@ -68,11 +67,11 @@ public:
*/
virtual bool DoSendSyncMessage(const nsAString& aMessage,
const mozilla::dom::StructuredCloneData& aData,
InfallibleTArray<nsString>* aJSONRetVal) MOZ_OVERRIDE;
InfallibleTArray<nsString>* aJSONRetVal);
virtual bool DoSendAsyncMessage(const nsAString& aMessage,
const mozilla::dom::StructuredCloneData& aData) MOZ_OVERRIDE;
const mozilla::dom::StructuredCloneData& aData);
virtual nsresult PreHandleEvent(nsEventChainPreVisitor& aVisitor) MOZ_OVERRIDE;
virtual nsresult PreHandleEvent(nsEventChainPreVisitor& aVisitor);
NS_IMETHOD AddEventListener(const nsAString& aType,
nsIDOMEventListener* aListener,
bool aUseCapture)
@ -84,7 +83,7 @@ public:
NS_IMETHOD AddEventListener(const nsAString& aType,
nsIDOMEventListener* aListener,
bool aUseCapture, bool aWantsUntrusted,
uint8_t optional_argc) MOZ_OVERRIDE
uint8_t optional_argc)
{
return nsDOMEventTargetHelper::AddEventListener(aType, aListener,
aUseCapture,
@ -93,8 +92,8 @@ public:
}
using nsDOMEventTargetHelper::AddEventListener;
virtual JSContext* GetJSContextForEventHandlers() MOZ_OVERRIDE { return mCx; }
virtual nsIPrincipal* GetPrincipal() MOZ_OVERRIDE { return mPrincipal; }
virtual JSContext* GetJSContextForEventHandlers() { return mCx; }
virtual nsIPrincipal* GetPrincipal() { return mPrincipal; }
void LoadFrameScript(const nsAString& aURL);
void Disconnect();
void SendMessageToParent(const nsString& aMessage, bool aSync,
@ -117,7 +116,7 @@ public:
void DelayedDisconnect();
virtual JSObject* GetGlobalJSObject() MOZ_OVERRIDE {
virtual JSObject* GetGlobalJSObject() {
if (!mGlobal) {
return nullptr;
}

5
content/base/src/nsMappedAttributeElement.h
View File

@ -12,7 +12,6 @@
#ifndef NS_MAPPEDATTRIBUTEELEMENT_H_
#define NS_MAPPEDATTRIBUTEELEMENT_H_
#include "mozilla/Attributes.h"
#include "nsStyledElement.h"
class nsMappedAttributes;
@ -38,11 +37,11 @@ public:
static void MapNoAttributesInto(const nsMappedAttributes* aAttributes,
nsRuleData* aRuleData);
NS_IMETHOD WalkContentStyleRules(nsRuleWalker* aRuleWalker) MOZ_OVERRIDE;
NS_IMETHOD WalkContentStyleRules(nsRuleWalker* aRuleWalker);
virtual bool SetMappedAttribute(nsIDocument* aDocument,
nsIAtom* aName,
nsAttrValue& aValue,
nsresult* aRetval) MOZ_OVERRIDE;
nsresult* aRetval);
};
#endif // NS_MAPPEDATTRIBUTEELEMENT_H_

4
content/base/src/nsMappedAttributes.h
View File

@ -72,9 +72,9 @@ public:
// nsIStyleRule
virtual void MapRuleInfoInto(nsRuleData* aRuleData) MOZ_OVERRIDE;
virtual void MapRuleInfoInto(nsRuleData* aRuleData);
#ifdef DEBUG
virtual void List(FILE* out = stdout, int32_t aIndent = 0) const MOZ_OVERRIDE;
virtual void List(FILE* out = stdout, int32_t aIndent = 0) const;
#endif
size_t SizeOfIncludingThis(nsMallocSizeOfFun aMallocSizeOf) const;

3
content/base/src/nsNodeInfo.h
View File

@ -13,7 +13,6 @@
#ifndef nsNodeInfo_h___
#define nsNodeInfo_h___
#include "mozilla/Attributes.h"
#include "nsINodeInfo.h"
#include "nsNodeInfoManager.h"
#include "plhash.h"
@ -30,7 +29,7 @@ public:
// nsINodeInfo
virtual void GetNamespaceURI(nsAString& aNameSpaceURI) const;
virtual bool NamespaceEquals(const nsAString& aNamespaceURI) const MOZ_OVERRIDE;
virtual bool NamespaceEquals(const nsAString& aNamespaceURI) const;
// nsNodeInfo
public:

3
content/base/src/nsObjectLoadingContent.h
View File

@ -13,7 +13,6 @@
#ifndef NSOBJECTLOADINGCONTENT_H_
#define NSOBJECTLOADINGCONTENT_H_
#include "mozilla/Attributes.h"
#include "nsImageLoadingContent.h"
#include "nsIStreamListener.h"
#include "nsIInterfaceRequestor.h"
@ -449,7 +448,7 @@ class nsObjectLoadingContent : public nsImageLoadingContent
SetupProtoChainRunner(nsIScriptContext* scriptContext,
nsObjectLoadingContent* aContent);
NS_IMETHOD Run() MOZ_OVERRIDE;
NS_IMETHOD Run();
private:
nsCOMPtr<nsIScriptContext> mContext;

21
content/base/src/nsPlainTextSerializer.h
View File

@ -12,7 +12,6 @@
#ifndef nsPlainTextSerializer_h__
#define nsPlainTextSerializer_h__
#include "mozilla/Attributes.h"
#include "nsAutoPtr.h"
#include "nsCOMPtr.h"
#include "nsIAtom.h"
@ -41,30 +40,30 @@ public:
// nsIContentSerializer
NS_IMETHOD Init(uint32_t flags, uint32_t aWrapColumn,
const char* aCharSet, bool aIsCopying,
bool aIsWholeDocument) MOZ_OVERRIDE;
bool aIsWholeDocument);
NS_IMETHOD AppendText(nsIContent* aText, int32_t aStartOffset,
int32_t aEndOffset, nsAString& aStr) MOZ_OVERRIDE;
int32_t aEndOffset, nsAString& aStr);
NS_IMETHOD AppendCDATASection(nsIContent* aCDATASection,
int32_t aStartOffset, int32_t aEndOffset,
nsAString& aStr) MOZ_OVERRIDE;
nsAString& aStr);
NS_IMETHOD AppendProcessingInstruction(nsIContent* aPI,
int32_t aStartOffset,
int32_t aEndOffset,
nsAString& aStr) MOZ_OVERRIDE { return NS_OK; }
nsAString& aStr) { return NS_OK; }
NS_IMETHOD AppendComment(nsIContent* aComment, int32_t aStartOffset,
int32_t aEndOffset, nsAString& aStr) MOZ_OVERRIDE { return NS_OK; }
int32_t aEndOffset, nsAString& aStr) { return NS_OK; }
NS_IMETHOD AppendDoctype(nsIContent *aDoctype,
nsAString& aStr) MOZ_OVERRIDE { return NS_OK; }
nsAString& aStr) { return NS_OK; }
NS_IMETHOD AppendElementStart(mozilla::dom::Element* aElement,
mozilla::dom::Element* aOriginalElement,
nsAString& aStr) MOZ_OVERRIDE;
nsAString& aStr);
NS_IMETHOD AppendElementEnd(mozilla::dom::Element* aElement,
nsAString& aStr) MOZ_OVERRIDE;
NS_IMETHOD Flush(nsAString& aStr) MOZ_OVERRIDE;
nsAString& aStr);
NS_IMETHOD Flush(nsAString& aStr);
NS_IMETHOD AppendDocumentStart(nsIDocument *aDocument,
nsAString& aStr) MOZ_OVERRIDE;
nsAString& aStr);
protected:
nsresult GetAttributeValue(nsIAtom* aName, nsString& aValueRet);

5
content/base/src/nsScriptElement.h
View File

@ -2,7 +2,6 @@
* 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 "mozilla/Attributes.h"
#include "nsIScriptLoaderObserver.h"
#include "nsIScriptElement.h"
#include "nsStubMutationObserver.h"
@ -31,7 +30,7 @@ public:
{
}
virtual nsresult FireErrorEvent() MOZ_OVERRIDE;
virtual nsresult FireErrorEvent();
protected:
// Internal methods
@ -41,5 +40,5 @@ protected:
*/
virtual bool HasScriptContent() = 0;
virtual bool MaybeProcessScript() MOZ_OVERRIDE;
virtual bool MaybeProcessScript();
};

19
content/base/src/nsStyleLinkElement.h
View File

@ -13,7 +13,6 @@
#ifndef nsStyleLinkElement_h___
#define nsStyleLinkElement_h___
#include "mozilla/Attributes.h"
#include "nsCOMPtr.h"
#include "nsIDOMLinkStyle.h"
#include "nsIStyleSheetLinkingElement.h"
@ -37,7 +36,7 @@ public:
nsStyleLinkElement();
virtual ~nsStyleLinkElement();
NS_IMETHOD QueryInterface(REFNSIID aIID, void** aInstancePtr) MOZ_OVERRIDE = 0;
NS_IMETHOD QueryInterface(REFNSIID aIID, void** aInstancePtr) = 0;
// nsIDOMLinkStyle
NS_DECL_NSIDOMLINKSTYLE
@ -45,17 +44,17 @@ public:
nsCSSStyleSheet* GetSheet() const { return mStyleSheet; }
// nsIStyleSheetLinkingElement
NS_IMETHOD SetStyleSheet(nsCSSStyleSheet* aStyleSheet) MOZ_OVERRIDE;
NS_IMETHOD GetStyleSheet(nsIStyleSheet*& aStyleSheet) MOZ_OVERRIDE;
NS_IMETHOD InitStyleLinkElement(bool aDontLoadStyle) MOZ_OVERRIDE;
NS_IMETHOD SetStyleSheet(nsCSSStyleSheet* aStyleSheet);
NS_IMETHOD GetStyleSheet(nsIStyleSheet*& aStyleSheet);
NS_IMETHOD InitStyleLinkElement(bool aDontLoadStyle);
NS_IMETHOD UpdateStyleSheet(nsICSSLoaderObserver* aObserver,
bool* aWillNotify,
bool* aIsAlternate) MOZ_OVERRIDE;
NS_IMETHOD SetEnableUpdates(bool aEnableUpdates) MOZ_OVERRIDE;
NS_IMETHOD GetCharset(nsAString& aCharset) MOZ_OVERRIDE;
bool* aIsAlternate);
NS_IMETHOD SetEnableUpdates(bool aEnableUpdates);
NS_IMETHOD GetCharset(nsAString& aCharset);
virtual void OverrideBaseURI(nsIURI* aNewBaseURI) MOZ_OVERRIDE;
virtual void SetLineNumber(uint32_t aLineNumber) MOZ_OVERRIDE;
virtual void OverrideBaseURI(nsIURI* aNewBaseURI);
virtual void SetLineNumber(uint32_t aLineNumber);
static uint32_t ParseLinkTypes(const nsAString& aTypes);

17
content/base/src/nsStyledElement.h
View File

@ -13,7 +13,6 @@
#ifndef __NS_STYLEDELEMENT_H_
#define __NS_STYLEDELEMENT_H_
#include "mozilla/Attributes.h"
#include "nsString.h"
#include "mozilla/dom/Element.h"
@ -36,20 +35,20 @@ protected:
public:
// nsIContent interface methods
virtual nsIAtom* GetClassAttributeName() const MOZ_OVERRIDE;
virtual nsIAtom* GetIDAttributeName() const MOZ_OVERRIDE;
virtual nsIAtom* DoGetID() const MOZ_OVERRIDE;
virtual const nsAttrValue* DoGetClasses() const MOZ_OVERRIDE;
virtual nsIAtom* GetClassAttributeName() const;
virtual nsIAtom* GetIDAttributeName() const;
virtual nsIAtom* DoGetID() const;
virtual const nsAttrValue* DoGetClasses() const;
virtual mozilla::css::StyleRule* GetInlineStyleRule();
virtual nsresult SetInlineStyleRule(mozilla::css::StyleRule* aStyleRule,
const nsAString* aSerialized,
bool aNotify) MOZ_OVERRIDE;
bool aNotify);
virtual nsresult UnsetAttr(int32_t aNameSpaceID, nsIAtom* aAttribute,
bool aNotify) MOZ_OVERRIDE;
bool aNotify);
virtual nsresult AfterSetAttr(int32_t aNameSpaceID, nsIAtom* aAttribute,
const nsAttrValue* aValue, bool aNotify) MOZ_OVERRIDE;
const nsAttrValue* aValue, bool aNotify);
nsICSSDeclaration* Style();
@ -67,7 +66,7 @@ protected:
bool aForceInDataDoc);
virtual bool ParseAttribute(int32_t aNamespaceID, nsIAtom* aAttribute,
const nsAString& aValue, nsAttrValue& aResult) MOZ_OVERRIDE;
const nsAString& aValue, nsAttrValue& aResult);
friend class mozilla::dom::Element;

13
content/base/src/nsTextNode.h
View File

@ -10,7 +10,6 @@
* Implementation of DOM Core's nsIDOMText node.
*/
#include "mozilla/Attributes.h"
#include "mozilla/dom/Text.h"
#include "nsIDOMText.h"
#include "nsDebug.h"
@ -62,22 +61,22 @@ public:
virtual bool IsNodeOfType(uint32_t aFlags) const;
virtual nsGenericDOMDataNode* CloneDataNode(nsINodeInfo *aNodeInfo,
bool aCloneText) const MOZ_OVERRIDE;
bool aCloneText) const;
virtual nsresult BindToTree(nsIDocument* aDocument, nsIContent* aParent,
nsIContent* aBindingParent,
bool aCompileEventHandlers) MOZ_OVERRIDE;
bool aCompileEventHandlers);
virtual void UnbindFromTree(bool aDeep = true,
bool aNullParent = true) MOZ_OVERRIDE;
bool aNullParent = true);
nsresult AppendTextForNormalize(const PRUnichar* aBuffer, uint32_t aLength,
bool aNotify, nsIContent* aNextSibling);
virtual nsIDOMNode* AsDOMNode() MOZ_OVERRIDE { return this; }
virtual nsIDOMNode* AsDOMNode() { return this; }
#ifdef DEBUG
virtual void List(FILE* out, int32_t aIndent) const MOZ_OVERRIDE;
virtual void DumpContent(FILE* out, int32_t aIndent, bool aDumpAll) const MOZ_OVERRIDE;
virtual void List(FILE* out, int32_t aIndent) const;
virtual void DumpContent(FILE* out, int32_t aIndent, bool aDumpAll) const;
#endif
protected:

33
content/base/src/nsXHTMLContentSerializer.h
View File

@ -12,7 +12,6 @@
#ifndef nsXHTMLContentSerializer_h__
#define nsXHTMLContentSerializer_h__
#include "mozilla/Attributes.h"
#include "nsXMLContentSerializer.h"
#include "nsIEntityConverter.h"
#include "nsString.h"
@ -28,49 +27,49 @@ class nsXHTMLContentSerializer : public nsXMLContentSerializer {
NS_IMETHOD Init(uint32_t flags, uint32_t aWrapColumn,
const char* aCharSet, bool aIsCopying,
bool aRewriteEncodingDeclaration) MOZ_OVERRIDE;
bool aRewriteEncodingDeclaration);
NS_IMETHOD AppendText(nsIContent* aText,
int32_t aStartOffset,
int32_t aEndOffset,
nsAString& aStr) MOZ_OVERRIDE;
nsAString& aStr);
NS_IMETHOD AppendDocumentStart(nsIDocument *aDocument,
nsAString& aStr) MOZ_OVERRIDE;
nsAString& aStr);
protected:
virtual bool CheckElementStart(nsIContent * aContent,
bool & aForceFormat,
nsAString& aStr) MOZ_OVERRIDE;
nsAString& aStr);
virtual void AppendEndOfElementStart(nsIContent *aOriginalElement,
nsIAtom * aName,
int32_t aNamespaceID,
nsAString& aStr) MOZ_OVERRIDE;
nsAString& aStr);
virtual void AfterElementStart(nsIContent * aContent,
nsIContent *aOriginalElement,
nsAString& aStr) MOZ_OVERRIDE;
nsAString& aStr);
virtual bool CheckElementEnd(nsIContent * aContent,
bool & aForceFormat,
nsAString& aStr) MOZ_OVERRIDE;
nsAString& aStr);
virtual void AfterElementEnd(nsIContent * aContent,
nsAString& aStr) MOZ_OVERRIDE;
nsAString& aStr);
virtual bool LineBreakBeforeOpen(int32_t aNamespaceID, nsIAtom* aName) MOZ_OVERRIDE;
virtual bool LineBreakAfterOpen(int32_t aNamespaceID, nsIAtom* aName) MOZ_OVERRIDE;
virtual bool LineBreakBeforeClose(int32_t aNamespaceID, nsIAtom* aName) MOZ_OVERRIDE;
virtual bool LineBreakAfterClose(int32_t aNamespaceID, nsIAtom* aName) MOZ_OVERRIDE;
virtual bool LineBreakBeforeOpen(int32_t aNamespaceID, nsIAtom* aName);
virtual bool LineBreakAfterOpen(int32_t aNamespaceID, nsIAtom* aName);
virtual bool LineBreakBeforeClose(int32_t aNamespaceID, nsIAtom* aName);
virtual bool LineBreakAfterClose(int32_t aNamespaceID, nsIAtom* aName);
bool HasLongLines(const nsString& text, int32_t& aLastNewlineOffset);
// functions to check if we enter in or leave from a preformated content
virtual void MaybeEnterInPreContent(nsIContent* aNode) MOZ_OVERRIDE;
virtual void MaybeLeaveFromPreContent(nsIContent* aNode) MOZ_OVERRIDE;
virtual void MaybeEnterInPreContent(nsIContent* aNode);
virtual void MaybeLeaveFromPreContent(nsIContent* aNode);
virtual void SerializeAttributes(nsIContent* aContent,
nsIContent *aOriginalElement,
@ -79,7 +78,7 @@ class nsXHTMLContentSerializer : public nsXMLContentSerializer {
nsIAtom* aTagName,
nsAString& aStr,
uint32_t aSkipAttr,
bool aAddNSAttr) MOZ_OVERRIDE;
bool aAddNSAttr);
bool IsFirstChildOfOL(nsIContent* aElement);
@ -88,7 +87,7 @@ class nsXHTMLContentSerializer : public nsXMLContentSerializer {
bool IsShorthandAttr(const nsIAtom* aAttrName,
const nsIAtom* aElementName);
virtual void AppendAndTranslateEntities(const nsAString& aStr,
nsAString& aOutputStr) MOZ_OVERRIDE;
nsAString& aOutputStr);
nsresult EscapeURI(nsIContent* aContent,
const nsAString& aURI,
nsAString& aEscapedURI);

21
content/base/src/nsXMLContentSerializer.h
View File

@ -12,7 +12,6 @@
#ifndef nsXMLContentSerializer_h__
#define nsXMLContentSerializer_h__
#include "mozilla/Attributes.h"
#include "nsIContentSerializer.h"
#include "nsISupportsUtils.h"
#include "nsCOMPtr.h"
@ -35,37 +34,37 @@ class nsXMLContentSerializer : public nsIContentSerializer {
NS_IMETHOD Init(uint32_t flags, uint32_t aWrapColumn,
const char* aCharSet, bool aIsCopying,
bool aRewriteEncodingDeclaration) MOZ_OVERRIDE;
bool aRewriteEncodingDeclaration);
NS_IMETHOD AppendText(nsIContent* aText, int32_t aStartOffset,
int32_t aEndOffset, nsAString& aStr) MOZ_OVERRIDE;
int32_t aEndOffset, nsAString& aStr);
NS_IMETHOD AppendCDATASection(nsIContent* aCDATASection,
int32_t aStartOffset, int32_t aEndOffset,
nsAString& aStr) MOZ_OVERRIDE;
nsAString& aStr);
NS_IMETHOD AppendProcessingInstruction(nsIContent* aPI,
int32_t aStartOffset,
int32_t aEndOffset,
nsAString& aStr) MOZ_OVERRIDE;
nsAString& aStr);
NS_IMETHOD AppendComment(nsIContent* aComment, int32_t aStartOffset,
int32_t aEndOffset, nsAString& aStr) MOZ_OVERRIDE;
int32_t aEndOffset, nsAString& aStr);
NS_IMETHOD AppendDoctype(nsIContent *aDoctype,
nsAString& aStr) MOZ_OVERRIDE;
nsAString& aStr);
NS_IMETHOD AppendElementStart(mozilla::dom::Element* aElement,
mozilla::dom::Element* aOriginalElement,
nsAString& aStr) MOZ_OVERRIDE;
nsAString& aStr);
NS_IMETHOD AppendElementEnd(mozilla::dom::Element* aElement,
nsAString& aStr) MOZ_OVERRIDE;
nsAString& aStr);
NS_IMETHOD Flush(nsAString& aStr) MOZ_OVERRIDE { return NS_OK; }
NS_IMETHOD Flush(nsAString& aStr) { return NS_OK; }
NS_IMETHOD AppendDocumentStart(nsIDocument *aDocument,
nsAString& aStr) MOZ_OVERRIDE;
nsAString& aStr);
protected:

5
content/base/src/nsXMLHttpRequest.h
View File

@ -7,7 +7,6 @@
#ifndef nsXMLHttpRequest_h__
#define nsXMLHttpRequest_h__
#include "mozilla/Attributes.h"
#include "nsIXMLHttpRequest.h"
#include "nsISupportsUtils.h"
#include "nsString.h"
@ -474,7 +473,7 @@ public:
bool AllowUploadProgress();
void RootJSResultObjects();
virtual void DisconnectFromOwner() MOZ_OVERRIDE;
virtual void DisconnectFromOwner();
protected:
nsresult DetectCharset();
@ -722,7 +721,7 @@ class nsXHRParseEndListener : public nsIDOMEventListener
{
public:
NS_DECL_ISUPPORTS
NS_IMETHOD HandleEvent(nsIDOMEvent *event) MOZ_OVERRIDE
NS_IMETHOD HandleEvent(nsIDOMEvent *event)
{
nsCOMPtr<nsIXMLHttpRequest> xhr = do_QueryReferent(mXHR);
if (xhr) {

3
content/canvas/src/CanvasGradient.h
View File

@ -5,7 +5,6 @@
#ifndef mozilla_dom_CanvasGradient_h
#define mozilla_dom_CanvasGradient_h
#include "mozilla/Attributes.h"
#include "nsTArray.h"
#include "mozilla/RefPtr.h"
#include "mozilla/dom/CanvasRenderingContext2DBinding.h"
@ -54,7 +53,7 @@ public:
// WebIDL
void AddColorStop(float offset, const nsAString& colorstr, ErrorResult& rv);
JSObject* WrapObject(JSContext* aCx, JS::Handle<JSObject*> aScope) MOZ_OVERRIDE
JSObject* WrapObject(JSContext* aCx, JS::Handle<JSObject*> aScope)
{
return CanvasGradientBinding::Wrap(aCx, aScope, this);
}

3
content/canvas/src/CanvasPattern.h
View File

@ -5,7 +5,6 @@
#ifndef mozilla_dom_CanvasPattern_h
#define mozilla_dom_CanvasPattern_h
#include "mozilla/Attributes.h"
#include "mozilla/dom/CanvasRenderingContext2DBinding.h"
#include "mozilla/dom/CanvasRenderingContext2D.h"
#include "mozilla/RefPtr.h"
@ -55,7 +54,7 @@ public:
SetIsDOMBinding();
}
JSObject* WrapObject(JSContext* aCx, JS::Handle<JSObject*> aScope) MOZ_OVERRIDE
JSObject* WrapObject(JSContext* aCx, JS::Handle<JSObject*> aScope)
{
return CanvasPatternBinding::Wrap(aCx, aScope, this);
}

27
content/canvas/src/CanvasRenderingContext2D.h
View File

@ -5,7 +5,6 @@
#ifndef CanvasRenderingContext2D_h
#define CanvasRenderingContext2D_h
#include "mozilla/Attributes.h"
#include <vector>
#include "nsIDOMCanvasRenderingContext2D.h"
#include "nsICanvasRenderingContextInternal.h"
@ -361,31 +360,31 @@ public:
nsresult Redraw();
// nsICanvasRenderingContextInternal
NS_IMETHOD SetDimensions(int32_t width, int32_t height) MOZ_OVERRIDE;
NS_IMETHOD InitializeWithSurface(nsIDocShell *shell, gfxASurface *surface, int32_t width, int32_t height) MOZ_OVERRIDE;
NS_IMETHOD SetDimensions(int32_t width, int32_t height);
NS_IMETHOD InitializeWithSurface(nsIDocShell *shell, gfxASurface *surface, int32_t width, int32_t height);
NS_IMETHOD Render(gfxContext *ctx,
gfxPattern::GraphicsFilter aFilter,
uint32_t aFlags = RenderFlagPremultAlpha) MOZ_OVERRIDE;
uint32_t aFlags = RenderFlagPremultAlpha);
NS_IMETHOD GetInputStream(const char* aMimeType,
const PRUnichar* aEncoderOptions,
nsIInputStream **aStream) MOZ_OVERRIDE;
NS_IMETHOD GetThebesSurface(gfxASurface **surface) MOZ_OVERRIDE;
nsIInputStream **aStream);
NS_IMETHOD GetThebesSurface(gfxASurface **surface);
mozilla::TemporaryRef<mozilla::gfx::SourceSurface> GetSurfaceSnapshot() MOZ_OVERRIDE
mozilla::TemporaryRef<mozilla::gfx::SourceSurface> GetSurfaceSnapshot()
{ EnsureTarget(); return mTarget->Snapshot(); }
NS_IMETHOD SetIsOpaque(bool isOpaque) MOZ_OVERRIDE;
NS_IMETHOD Reset() MOZ_OVERRIDE;
NS_IMETHOD SetIsOpaque(bool isOpaque);
NS_IMETHOD Reset();
already_AddRefed<CanvasLayer> GetCanvasLayer(nsDisplayListBuilder* aBuilder,
CanvasLayer *aOldLayer,
LayerManager *aManager) MOZ_OVERRIDE;
virtual bool ShouldForceInactiveLayer(LayerManager *aManager) MOZ_OVERRIDE;
void MarkContextClean() MOZ_OVERRIDE;
NS_IMETHOD SetIsIPC(bool isIPC) MOZ_OVERRIDE;
LayerManager *aManager);
virtual bool ShouldForceInactiveLayer(LayerManager *aManager);
void MarkContextClean();
NS_IMETHOD SetIsIPC(bool isIPC);
// this rect is in canvas device space
void Redraw(const mozilla::gfx::Rect &r);
NS_IMETHOD Redraw(const gfxRect &r) MOZ_OVERRIDE { Redraw(ToRect(r)); return NS_OK; }
NS_IMETHOD Redraw(const gfxRect &r) { Redraw(ToRect(r)); return NS_OK; }
// this rect is in mTarget's current user space
void RedrawUser(const gfxRect &r);

25
content/canvas/src/WebGLContext.h
View File

@ -6,7 +6,6 @@
#ifndef WEBGLCONTEXT_H_
#define WEBGLCONTEXT_H_
#include "mozilla/Attributes.h"
#include "WebGLElementArrayCache.h"
#include "WebGLObjectModel.h"
#include "WebGLShader.h"
@ -203,25 +202,25 @@ public:
NS_DECL_NSIDOMWEBGLRENDERINGCONTEXT
// nsICanvasRenderingContextInternal
NS_IMETHOD SetDimensions(int32_t width, int32_t height) MOZ_OVERRIDE;
NS_IMETHOD InitializeWithSurface(nsIDocShell *docShell, gfxASurface *surface, int32_t width, int32_t height) MOZ_OVERRIDE
NS_IMETHOD SetDimensions(int32_t width, int32_t height);
NS_IMETHOD InitializeWithSurface(nsIDocShell *docShell, gfxASurface *surface, int32_t width, int32_t height)
{ return NS_ERROR_NOT_IMPLEMENTED; }
NS_IMETHOD Reset() MOZ_OVERRIDE
NS_IMETHOD Reset()
{ /* (InitializeWithSurface) */ return NS_ERROR_NOT_IMPLEMENTED; }
NS_IMETHOD Render(gfxContext *ctx,
gfxPattern::GraphicsFilter f,
uint32_t aFlags = RenderFlagPremultAlpha) MOZ_OVERRIDE;
uint32_t aFlags = RenderFlagPremultAlpha);
NS_IMETHOD GetInputStream(const char* aMimeType,
const PRUnichar* aEncoderOptions,
nsIInputStream **aStream) MOZ_OVERRIDE;
NS_IMETHOD GetThebesSurface(gfxASurface **surface) MOZ_OVERRIDE;
mozilla::TemporaryRef<mozilla::gfx::SourceSurface> GetSurfaceSnapshot() MOZ_OVERRIDE
nsIInputStream **aStream);
NS_IMETHOD GetThebesSurface(gfxASurface **surface);
mozilla::TemporaryRef<mozilla::gfx::SourceSurface> GetSurfaceSnapshot()
{ return nullptr; }
NS_IMETHOD SetIsOpaque(bool b) MOZ_OVERRIDE { return NS_OK; };
NS_IMETHOD SetContextOptions(nsIPropertyBag *aOptions) MOZ_OVERRIDE;
NS_IMETHOD SetIsOpaque(bool b) { return NS_OK; };
NS_IMETHOD SetContextOptions(nsIPropertyBag *aOptions);
NS_IMETHOD SetIsIPC(bool b) MOZ_OVERRIDE { return NS_ERROR_NOT_IMPLEMENTED; }
NS_IMETHOD SetIsIPC(bool b) { return NS_ERROR_NOT_IMPLEMENTED; }
NS_IMETHOD Redraw(const gfxRect&) { return NS_ERROR_NOT_IMPLEMENTED; }
NS_IMETHOD Swap(mozilla::ipc::Shmem& aBack,
int32_t x, int32_t y, int32_t w, int32_t h)
@ -257,11 +256,11 @@ public:
already_AddRefed<CanvasLayer> GetCanvasLayer(nsDisplayListBuilder* aBuilder,
CanvasLayer *aOldLayer,
LayerManager *aManager) MOZ_OVERRIDE;
LayerManager *aManager);
// Note that 'clean' here refers to its invalidation state, not the
// contents of the buffer.
void MarkContextClean() MOZ_OVERRIDE { mInvalidated = false; }
void MarkContextClean() { mInvalidated = false; }
gl::GLContext* GL() const {
return gl;

3
content/events/public/nsAsyncDOMEvent.h
View File

@ -6,7 +6,6 @@
#ifndef nsAsyncDOMEvent_h___
#define nsAsyncDOMEvent_h___
#include "mozilla/Attributes.h"
#include "nsCOMPtr.h"
#include "nsThreadUtils.h"
#include "nsINode.h"
@ -36,7 +35,7 @@ public:
nsAsyncDOMEvent(nsINode *aEventNode, nsEvent &aEvent);
NS_IMETHOD Run() MOZ_OVERRIDE;
NS_IMETHOD Run();
nsresult PostDOMEvent();
void RunDOMEventWhenSafe();

2
content/events/src/TextComposition.h
View File

@ -111,7 +111,7 @@ private:
nsINode* aEventTarget,
uint32_t aEventMessage,
const nsAString& aData);
NS_IMETHOD Run() MOZ_OVERRIDE;
NS_IMETHOD Run();
private:
nsRefPtr<nsPresContext> mPresContext;

3
content/events/src/nsDOMEvent.h
View File

@ -6,7 +6,6 @@
#ifndef nsDOMEvent_h__
#define nsDOMEvent_h__
#include "mozilla/Attributes.h"
#include "nsIDOMEvent.h"
#include "nsISupports.h"
#include "nsCOMPtr.h"
@ -100,7 +99,7 @@ public:
// nsIJSNativeInitializer
NS_IMETHOD Initialize(nsISupports* aOwner, JSContext* aCx, JSObject* aObj,
const JS::CallArgs& aArgs) MOZ_OVERRIDE;
const JS::CallArgs& aArgs);
virtual nsresult InitFromCtor(const nsAString& aType,
JSContext* aCx, JS::Value* aVal);

7
content/events/src/nsDOMNotifyPaintEvent.h
View File

@ -6,7 +6,6 @@
#ifndef nsDOMNotifyPaintEvent_h_
#define nsDOMNotifyPaintEvent_h_
#include "mozilla/Attributes.h"
#include "nsIDOMNotifyPaintEvent.h"
#include "nsDOMEvent.h"
#include "nsPresContext.h"
@ -32,12 +31,12 @@ public:
// Forward to base class
NS_FORWARD_TO_NSDOMEVENT_NO_SERIALIZATION_NO_DUPLICATION
NS_IMETHOD DuplicatePrivateData() MOZ_OVERRIDE
NS_IMETHOD DuplicatePrivateData()
{
return nsDOMEvent::DuplicatePrivateData();
}
NS_IMETHOD_(void) Serialize(IPC::Message* aMsg, bool aSerializeInterfaceType) MOZ_OVERRIDE;
NS_IMETHOD_(bool) Deserialize(const IPC::Message* aMsg, void** aIter) MOZ_OVERRIDE;
NS_IMETHOD_(void) Serialize(IPC::Message* aMsg, bool aSerializeInterfaceType);
NS_IMETHOD_(bool) Deserialize(const IPC::Message* aMsg, void** aIter);
virtual JSObject* WrapObject(JSContext* aCx,
JS::Handle<JSObject*> aScope) MOZ_OVERRIDE

5
content/events/src/nsDOMScrollAreaEvent.h
View File

@ -6,7 +6,6 @@
#ifndef nsDOMScrollAreaEvent_h__
#define nsDOMScrollAreaEvent_h__
#include "mozilla/Attributes.h"
#include "nsIDOMScrollAreaEvent.h"
#include "nsDOMUIEvent.h"
@ -34,8 +33,8 @@ public:
{
return nsDOMEvent::DuplicatePrivateData();
}
NS_IMETHOD_(void) Serialize(IPC::Message* aMsg, bool aSerializeInterfaceType) MOZ_OVERRIDE;
NS_IMETHOD_(bool) Deserialize(const IPC::Message* aMsg, void** aIter) MOZ_OVERRIDE;
NS_IMETHOD_(void) Serialize(IPC::Message* aMsg, bool aSerializeInterfaceType);
NS_IMETHOD_(bool) Deserialize(const IPC::Message* aMsg, void** aIter);
virtual JSObject* WrapObject(JSContext* aCx,
JS::Handle<JSObject*> aScope) MOZ_OVERRIDE

5
content/events/src/nsDOMTextEvent.h
View File

@ -6,7 +6,6 @@
#ifndef nsDOMTextEvent_h__
#define nsDOMTextEvent_h__
#include "mozilla/Attributes.h"
#include "nsDOMUIEvent.h"
#include "nsIPrivateTextEvent.h"
#include "nsPrivateTextRange.h"
@ -24,8 +23,8 @@ public:
NS_FORWARD_TO_NSDOMUIEVENT
// nsIPrivateTextEvent interface
NS_IMETHOD GetText(nsString& aText) MOZ_OVERRIDE;
NS_IMETHOD_(already_AddRefed<nsIPrivateTextRangeList>) GetInputRange() MOZ_OVERRIDE;
NS_IMETHOD GetText(nsString& aText);
NS_IMETHOD_(already_AddRefed<nsIPrivateTextRangeList>) GetInputRange();
protected:
nsString mText;

7
content/events/src/nsDOMUIEvent.h
View File

@ -6,7 +6,6 @@
#ifndef nsDOMUIEvent_h
#define nsDOMUIEvent_h
#include "mozilla/Attributes.h"
#include "nsIDOMUIEvent.h"
#include "nsDOMEvent.h"
#include "nsLayoutUtils.h"
@ -28,9 +27,9 @@ public:
// Forward to nsDOMEvent
NS_FORWARD_TO_NSDOMEVENT_NO_SERIALIZATION_NO_DUPLICATION
NS_IMETHOD DuplicatePrivateData() MOZ_OVERRIDE;
NS_IMETHOD_(void) Serialize(IPC::Message* aMsg, bool aSerializeInterfaceType) MOZ_OVERRIDE;
NS_IMETHOD_(bool) Deserialize(const IPC::Message* aMsg, void** aIter) MOZ_OVERRIDE;
NS_IMETHOD DuplicatePrivateData();
NS_IMETHOD_(void) Serialize(IPC::Message* aMsg, bool aSerializeInterfaceType);
NS_IMETHOD_(bool) Deserialize(const IPC::Message* aMsg, void** aIter);
static nsIntPoint CalculateScreenPoint(nsPresContext* aPresContext,
nsEvent* aEvent)

12
content/events/src/nsPrivateTextRange.h
View File

@ -19,10 +19,10 @@ public:
nsPrivateTextRange(const nsTextRange &aTextRange);
virtual ~nsPrivateTextRange(void);
NS_IMETHOD GetRangeStart(uint16_t* aRangeStart) MOZ_OVERRIDE;
NS_IMETHOD GetRangeEnd(uint16_t* aRangeEnd) MOZ_OVERRIDE;
NS_IMETHOD GetRangeType(uint16_t* aRangeType) MOZ_OVERRIDE;
NS_IMETHOD GetRangeStyle(nsTextRangeStyle* aRangeStyle) MOZ_OVERRIDE;
NS_IMETHOD GetRangeStart(uint16_t* aRangeStart);
NS_IMETHOD GetRangeEnd(uint16_t* aRangeEnd);
NS_IMETHOD GetRangeType(uint16_t* aRangeType);
NS_IMETHOD GetRangeStyle(nsTextRangeStyle* aRangeStyle);
protected:
@ -40,9 +40,9 @@ public:
void AppendTextRange(nsRefPtr<nsPrivateTextRange>& aRange);
NS_IMETHOD_(uint16_t) GetLength() MOZ_OVERRIDE;
NS_IMETHOD_(uint16_t) GetLength();
NS_IMETHOD_(already_AddRefed<nsIPrivateTextRange>) Item(uint16_t aIndex) MOZ_OVERRIDE;
NS_IMETHOD_(already_AddRefed<nsIPrivateTextRange>) Item(uint16_t aIndex);
protected:
nsTArray<nsRefPtr<nsPrivateTextRange> > mList;
};

3
content/html/content/public/HTMLAudioElement.h
View File

@ -6,7 +6,6 @@
#ifndef mozilla_dom_HTMLAudioElement_h
#define mozilla_dom_HTMLAudioElement_h
#include "mozilla/Attributes.h"
#include "nsITimer.h"
#include "nsIDOMHTMLAudioElement.h"
#include "mozilla/dom/HTMLMediaElement.h"
@ -51,7 +50,7 @@ public:
virtual nsresult Clone(nsINodeInfo *aNodeInfo, nsINode **aResult) const;
virtual nsresult SetAcceptHeader(nsIHttpChannel* aChannel);
virtual nsIDOMNode* AsDOMNode() MOZ_OVERRIDE { return this; }
virtual nsIDOMNode* AsDOMNode() { return this; }
// WebIDL

15
content/html/content/public/HTMLCanvasElement.h
View File

@ -6,7 +6,6 @@
#if !defined(mozilla_dom_HTMLCanvasElement_h)
#define mozilla_dom_HTMLCanvasElement_h
#include "mozilla/Attributes.h"
#include "nsIDOMHTMLCanvasElement.h"
#include "nsGenericHTMLElement.h"
#include "nsGkAtoms.h"
@ -183,16 +182,16 @@ public:
/*
* nsICanvasElementExternal -- for use outside of content/layout
*/
NS_IMETHOD_(nsIntSize) GetSizeExternal() MOZ_OVERRIDE;
NS_IMETHOD_(nsIntSize) GetSizeExternal();
NS_IMETHOD RenderContextsExternal(gfxContext *aContext,
gfxPattern::GraphicsFilter aFilter,
uint32_t aFlags = RenderFlagPremultAlpha) MOZ_OVERRIDE;
uint32_t aFlags = RenderFlagPremultAlpha);
virtual bool ParseAttribute(int32_t aNamespaceID,
nsIAtom* aAttribute,
const nsAString& aValue,
nsAttrValue& aResult) MOZ_OVERRIDE;
nsChangeHint GetAttributeChangeHint(const nsIAtom* aAttribute, int32_t aModType) const MOZ_OVERRIDE;
nsAttrValue& aResult);
nsChangeHint GetAttributeChangeHint(const nsIAtom* aAttribute, int32_t aModType) const;
// SetAttr override. C++ is stupid, so have to override both
// overloaded methods.
@ -203,8 +202,8 @@ public:
}
virtual nsresult SetAttr(int32_t aNameSpaceID, nsIAtom* aName,
nsIAtom* aPrefix, const nsAString& aValue,
bool aNotify) MOZ_OVERRIDE;
virtual nsresult Clone(nsINodeInfo *aNodeInfo, nsINode **aResult) const MOZ_OVERRIDE;
bool aNotify);
virtual nsresult Clone(nsINodeInfo *aNodeInfo, nsINode **aResult) const;
nsresult CopyInnerTo(mozilla::dom::Element* aDest);
/*
@ -227,7 +226,7 @@ public:
nsresult GetContext(const nsAString& aContextId, nsISupports** aContext);
virtual nsIDOMNode* AsDOMNode() MOZ_OVERRIDE { return this; }
virtual nsIDOMNode* AsDOMNode() { return this; }
protected:
virtual JSObject* WrapNode(JSContext* aCx,

22
content/html/content/public/HTMLMediaElement.h
View File

@ -96,7 +96,7 @@ public:
virtual bool ParseAttribute(int32_t aNamespaceID,
nsIAtom* aAttribute,
const nsAString& aValue,
nsAttrValue& aResult) MOZ_OVERRIDE;
nsAttrValue& aResult);
// SetAttr override. C++ is stupid, so have to override both
// overloaded methods.
nsresult SetAttr(int32_t aNameSpaceID, nsIAtom* aName,
@ -106,20 +106,20 @@ public:
}
virtual nsresult SetAttr(int32_t aNameSpaceID, nsIAtom* aName,
nsIAtom* aPrefix, const nsAString& aValue,
bool aNotify) MOZ_OVERRIDE;
bool aNotify);
virtual nsresult UnsetAttr(int32_t aNameSpaceID, nsIAtom* aAttr,
bool aNotify) MOZ_OVERRIDE;
bool aNotify);
virtual nsresult BindToTree(nsIDocument* aDocument, nsIContent* aParent,
nsIContent* aBindingParent,
bool aCompileEventHandlers) MOZ_OVERRIDE;
bool aCompileEventHandlers);
virtual void UnbindFromTree(bool aDeep = true,
bool aNullParent = true) MOZ_OVERRIDE;
virtual void DoneCreatingElement() MOZ_OVERRIDE;
bool aNullParent = true);
virtual void DoneCreatingElement();
virtual bool IsHTMLFocusable(bool aWithMouse, bool *aIsFocusable,
int32_t *aTabIndex) MOZ_OVERRIDE;
virtual int32_t TabIndexDefault() MOZ_OVERRIDE;
int32_t *aTabIndex);
virtual int32_t TabIndexDefault();
/**
* Call this to reevaluate whether we should start/stop due to our owner
@ -284,7 +284,7 @@ public:
virtual void NotifyAudioAvailable(float* aFrameBuffer, uint32_t aFrameBufferLength,
float aTime) MOZ_FINAL MOZ_OVERRIDE;
virtual bool IsNodeOfType(uint32_t aFlags) const MOZ_OVERRIDE;
virtual bool IsNodeOfType(uint32_t aFlags) const;
/**
* Returns the current load ID. Asynchronous events store the ID that was
@ -527,8 +527,8 @@ protected:
class MediaLoadListener;
class StreamListener;
virtual void GetItemValueText(nsAString& text) MOZ_OVERRIDE;
virtual void SetItemValueText(const nsAString& text) MOZ_OVERRIDE;
virtual void GetItemValueText(nsAString& text);
virtual void SetItemValueText(const nsAString& text);
class WakeLockBoolWrapper {
public:

9
content/html/content/public/HTMLVideoElement.h
View File

@ -7,7 +7,6 @@
#ifndef mozilla_dom_HTMLVideoElement_h
#define mozilla_dom_HTMLVideoElement_h
#include "mozilla/Attributes.h"
#include "nsIDOMHTMLVideoElement.h"
#include "mozilla/dom/HTMLMediaElement.h"
@ -46,10 +45,10 @@ public:
nsIAtom* aAttribute,
const nsAString& aValue,
nsAttrValue& aResult);
NS_IMETHOD_(bool) IsAttributeMapped(const nsIAtom* aAttribute) const MOZ_OVERRIDE;
virtual nsMapRuleToAttributesFunc GetAttributeMappingFunction() const MOZ_OVERRIDE;
NS_IMETHOD_(bool) IsAttributeMapped(const nsIAtom* aAttribute) const;
virtual nsMapRuleToAttributesFunc GetAttributeMappingFunction() const;
virtual nsresult Clone(nsINodeInfo *aNodeInfo, nsINode **aResult) const MOZ_OVERRIDE;
virtual nsresult Clone(nsINodeInfo *aNodeInfo, nsINode **aResult) const;
// Set size with the current video frame's height and width.
// If there is no video frame, returns NS_ERROR_FAILURE.
@ -57,7 +56,7 @@ public:
virtual nsresult SetAcceptHeader(nsIHttpChannel* aChannel);
virtual nsIDOMNode* AsDOMNode() MOZ_OVERRIDE { return this; }
virtual nsIDOMNode* AsDOMNode() { return this; }
// WebIDL

7
content/html/content/public/nsFormSubmission.h
View File

@ -5,7 +5,6 @@
#ifndef nsIFormSubmission_h___
#define nsIFormSubmission_h___
#include "mozilla/Attributes.h"
#include "nsISupports.h"
#include "nsString.h"
#include "nsCOMPtr.h"
@ -160,12 +159,12 @@ public:
~nsFSMultipartFormData();
virtual nsresult AddNameValuePair(const nsAString& aName,
const nsAString& aValue) MOZ_OVERRIDE;
const nsAString& aValue);
virtual nsresult AddNameFilePair(const nsAString& aName,
nsIDOMBlob* aBlob,
const nsString& aFilename) MOZ_OVERRIDE;
const nsString& aFilename);
virtual nsresult GetEncodedSubmission(nsIURI* aURI,
nsIInputStream** aPostDataStream) MOZ_OVERRIDE;
nsIInputStream** aPostDataStream);
void GetContentType(nsACString& aContentType)
{

39
content/html/content/src/HTMLAnchorElement.h
View File

@ -7,7 +7,6 @@
#ifndef mozilla_dom_HTMLAnchorElement_h
#define mozilla_dom_HTMLAnchorElement_h
#include "mozilla/Attributes.h"
#include "nsGenericHTMLElement.h"
#include "nsIDOMHTMLAnchorElement.h"
#include "nsILink.h"
@ -56,22 +55,22 @@ public:
NS_DECL_SIZEOF_EXCLUDING_THIS
// nsILink
NS_IMETHOD LinkAdded() MOZ_OVERRIDE { return NS_OK; }
NS_IMETHOD LinkRemoved() MOZ_OVERRIDE { return NS_OK; }
NS_IMETHOD LinkAdded() { return NS_OK; }
NS_IMETHOD LinkRemoved() { return NS_OK; }
virtual nsresult BindToTree(nsIDocument* aDocument, nsIContent* aParent,
nsIContent* aBindingParent,
bool aCompileEventHandlers) MOZ_OVERRIDE;
bool aCompileEventHandlers);
virtual void UnbindFromTree(bool aDeep = true,
bool aNullParent = true) MOZ_OVERRIDE;
virtual bool IsHTMLFocusable(bool aWithMouse, bool *aIsFocusable, int32_t *aTabIndex) MOZ_OVERRIDE;
bool aNullParent = true);
virtual bool IsHTMLFocusable(bool aWithMouse, bool *aIsFocusable, int32_t *aTabIndex);
virtual nsresult PreHandleEvent(nsEventChainPreVisitor& aVisitor) MOZ_OVERRIDE;
virtual nsresult PostHandleEvent(nsEventChainPostVisitor& aVisitor) MOZ_OVERRIDE;
virtual bool IsLink(nsIURI** aURI) const MOZ_OVERRIDE;
virtual void GetLinkTarget(nsAString& aTarget) MOZ_OVERRIDE;
virtual nsLinkState GetLinkState() const MOZ_OVERRIDE;
virtual already_AddRefed<nsIURI> GetHrefURI() const MOZ_OVERRIDE;
virtual nsresult PreHandleEvent(nsEventChainPreVisitor& aVisitor);
virtual nsresult PostHandleEvent(nsEventChainPostVisitor& aVisitor);
virtual bool IsLink(nsIURI** aURI) const;
virtual void GetLinkTarget(nsAString& aTarget);
virtual nsLinkState GetLinkState() const;
virtual already_AddRefed<nsIURI> GetHrefURI() const;
nsresult SetAttr(int32_t aNameSpaceID, nsIAtom* aName,
const nsAString& aValue, bool aNotify)
@ -80,19 +79,19 @@ public:
}
virtual nsresult SetAttr(int32_t aNameSpaceID, nsIAtom* aName,
nsIAtom* aPrefix, const nsAString& aValue,
bool aNotify) MOZ_OVERRIDE;
bool aNotify);
virtual nsresult UnsetAttr(int32_t aNameSpaceID, nsIAtom* aAttribute,
bool aNotify) MOZ_OVERRIDE;
bool aNotify);
virtual bool ParseAttribute(int32_t aNamespaceID,
nsIAtom* aAttribute,
const nsAString& aValue,
nsAttrValue& aResult) MOZ_OVERRIDE;
nsAttrValue& aResult);
virtual nsresult Clone(nsINodeInfo *aNodeInfo, nsINode **aResult) const MOZ_OVERRIDE;
virtual nsresult Clone(nsINodeInfo *aNodeInfo, nsINode **aResult) const;
virtual nsEventStates IntrinsicState() const MOZ_OVERRIDE;
virtual nsEventStates IntrinsicState() const;
virtual nsIDOMNode* AsDOMNode() MOZ_OVERRIDE { return this; }
virtual nsIDOMNode* AsDOMNode() { return this; }
virtual void OnDNSPrefetchDeferred();
virtual void OnDNSPrefetchRequested();
@ -201,8 +200,8 @@ public:
}
protected:
virtual void GetItemValueText(nsAString& text) MOZ_OVERRIDE;
virtual void SetItemValueText(const nsAString& text) MOZ_OVERRIDE;
virtual void GetItemValueText(nsAString& text);
virtual void SetItemValueText(const nsAString& text);
virtual JSObject* WrapNode(JSContext *aCx,
JS::Handle<JSObject*> aScope) MOZ_OVERRIDE;
};

35
content/html/content/src/HTMLAreaElement.h
View File

@ -7,7 +7,6 @@
#ifndef mozilla_dom_HTMLAreaElement_h
#define mozilla_dom_HTMLAreaElement_h
#include "mozilla/Attributes.h"
#include "nsIDOMHTMLAreaElement.h"
#include "nsGenericHTMLElement.h"
#include "nsILink.h"
@ -50,21 +49,21 @@ public:
NS_DECL_NSIDOMHTMLAREAELEMENT
// nsILink
NS_IMETHOD LinkAdded() MOZ_OVERRIDE { return NS_OK; }
NS_IMETHOD LinkRemoved() MOZ_OVERRIDE { return NS_OK; }
NS_IMETHOD LinkAdded() { return NS_OK; }
NS_IMETHOD LinkRemoved() { return NS_OK; }
virtual nsresult PreHandleEvent(nsEventChainPreVisitor& aVisitor) MOZ_OVERRIDE;
virtual nsresult PostHandleEvent(nsEventChainPostVisitor& aVisitor) MOZ_OVERRIDE;
virtual bool IsLink(nsIURI** aURI) const MOZ_OVERRIDE;
virtual void GetLinkTarget(nsAString& aTarget) MOZ_OVERRIDE;
virtual nsLinkState GetLinkState() const MOZ_OVERRIDE;
virtual already_AddRefed<nsIURI> GetHrefURI() const MOZ_OVERRIDE;
virtual nsresult PreHandleEvent(nsEventChainPreVisitor& aVisitor);
virtual nsresult PostHandleEvent(nsEventChainPostVisitor& aVisitor);
virtual bool IsLink(nsIURI** aURI) const;
virtual void GetLinkTarget(nsAString& aTarget);
virtual nsLinkState GetLinkState() const;
virtual already_AddRefed<nsIURI> GetHrefURI() const;
virtual nsresult BindToTree(nsIDocument* aDocument, nsIContent* aParent,
nsIContent* aBindingParent,
bool aCompileEventHandlers) MOZ_OVERRIDE;
bool aCompileEventHandlers);
virtual void UnbindFromTree(bool aDeep = true,
bool aNullParent = true) MOZ_OVERRIDE;
bool aNullParent = true);
nsresult SetAttr(int32_t aNameSpaceID, nsIAtom* aName,
const nsAString& aValue, bool aNotify)
{
@ -72,15 +71,15 @@ public:
}
virtual nsresult SetAttr(int32_t aNameSpaceID, nsIAtom* aName,
nsIAtom* aPrefix, const nsAString& aValue,
bool aNotify) MOZ_OVERRIDE;
bool aNotify);
virtual nsresult UnsetAttr(int32_t aNameSpaceID, nsIAtom* aAttribute,
bool aNotify) MOZ_OVERRIDE;
bool aNotify);
virtual nsresult Clone(nsINodeInfo* aNodeInfo, nsINode** aResult) const MOZ_OVERRIDE;
virtual nsresult Clone(nsINodeInfo* aNodeInfo, nsINode** aResult) const;
virtual nsEventStates IntrinsicState() const MOZ_OVERRIDE;
virtual nsEventStates IntrinsicState() const;
virtual nsIDOMNode* AsDOMNode() MOZ_OVERRIDE { return this; }
virtual nsIDOMNode* AsDOMNode() { return this; }
// WebIDL
@ -166,8 +165,8 @@ protected:
virtual JSObject* WrapNode(JSContext* aCx,
JS::Handle<JSObject*> aScope) MOZ_OVERRIDE;
virtual void GetItemValueText(nsAString& text) MOZ_OVERRIDE;
virtual void SetItemValueText(const nsAString& text) MOZ_OVERRIDE;
virtual void GetItemValueText(nsAString& text);
virtual void SetItemValueText(const nsAString& text);
};
} // namespace dom

11
content/html/content/src/HTMLBRElement.h
View File

@ -6,7 +6,6 @@
#ifndef mozilla_dom_HTMLBRElement_h
#define mozilla_dom_HTMLBRElement_h
#include "mozilla/Attributes.h"
#include "nsIDOMHTMLBRElement.h"
#include "nsGenericHTMLElement.h"
#include "nsGkAtoms.h"
@ -39,11 +38,11 @@ public:
virtual bool ParseAttribute(int32_t aNamespaceID,
nsIAtom* aAttribute,
const nsAString& aValue,
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 nsIDOMNode* AsDOMNode() MOZ_OVERRIDE { return this; }
nsAttrValue& aResult);
NS_IMETHOD_(bool) IsAttributeMapped(const nsIAtom* aAttribute) const;
virtual nsMapRuleToAttributesFunc GetAttributeMappingFunction() const;
virtual nsresult Clone(nsINodeInfo *aNodeInfo, nsINode **aResult) const;
virtual nsIDOMNode* AsDOMNode() { return this; }
bool Clear()
{

21
content/html/content/src/HTMLBodyElement.h
View File

@ -5,7 +5,6 @@
#ifndef HTMLBodyElement_h___
#define HTMLBodyElement_h___
#include "mozilla/Attributes.h"
#include "nsGenericHTMLElement.h"
#include "nsIDOMHTMLBodyElement.h"
#include "nsIStyleRule.h"
@ -25,9 +24,9 @@ public:
NS_DECL_ISUPPORTS
// nsIStyleRule interface
virtual void MapRuleInfoInto(nsRuleData* aRuleData) MOZ_OVERRIDE;
virtual void MapRuleInfoInto(nsRuleData* aRuleData);
#ifdef DEBUG
virtual void List(FILE* out = stdout, int32_t aIndent = 0) const MOZ_OVERRIDE;
virtual void List(FILE* out = stdout, int32_t aIndent = 0) const;
#endif
HTMLBodyElement* mPart; // not ref-counted, cleared by content
@ -134,15 +133,15 @@ public:
virtual bool ParseAttribute(int32_t aNamespaceID,
nsIAtom* aAttribute,
const nsAString& aValue,
nsAttrValue& aResult) MOZ_OVERRIDE;
nsAttrValue& aResult);
virtual void UnbindFromTree(bool aDeep = true,
bool aNullParent = true) MOZ_OVERRIDE;
virtual nsMapRuleToAttributesFunc GetAttributeMappingFunction() const MOZ_OVERRIDE;
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 nsIDOMNode* AsDOMNode() MOZ_OVERRIDE { return this; }
bool aNullParent = true);
virtual nsMapRuleToAttributesFunc GetAttributeMappingFunction() const;
NS_IMETHOD WalkContentStyleRules(nsRuleWalker* aRuleWalker);
NS_IMETHOD_(bool) IsAttributeMapped(const nsIAtom* aAttribute) const;
virtual already_AddRefed<nsIEditor> GetAssociatedEditor();
virtual nsresult Clone(nsINodeInfo *aNodeInfo, nsINode **aResult) const;
virtual nsIDOMNode* AsDOMNode() { return this; }
virtual bool IsEventAttributeName(nsIAtom* aName) MOZ_OVERRIDE;

35
content/html/content/src/HTMLButtonElement.h
View File

@ -6,7 +6,6 @@
#ifndef mozilla_dom_HTMLButtonElement_h
#define mozilla_dom_HTMLButtonElement_h
#include "mozilla/Attributes.h"
#include "nsGenericHTMLElement.h"
#include "nsIDOMHTMLButtonElement.h"
#include "nsIConstraintValidation.h"
@ -47,52 +46,52 @@ public:
// overriden nsIFormControl methods
NS_IMETHOD_(uint32_t) GetType() const { return mType; }
NS_IMETHOD Reset() MOZ_OVERRIDE;
NS_IMETHOD SubmitNamesValues(nsFormSubmission* aFormSubmission) MOZ_OVERRIDE;
NS_IMETHOD SaveState() MOZ_OVERRIDE;
bool RestoreState(nsPresState* aState) MOZ_OVERRIDE;
virtual bool IsDisabledForEvents(uint32_t aMessage) MOZ_OVERRIDE;
NS_IMETHOD Reset();
NS_IMETHOD SubmitNamesValues(nsFormSubmission* aFormSubmission);
NS_IMETHOD SaveState();
bool RestoreState(nsPresState* aState);
virtual bool IsDisabledForEvents(uint32_t aMessage);
// nsIDOMEventTarget
virtual nsresult PreHandleEvent(nsEventChainPreVisitor& aVisitor) MOZ_OVERRIDE;
virtual nsresult PostHandleEvent(nsEventChainPostVisitor& aVisitor) MOZ_OVERRIDE;
virtual nsresult PreHandleEvent(nsEventChainPreVisitor& aVisitor);
virtual nsresult PostHandleEvent(nsEventChainPostVisitor& aVisitor);
// nsINode
virtual nsresult Clone(nsINodeInfo* aNodeInfo, nsINode** aResult) const MOZ_OVERRIDE;
virtual nsIDOMNode* AsDOMNode() MOZ_OVERRIDE { return this; }
virtual nsresult Clone(nsINodeInfo* aNodeInfo, nsINode** aResult) const;
virtual nsIDOMNode* AsDOMNode() { return this; }
virtual JSObject* WrapNode(JSContext* aCx,
JS::Handle<JSObject*> aScope) MOZ_OVERRIDE;
// nsIContent
virtual nsresult BindToTree(nsIDocument* aDocument, nsIContent* aParent,
nsIContent* aBindingParent,
bool aCompileEventHandlers) MOZ_OVERRIDE;
bool aCompileEventHandlers);
virtual void UnbindFromTree(bool aDeep = true,
bool aNullParent = true) MOZ_OVERRIDE;
virtual void DoneCreatingElement() MOZ_OVERRIDE;
bool aNullParent = true);
virtual void DoneCreatingElement();
// Element
nsEventStates IntrinsicState() const MOZ_OVERRIDE;
nsEventStates IntrinsicState() const;
/**
* Called when an attribute is about to be changed
*/
virtual nsresult BeforeSetAttr(int32_t aNameSpaceID, nsIAtom* aName,
const nsAttrValueOrString* aValue,
bool aNotify) MOZ_OVERRIDE;
bool aNotify);
/**
* Called when an attribute has just been changed
*/
nsresult AfterSetAttr(int32_t aNamespaceID, nsIAtom* aName,
const nsAttrValue* aValue, bool aNotify) MOZ_OVERRIDE;
const nsAttrValue* aValue, bool aNotify);
virtual bool ParseAttribute(int32_t aNamespaceID,
nsIAtom* aAttribute,
const nsAString& aValue,
nsAttrValue& aResult) MOZ_OVERRIDE;
nsAttrValue& aResult);
// nsGenericHTMLElement
virtual bool IsHTMLFocusable(bool aWithMouse,
bool* aIsFocusable,
int32_t* aTabIndex) MOZ_OVERRIDE;
int32_t* aTabIndex);
// WebIDL
bool Autofocus() const

9
content/html/content/src/HTMLDataElement.h
View File

@ -6,7 +6,6 @@
#ifndef mozilla_dom_HTMLDataElement_h
#define mozilla_dom_HTMLDataElement_h
#include "mozilla/Attributes.h"
#include "nsIDOMHTMLElement.h"
#include "nsGenericHTMLElement.h"
#include "nsGkAtoms.h"
@ -44,10 +43,10 @@ public:
SetHTMLAttr(nsGkAtoms::value, aValue, aError);
}
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 nsIDOMNode* AsDOMNode() MOZ_OVERRIDE { return this; }
virtual void GetItemValueText(nsAString& text);
virtual void SetItemValueText(const nsAString& text);
virtual nsresult Clone(nsINodeInfo* aNodeInfo, nsINode** aResult) const;
virtual nsIDOMNode* AsDOMNode() { return this; }
protected:
virtual JSObject* WrapNode(JSContext* aCx,

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

@ -5,7 +5,6 @@
#ifndef HTMLDataListElement_h___
#define HTMLDataListElement_h___
#include "mozilla/Attributes.h"
#include "nsGenericHTMLElement.h"
#include "nsIDOMHTMLDataListElement.h"
#include "nsContentList.h"
@ -49,7 +48,7 @@ public:
}
virtual nsresult Clone(nsINodeInfo *aNodeInfo, nsINode **aResult) const MOZ_OVERRIDE;
virtual nsresult Clone(nsINodeInfo *aNodeInfo, nsINode **aResult) const;
// This function is used to generate the nsContentList (option elements).
static bool MatchOptions(nsIContent* aContent, int32_t aNamespaceID,
@ -58,7 +57,7 @@ public:
NS_DECL_CYCLE_COLLECTION_CLASS_INHERITED(HTMLDataListElement,
nsGenericHTMLElement)
virtual nsIDOMNode* AsDOMNode() MOZ_OVERRIDE { return this; }
virtual nsIDOMNode* AsDOMNode() { return this; }
protected:
virtual JSObject* WrapNode(JSContext *aCx,
JS::Handle<JSObject*> aScope) MOZ_OVERRIDE;

15
content/html/content/src/HTMLDivElement.h
View File

@ -5,7 +5,6 @@
#ifndef HTMLDivElement_h___
#define HTMLDivElement_h___
#include "mozilla/Attributes.h"
#include "nsGenericHTMLElement.h"
#include "nsIDOMHTMLDivElement.h"
@ -36,14 +35,14 @@ public:
NS_FORWARD_NSIDOMHTMLELEMENT_TO_GENERIC
// nsIDOMHTMLDivElement
NS_IMETHOD GetAlign(nsAString& aAlign) MOZ_OVERRIDE
NS_IMETHOD GetAlign(nsAString& aAlign)
{
nsString align;
GetAlign(align);
aAlign = align;
return NS_OK;
}
NS_IMETHOD SetAlign(const nsAString& aAlign) MOZ_OVERRIDE
NS_IMETHOD SetAlign(const nsAString& aAlign)
{
mozilla::ErrorResult rv;
SetAlign(aAlign, rv);
@ -62,12 +61,12 @@ public:
virtual bool ParseAttribute(int32_t aNamespaceID,
nsIAtom* aAttribute,
const nsAString& aValue,
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;
nsAttrValue& aResult);
NS_IMETHOD_(bool) IsAttributeMapped(const nsIAtom* aAttribute) const;
virtual nsMapRuleToAttributesFunc GetAttributeMappingFunction() const;
virtual nsresult Clone(nsINodeInfo *aNodeInfo, nsINode **aResult) const;
virtual nsIDOMNode* AsDOMNode() MOZ_OVERRIDE { return this; }
virtual nsIDOMNode* AsDOMNode() { return this; }
protected:
virtual JSObject* WrapNode(JSContext *aCx,

21
content/html/content/src/HTMLFieldSetElement.h
View File

@ -6,7 +6,6 @@
#ifndef mozilla_dom_HTMLFieldSetElement_h
#define mozilla_dom_HTMLFieldSetElement_h
#include "mozilla/Attributes.h"
#include "nsGenericHTMLElement.h"
#include "nsIDOMHTMLFieldSetElement.h"
#include "nsIConstraintValidation.h"
@ -47,21 +46,21 @@ public:
NS_DECL_NSIDOMHTMLFIELDSETELEMENT
// nsIContent
virtual nsresult PreHandleEvent(nsEventChainPreVisitor& aVisitor) MOZ_OVERRIDE;
virtual nsresult PreHandleEvent(nsEventChainPreVisitor& aVisitor);
virtual nsresult AfterSetAttr(int32_t aNameSpaceID, nsIAtom* aName,
const nsAttrValue* aValue, bool aNotify) MOZ_OVERRIDE;
const nsAttrValue* aValue, bool aNotify);
virtual nsresult InsertChildAt(nsIContent* aChild, uint32_t aIndex,
bool aNotify) MOZ_OVERRIDE;
virtual void RemoveChildAt(uint32_t aIndex, bool aNotify) MOZ_OVERRIDE;
bool aNotify);
virtual void RemoveChildAt(uint32_t aIndex, bool aNotify);
// nsIFormControl
NS_IMETHOD_(uint32_t) GetType() const MOZ_OVERRIDE { return NS_FORM_FIELDSET; }
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 nsIDOMNode* AsDOMNode() MOZ_OVERRIDE { return this; }
NS_IMETHOD_(uint32_t) GetType() const { return NS_FORM_FIELDSET; }
NS_IMETHOD Reset();
NS_IMETHOD SubmitNamesValues(nsFormSubmission* aFormSubmission);
virtual bool IsDisabledForEvents(uint32_t aMessage);
virtual nsresult Clone(nsINodeInfo *aNodeInfo, nsINode **aResult) const;
virtual nsIDOMNode* AsDOMNode() { return this; }
const nsIContent* GetFirstLegend() const { return mFirstLegend; }

11
content/html/content/src/HTMLFontElement.h
View File

@ -5,7 +5,6 @@
#ifndef HTMLFontElement_h___
#define HTMLFontElement_h___
#include "mozilla/Attributes.h"
#include "nsGenericHTMLElement.h"
#include "nsIDOMHTMLFontElement.h"
@ -66,11 +65,11 @@ public:
virtual bool ParseAttribute(int32_t aNamespaceID,
nsIAtom* aAttribute,
const nsAString& aValue,
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 nsIDOMNode* AsDOMNode() MOZ_OVERRIDE { return this; }
nsAttrValue& aResult);
NS_IMETHOD_(bool) IsAttributeMapped(const nsIAtom* aAttribute) const;
virtual nsMapRuleToAttributesFunc GetAttributeMappingFunction() const;
virtual nsresult Clone(nsINodeInfo *aNodeInfo, nsINode **aResult) const;
virtual nsIDOMNode* AsDOMNode() { return this; }
protected:
virtual JSObject* WrapNode(JSContext *aCx,

11
content/html/content/src/HTMLFrameElement.h
View File

@ -6,7 +6,6 @@
#ifndef mozilla_dom_HTMLFrameElement_h
#define mozilla_dom_HTMLFrameElement_h
#include "mozilla/Attributes.h"
#include "nsIDOMHTMLFrameElement.h"
#include "nsGenericHTMLFrameElement.h"
#include "nsGkAtoms.h"
@ -45,11 +44,11 @@ public:
virtual bool ParseAttribute(int32_t aNamespaceID,
nsIAtom* aAttribute,
const nsAString& aValue,
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 nsIDOMNode* AsDOMNode() MOZ_OVERRIDE { return this; }
nsAttrValue& aResult);
NS_IMETHOD_(bool) IsAttributeMapped(const nsIAtom* aAttribute) const;
nsMapRuleToAttributesFunc GetAttributeMappingFunction() const;
virtual nsresult Clone(nsINodeInfo *aNodeInfo, nsINode **aResult) const;
virtual nsIDOMNode* AsDOMNode() { return this; }
// WebIDL API
// The XPCOM GetFrameBorder is OK for us

11
content/html/content/src/HTMLFrameSetElement.h
View File

@ -6,7 +6,6 @@
#ifndef HTMLFrameSetElement_h
#define HTMLFrameSetElement_h
#include "mozilla/Attributes.h"
#include "nsIDOMHTMLFrameSetElement.h"
#include "nsGenericHTMLElement.h"
@ -121,7 +120,7 @@ public:
}
virtual nsresult SetAttr(int32_t aNameSpaceID, nsIAtom* aName,
nsIAtom* aPrefix, const nsAString& aValue,
bool aNotify) MOZ_OVERRIDE;
bool aNotify);
/**
* GetRowSpec is used to get the "rows" spec.
@ -144,12 +143,12 @@ public:
virtual bool ParseAttribute(int32_t aNamespaceID,
nsIAtom* aAttribute,
const nsAString& aValue,
nsAttrValue& aResult) MOZ_OVERRIDE;
nsAttrValue& aResult);
virtual nsChangeHint GetAttributeChangeHint(const nsIAtom* aAttribute,
int32_t aModType) const MOZ_OVERRIDE;
int32_t aModType) const;
virtual nsresult Clone(nsINodeInfo *aNodeInfo, nsINode **aResult) const MOZ_OVERRIDE;
virtual nsIDOMNode* AsDOMNode() MOZ_OVERRIDE { return this; }
virtual nsresult Clone(nsINodeInfo *aNodeInfo, nsINode **aResult) const;
virtual nsIDOMNode* AsDOMNode() { return this; }
protected:
virtual JSObject* WrapNode(JSContext *aCx,

10
content/html/content/src/HTMLHRElement.h
View File

@ -41,11 +41,11 @@ public:
virtual bool ParseAttribute(int32_t aNamespaceID,
nsIAtom* aAttribute,
const nsAString& aValue,
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 nsIDOMNode* AsDOMNode() MOZ_OVERRIDE { return this; }
nsAttrValue& aResult);
NS_IMETHOD_(bool) IsAttributeMapped(const nsIAtom* aAttribute) const;
virtual nsMapRuleToAttributesFunc GetAttributeMappingFunction() const;
virtual nsresult Clone(nsINodeInfo *aNodeInfo, nsINode **aResult) const;
virtual nsIDOMNode* AsDOMNode() { return this; }
// WebIDL API
void SetAlign(const nsAString& aAlign, ErrorResult& aError)

11
content/html/content/src/HTMLHeadingElement.h
View File

@ -6,7 +6,6 @@
#ifndef mozilla_dom_HTMLHeadingElement_h
#define mozilla_dom_HTMLHeadingElement_h
#include "mozilla/Attributes.h"
#include "nsIDOMHTMLHeadingElement.h"
#include "nsGenericHTMLElement.h"
@ -42,11 +41,11 @@ public:
virtual bool ParseAttribute(int32_t aNamespaceID,
nsIAtom* aAttribute,
const nsAString& aValue,
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 nsIDOMNode* AsDOMNode() MOZ_OVERRIDE { return this; }
nsAttrValue& aResult);
NS_IMETHOD_(bool) IsAttributeMapped(const nsIAtom* aAttribute) const;
nsMapRuleToAttributesFunc GetAttributeMappingFunction() const;
virtual nsresult Clone(nsINodeInfo *aNodeInfo, nsINode **aResult) const;
virtual nsIDOMNode* AsDOMNode() { return this; }
// The XPCOM versions of GetAlign and SetAlign are fine for us for
// use from WebIDL.

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

@ -6,7 +6,6 @@
#ifndef mozilla_dom_HTMLIFrameElement_h
#define mozilla_dom_HTMLIFrameElement_h
#include "mozilla/Attributes.h"
#include "nsGenericHTMLFrameElement.h"
#include "nsIDOMHTMLIFrameElement.h"
#include "nsIDOMGetSVGDocument.h"
@ -47,16 +46,16 @@ public:
virtual bool ParseAttribute(int32_t aNamespaceID,
nsIAtom* aAttribute,
const nsAString& aValue,
nsAttrValue& aResult) MOZ_OVERRIDE;
NS_IMETHOD_(bool) IsAttributeMapped(const nsIAtom* aAttribute) const MOZ_OVERRIDE;
virtual nsMapRuleToAttributesFunc GetAttributeMappingFunction() const MOZ_OVERRIDE;
nsAttrValue& aResult);
NS_IMETHOD_(bool) IsAttributeMapped(const nsIAtom* aAttribute) const;
virtual nsMapRuleToAttributesFunc GetAttributeMappingFunction() const;
virtual nsresult Clone(nsINodeInfo *aNodeInfo, nsINode **aResult) const MOZ_OVERRIDE;
virtual nsIDOMNode* AsDOMNode() MOZ_OVERRIDE { return this; }
virtual nsresult Clone(nsINodeInfo *aNodeInfo, nsINode **aResult) const;
virtual nsIDOMNode* AsDOMNode() { return this; }
virtual nsresult AfterSetAttr(int32_t aNameSpaceID, nsIAtom* aName,
const nsAttrValue* aValue,
bool aNotify) MOZ_OVERRIDE;
bool aNotify);
uint32_t GetSandboxFlags();
@ -166,8 +165,8 @@ public:
// nsGenericHTMLFrameElement::GetAppManifestURL is fine
protected:
virtual void GetItemValueText(nsAString& text) MOZ_OVERRIDE;
virtual void SetItemValueText(const nsAString& text) MOZ_OVERRIDE;
virtual void GetItemValueText(nsAString& text);
virtual void SetItemValueText(const nsAString& text);
virtual JSObject* WrapNode(JSContext* aCx,
JS::Handle<JSObject*> aScope) MOZ_OVERRIDE;

31
content/html/content/src/HTMLImageElement.h
View File

@ -6,7 +6,6 @@
#ifndef mozilla_dom_HTMLImageElement_h
#define mozilla_dom_HTMLImageElement_h
#include "mozilla/Attributes.h"
#include "nsGenericHTMLElement.h"
#include "nsImageLoadingContent.h"
#include "nsIDOMHTMLImageElement.h"
@ -51,15 +50,15 @@ public:
virtual bool ParseAttribute(int32_t aNamespaceID,
nsIAtom* aAttribute,
const nsAString& aValue,
nsAttrValue& aResult) MOZ_OVERRIDE;
nsAttrValue& aResult);
virtual nsChangeHint GetAttributeChangeHint(const nsIAtom* aAttribute,
int32_t aModType) const MOZ_OVERRIDE;
NS_IMETHOD_(bool) IsAttributeMapped(const nsIAtom* aAttribute) const MOZ_OVERRIDE;
virtual nsMapRuleToAttributesFunc GetAttributeMappingFunction() const MOZ_OVERRIDE;
int32_t aModType) const;
NS_IMETHOD_(bool) IsAttributeMapped(const nsIAtom* aAttribute) const;
virtual nsMapRuleToAttributesFunc GetAttributeMappingFunction() const;
virtual nsresult PreHandleEvent(nsEventChainPreVisitor& aVisitor) MOZ_OVERRIDE;
virtual nsresult PreHandleEvent(nsEventChainPreVisitor& aVisitor);
bool IsHTMLFocusable(bool aWithMouse, bool *aIsFocusable, int32_t *aTabIndex) MOZ_OVERRIDE;
bool IsHTMLFocusable(bool aWithMouse, bool *aIsFocusable, int32_t *aTabIndex);
// SetAttr override. C++ is stupid, so have to override both
// overloaded methods.
@ -70,22 +69,22 @@ public:
}
virtual nsresult SetAttr(int32_t aNameSpaceID, nsIAtom* aName,
nsIAtom* aPrefix, const nsAString& aValue,
bool aNotify) MOZ_OVERRIDE;
bool aNotify);
virtual nsresult UnsetAttr(int32_t aNameSpaceID, nsIAtom* aAttribute,
bool aNotify) MOZ_OVERRIDE;
bool aNotify);
virtual nsresult BindToTree(nsIDocument* aDocument, nsIContent* aParent,
nsIContent* aBindingParent,
bool aCompileEventHandlers) MOZ_OVERRIDE;
virtual void UnbindFromTree(bool aDeep, bool aNullParent) MOZ_OVERRIDE;
bool aCompileEventHandlers);
virtual void UnbindFromTree(bool aDeep, bool aNullParent);
virtual nsEventStates IntrinsicState() const MOZ_OVERRIDE;
virtual nsresult Clone(nsINodeInfo *aNodeInfo, nsINode **aResult) const MOZ_OVERRIDE;
virtual nsEventStates IntrinsicState() const;
virtual nsresult Clone(nsINodeInfo *aNodeInfo, nsINode **aResult) const;
nsresult CopyInnerTo(Element* aDest);
void MaybeLoadImage();
virtual nsIDOMNode* AsDOMNode() MOZ_OVERRIDE { return this; }
virtual nsIDOMNode* AsDOMNode() { return this; }
bool IsMap()
{
@ -167,8 +166,8 @@ public:
protected:
nsIntPoint GetXY();
virtual void GetItemValueText(nsAString& text) MOZ_OVERRIDE;
virtual void SetItemValueText(const nsAString& text) MOZ_OVERRIDE;
virtual void GetItemValueText(nsAString& text);
virtual void SetItemValueText(const nsAString& text);
virtual JSObject* WrapNode(JSContext *aCx,
JS::Handle<JSObject*> aScope) MOZ_OVERRIDE;
};

107
content/html/content/src/HTMLInputElement.h
View File

@ -6,7 +6,6 @@
#ifndef mozilla_dom_HTMLInputElement_h
#define mozilla_dom_HTMLInputElement_h
#include "mozilla/Attributes.h"
#include "nsGenericHTMLElement.h"
#include "nsImageLoadingContent.h"
#include "nsIDOMHTMLInputElement.h"
@ -120,38 +119,38 @@ public:
NS_DECL_NSIPHONETIC
// nsIDOMNSEditableElement
NS_IMETHOD GetEditor(nsIEditor** aEditor) MOZ_OVERRIDE
NS_IMETHOD GetEditor(nsIEditor** aEditor)
{
return nsGenericHTMLElement::GetEditor(aEditor);
}
NS_IMETHOD SetUserInput(const nsAString& aInput) MOZ_OVERRIDE;
NS_IMETHOD SetUserInput(const nsAString& aInput);
// Overriden nsIFormControl methods
NS_IMETHOD_(uint32_t) GetType() const MOZ_OVERRIDE { return mType; }
NS_IMETHOD Reset() MOZ_OVERRIDE;
NS_IMETHOD SubmitNamesValues(nsFormSubmission* aFormSubmission) MOZ_OVERRIDE;
NS_IMETHOD SaveState() MOZ_OVERRIDE;
virtual bool RestoreState(nsPresState* aState) MOZ_OVERRIDE;
virtual bool AllowDrop() MOZ_OVERRIDE;
virtual bool IsDisabledForEvents(uint32_t aMessage) MOZ_OVERRIDE;
NS_IMETHOD_(uint32_t) GetType() const { return mType; }
NS_IMETHOD Reset();
NS_IMETHOD SubmitNamesValues(nsFormSubmission* aFormSubmission);
NS_IMETHOD SaveState();
virtual bool RestoreState(nsPresState* aState);
virtual bool AllowDrop();
virtual bool IsDisabledForEvents(uint32_t aMessage);
virtual void FieldSetDisabledChanged(bool aNotify) MOZ_OVERRIDE;
virtual void FieldSetDisabledChanged(bool aNotify);
// nsIContent
virtual bool IsHTMLFocusable(bool aWithMouse, bool *aIsFocusable, int32_t *aTabIndex) MOZ_OVERRIDE;
virtual bool IsHTMLFocusable(bool aWithMouse, bool *aIsFocusable, int32_t *aTabIndex);
virtual bool ParseAttribute(int32_t aNamespaceID,
nsIAtom* aAttribute,
const nsAString& aValue,
nsAttrValue& aResult) MOZ_OVERRIDE;
nsAttrValue& aResult);
virtual nsChangeHint GetAttributeChangeHint(const nsIAtom* aAttribute,
int32_t aModType) const MOZ_OVERRIDE;
NS_IMETHOD_(bool) IsAttributeMapped(const nsIAtom* aAttribute) const MOZ_OVERRIDE;
virtual nsMapRuleToAttributesFunc GetAttributeMappingFunction() const MOZ_OVERRIDE;
int32_t aModType) const;
NS_IMETHOD_(bool) IsAttributeMapped(const nsIAtom* aAttribute) const;
virtual nsMapRuleToAttributesFunc GetAttributeMappingFunction() const;
virtual nsresult PreHandleEvent(nsEventChainPreVisitor& aVisitor) MOZ_OVERRIDE;
virtual nsresult PostHandleEvent(nsEventChainPostVisitor& aVisitor) MOZ_OVERRIDE;
virtual nsresult PreHandleEvent(nsEventChainPreVisitor& aVisitor);
virtual nsresult PostHandleEvent(nsEventChainPostVisitor& aVisitor);
void PostHandleEventForRangeThumb(nsEventChainPostVisitor& aVisitor);
void StartRangeThumbDrag(nsGUIEvent* aEvent);
void FinishRangeThumbDrag(nsGUIEvent* aEvent = nullptr);
@ -160,40 +159,40 @@ public:
virtual nsresult BindToTree(nsIDocument* aDocument, nsIContent* aParent,
nsIContent* aBindingParent,
bool aCompileEventHandlers) MOZ_OVERRIDE;
bool aCompileEventHandlers);
virtual void UnbindFromTree(bool aDeep = true,
bool aNullParent = true) MOZ_OVERRIDE;
bool aNullParent = true);
virtual void DoneCreatingElement() MOZ_OVERRIDE;
virtual void DoneCreatingElement();
virtual nsEventStates IntrinsicState() const MOZ_OVERRIDE;
virtual nsEventStates IntrinsicState() const;
// nsITextControlElement
NS_IMETHOD SetValueChanged(bool aValueChanged) MOZ_OVERRIDE;
NS_IMETHOD_(bool) IsSingleLineTextControl() const MOZ_OVERRIDE;
NS_IMETHOD_(bool) IsTextArea() const MOZ_OVERRIDE;
NS_IMETHOD_(bool) IsPlainTextControl() const MOZ_OVERRIDE;
NS_IMETHOD_(bool) IsPasswordTextControl() const MOZ_OVERRIDE;
NS_IMETHOD_(int32_t) GetCols() MOZ_OVERRIDE;
NS_IMETHOD_(int32_t) GetWrapCols() MOZ_OVERRIDE;
NS_IMETHOD_(int32_t) GetRows() MOZ_OVERRIDE;
NS_IMETHOD_(void) GetDefaultValueFromContent(nsAString& aValue) MOZ_OVERRIDE;
NS_IMETHOD_(bool) ValueChanged() const MOZ_OVERRIDE;
NS_IMETHOD_(void) GetTextEditorValue(nsAString& aValue, bool aIgnoreWrap) const MOZ_OVERRIDE;
NS_IMETHOD_(nsIEditor*) GetTextEditor() MOZ_OVERRIDE;
NS_IMETHOD_(nsISelectionController*) GetSelectionController() MOZ_OVERRIDE;
NS_IMETHOD_(nsFrameSelection*) GetConstFrameSelection() MOZ_OVERRIDE;
NS_IMETHOD BindToFrame(nsTextControlFrame* aFrame) MOZ_OVERRIDE;
NS_IMETHOD_(void) UnbindFromFrame(nsTextControlFrame* aFrame) MOZ_OVERRIDE;
NS_IMETHOD CreateEditor() MOZ_OVERRIDE;
NS_IMETHOD_(nsIContent*) GetRootEditorNode() MOZ_OVERRIDE;
NS_IMETHOD_(nsIContent*) CreatePlaceholderNode() MOZ_OVERRIDE;
NS_IMETHOD_(nsIContent*) GetPlaceholderNode() MOZ_OVERRIDE;
NS_IMETHOD_(void) UpdatePlaceholderVisibility(bool aNotify) MOZ_OVERRIDE;
NS_IMETHOD_(bool) GetPlaceholderVisibility() MOZ_OVERRIDE;
NS_IMETHOD_(void) InitializeKeyboardEventListeners() MOZ_OVERRIDE;
NS_IMETHOD_(void) OnValueChanged(bool aNotify) MOZ_OVERRIDE;
NS_IMETHOD_(bool) HasCachedSelection() MOZ_OVERRIDE;
NS_IMETHOD SetValueChanged(bool aValueChanged);
NS_IMETHOD_(bool) IsSingleLineTextControl() const;
NS_IMETHOD_(bool) IsTextArea() const;
NS_IMETHOD_(bool) IsPlainTextControl() const;
NS_IMETHOD_(bool) IsPasswordTextControl() const;
NS_IMETHOD_(int32_t) GetCols();
NS_IMETHOD_(int32_t) GetWrapCols();
NS_IMETHOD_(int32_t) GetRows();
NS_IMETHOD_(void) GetDefaultValueFromContent(nsAString& aValue);
NS_IMETHOD_(bool) ValueChanged() const;
NS_IMETHOD_(void) GetTextEditorValue(nsAString& aValue, bool aIgnoreWrap) const;
NS_IMETHOD_(nsIEditor*) GetTextEditor();
NS_IMETHOD_(nsISelectionController*) GetSelectionController();
NS_IMETHOD_(nsFrameSelection*) GetConstFrameSelection();
NS_IMETHOD BindToFrame(nsTextControlFrame* aFrame);
NS_IMETHOD_(void) UnbindFromFrame(nsTextControlFrame* aFrame);
NS_IMETHOD CreateEditor();
NS_IMETHOD_(nsIContent*) GetRootEditorNode();
NS_IMETHOD_(nsIContent*) CreatePlaceholderNode();
NS_IMETHOD_(nsIContent*) GetPlaceholderNode();
NS_IMETHOD_(void) UpdatePlaceholderVisibility(bool aNotify);
NS_IMETHOD_(bool) GetPlaceholderVisibility();
NS_IMETHOD_(void) InitializeKeyboardEventListeners();
NS_IMETHOD_(void) OnValueChanged(bool aNotify);
NS_IMETHOD_(bool) HasCachedSelection();
void GetDisplayFileName(nsAString& aFileName) const;
@ -221,7 +220,7 @@ public:
*/
already_AddRefed<nsIDOMHTMLInputElement> GetSelectedRadioButton();
virtual nsresult Clone(nsINodeInfo *aNodeInfo, nsINode **aResult) const MOZ_OVERRIDE;
virtual nsresult Clone(nsINodeInfo *aNodeInfo, nsINode **aResult) const;
NS_IMETHOD FireAsyncClickHandler();
@ -236,7 +235,7 @@ public:
void MaybeLoadImage();
virtual nsIDOMNode* AsDOMNode() MOZ_OVERRIDE { return this; }
virtual nsIDOMNode* AsDOMNode() { return this; }
// nsIConstraintValidation
bool IsTooLong();
@ -256,7 +255,7 @@ public:
void UpdateAllValidityStates(bool aNotify);
void UpdateBarredFromConstraintValidation();
nsresult GetValidationMessage(nsAString& aValidationMessage,
ValidityStateType aType) MOZ_OVERRIDE;
ValidityStateType aType);
/**
* Update the value missing validity state for radio elements when they have
* a group.
@ -758,12 +757,12 @@ protected:
*/
virtual nsresult BeforeSetAttr(int32_t aNameSpaceID, nsIAtom* aName,
const nsAttrValueOrString* aValue,
bool aNotify) MOZ_OVERRIDE;
bool aNotify);
/**
* Called when an attribute has just been changed
*/
virtual nsresult AfterSetAttr(int32_t aNameSpaceID, nsIAtom* aName,
const nsAttrValue* aValue, bool aNotify) MOZ_OVERRIDE;
const nsAttrValue* aValue, bool aNotify);
/**
* Dispatch a select event. Returns true if the event was not cancelled.
@ -1235,7 +1234,7 @@ private:
{
public:
AsyncClickHandler(HTMLInputElement* aInput);
NS_IMETHOD Run() MOZ_OVERRIDE;
NS_IMETHOD Run();
protected:
nsresult InitFilePicker();
@ -1257,7 +1256,7 @@ private:
NS_DECL_ISUPPORTS
NS_IMETHOD Done(int16_t aResult) MOZ_OVERRIDE;
NS_IMETHOD Done(int16_t aResult);
private:
nsCOMPtr<nsIFilePicker> mFilePicker;

11
content/html/content/src/HTMLLIElement.h
View File

@ -6,7 +6,6 @@
#ifndef mozilla_dom_HTMLLIElement_h
#define mozilla_dom_HTMLLIElement_h
#include "mozilla/Attributes.h"
#include "mozilla/Util.h"
#include "nsIDOMHTMLLIElement.h"
#include "nsGenericHTMLElement.h"
@ -43,11 +42,11 @@ public:
virtual bool ParseAttribute(int32_t aNamespaceID,
nsIAtom* aAttribute,
const nsAString& aValue,
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 nsIDOMNode* AsDOMNode() MOZ_OVERRIDE { return this; }
nsAttrValue& aResult);
NS_IMETHOD_(bool) IsAttributeMapped(const nsIAtom* aAttribute) const;
virtual nsMapRuleToAttributesFunc GetAttributeMappingFunction() const;
virtual nsresult Clone(nsINodeInfo *aNodeInfo, nsINode **aResult) const;
virtual nsIDOMNode* AsDOMNode() { return this; }
// WebIDL API
void GetType(nsString& aType)

17
content/html/content/src/HTMLLabelElement.h
View File

@ -9,7 +9,6 @@
#ifndef HTMLLabelElement_h
#define HTMLLabelElement_h
#include "mozilla/Attributes.h"
#include "nsGenericHTMLElement.h"
#include "nsIDOMHTMLLabelElement.h"
@ -62,19 +61,19 @@ public:
virtual void Focus(mozilla::ErrorResult& aError) MOZ_OVERRIDE;
// nsIFormControl
NS_IMETHOD_(uint32_t) GetType() const MOZ_OVERRIDE { return NS_FORM_LABEL; }
NS_IMETHOD Reset() MOZ_OVERRIDE;
NS_IMETHOD SubmitNamesValues(nsFormSubmission* aFormSubmission) MOZ_OVERRIDE;
NS_IMETHOD_(uint32_t) GetType() const { return NS_FORM_LABEL; }
NS_IMETHOD Reset();
NS_IMETHOD SubmitNamesValues(nsFormSubmission* aFormSubmission);
virtual bool IsDisabled() const MOZ_OVERRIDE { return false; }
virtual bool IsDisabled() const { return false; }
// nsIContent
virtual nsresult PostHandleEvent(nsEventChainPostVisitor& aVisitor) MOZ_OVERRIDE;
virtual nsresult PostHandleEvent(nsEventChainPostVisitor& aVisitor);
virtual void PerformAccesskey(bool aKeyCausesActivation,
bool aIsTrustedEvent) MOZ_OVERRIDE;
virtual nsresult Clone(nsINodeInfo *aNodeInfo, nsINode **aResult) const MOZ_OVERRIDE;
bool aIsTrustedEvent);
virtual nsresult Clone(nsINodeInfo *aNodeInfo, nsINode **aResult) const;
virtual nsIDOMNode* AsDOMNode() MOZ_OVERRIDE { return this; }
virtual nsIDOMNode* AsDOMNode() { return this; }
nsGenericHTMLElement* GetLabeledElement() const;
protected:

19
content/html/content/src/HTMLLegendElement.h
View File

@ -6,7 +6,6 @@
#ifndef mozilla_dom_HTMLLegendElement_h
#define mozilla_dom_HTMLLegendElement_h
#include "mozilla/Attributes.h"
#include "nsIDOMHTMLLegendElement.h"
#include "nsGenericHTMLElement.h"
#include "nsHTMLFormElement.h"
@ -45,20 +44,20 @@ public:
virtual void Focus(ErrorResult& aError) MOZ_OVERRIDE;
virtual void PerformAccesskey(bool aKeyCausesActivation,
bool aIsTrustedEvent) MOZ_OVERRIDE;
bool aIsTrustedEvent);
// nsIContent
virtual nsresult BindToTree(nsIDocument* aDocument, nsIContent* aParent,
nsIContent* aBindingParent,
bool aCompileEventHandlers) MOZ_OVERRIDE;
bool aCompileEventHandlers);
virtual void UnbindFromTree(bool aDeep = true,
bool aNullParent = true) MOZ_OVERRIDE;
bool aNullParent = true);
virtual bool ParseAttribute(int32_t aNamespaceID,
nsIAtom* aAttribute,
const nsAString& aValue,
nsAttrValue& aResult) MOZ_OVERRIDE;
nsAttrValue& aResult);
virtual nsChangeHint GetAttributeChangeHint(const nsIAtom* aAttribute,
int32_t aModType) const MOZ_OVERRIDE;
int32_t aModType) const;
nsresult SetAttr(int32_t aNameSpaceID, nsIAtom* aName,
const nsAString& aValue, bool aNotify)
{
@ -66,11 +65,11 @@ public:
}
virtual nsresult SetAttr(int32_t aNameSpaceID, nsIAtom* aName,
nsIAtom* aPrefix, const nsAString& aValue,
bool aNotify) MOZ_OVERRIDE;
bool aNotify);
virtual nsresult UnsetAttr(int32_t aNameSpaceID, nsIAtom* aAttribute,
bool aNotify) MOZ_OVERRIDE;
bool aNotify);
virtual nsresult Clone(nsINodeInfo* aNodeInfo, nsINode** aResult) const MOZ_OVERRIDE;
virtual nsresult Clone(nsINodeInfo* aNodeInfo, nsINode** aResult) const;
Element* GetFormElement()
{
@ -79,7 +78,7 @@ public:
return fieldsetControl ? fieldsetControl->GetFormElement() : nullptr;
}
virtual nsIDOMNode* AsDOMNode() MOZ_OVERRIDE { return this; }
virtual nsIDOMNode* AsDOMNode() { return this; }
/**
* WebIDL Interface

41
content/html/content/src/HTMLLinkElement.h
View File

@ -6,7 +6,6 @@
#ifndef mozilla_dom_HTMLLinkElement_h
#define mozilla_dom_HTMLLinkElement_h
#include "mozilla/Attributes.h"
#include "nsGenericHTMLElement.h"
#include "nsIDOMHTMLLinkElement.h"
#include "nsILink.h"
@ -49,25 +48,25 @@ public:
NS_DECL_SIZEOF_EXCLUDING_THIS
// nsILink
NS_IMETHOD LinkAdded() MOZ_OVERRIDE;
NS_IMETHOD LinkRemoved() MOZ_OVERRIDE;
NS_IMETHOD LinkAdded();
NS_IMETHOD LinkRemoved();
// nsIDOMEventTarget
virtual nsresult PreHandleEvent(nsEventChainPreVisitor& aVisitor) MOZ_OVERRIDE;
virtual nsresult PostHandleEvent(nsEventChainPostVisitor& aVisitor) MOZ_OVERRIDE;
virtual nsresult PreHandleEvent(nsEventChainPreVisitor& aVisitor);
virtual nsresult PostHandleEvent(nsEventChainPostVisitor& aVisitor);
// nsINode
virtual nsresult Clone(nsINodeInfo* aNodeInfo, nsINode** aResult) const MOZ_OVERRIDE;
virtual nsIDOMNode* AsDOMNode() MOZ_OVERRIDE { return this; }
virtual nsresult Clone(nsINodeInfo* aNodeInfo, nsINode** aResult) const;
virtual nsIDOMNode* AsDOMNode() { return this; }
virtual JSObject* WrapNode(JSContext* aCx,
JS::Handle<JSObject*> aScope) MOZ_OVERRIDE;
// nsIContent
virtual nsresult BindToTree(nsIDocument* aDocument, nsIContent* aParent,
nsIContent* aBindingParent,
bool aCompileEventHandlers) MOZ_OVERRIDE;
bool aCompileEventHandlers);
virtual void UnbindFromTree(bool aDeep = true,
bool aNullParent = true) MOZ_OVERRIDE;
bool aNullParent = true);
nsresult SetAttr(int32_t aNameSpaceID, nsIAtom* aName,
const nsAString& aValue, bool aNotify)
{
@ -75,20 +74,20 @@ public:
}
virtual nsresult SetAttr(int32_t aNameSpaceID, nsIAtom* aName,
nsIAtom* aPrefix, const nsAString& aValue,
bool aNotify) MOZ_OVERRIDE;
bool aNotify);
virtual nsresult UnsetAttr(int32_t aNameSpaceID, nsIAtom* aAttribute,
bool aNotify) MOZ_OVERRIDE;
virtual bool IsLink(nsIURI** aURI) const MOZ_OVERRIDE;
virtual nsLinkState GetLinkState() const MOZ_OVERRIDE;
virtual already_AddRefed<nsIURI> GetHrefURI() const MOZ_OVERRIDE;
bool aNotify);
virtual bool IsLink(nsIURI** aURI) const;
virtual nsLinkState GetLinkState() const;
virtual already_AddRefed<nsIURI> GetHrefURI() const;
// Element
virtual bool ParseAttribute(int32_t aNamespaceID,
nsIAtom* aAttribute,
const nsAString& aValue,
nsAttrValue& aResult) MOZ_OVERRIDE;
virtual void GetLinkTarget(nsAString& aTarget) MOZ_OVERRIDE;
virtual nsEventStates IntrinsicState() const MOZ_OVERRIDE;
nsAttrValue& aResult);
virtual void GetLinkTarget(nsAString& aTarget);
virtual nsEventStates IntrinsicState() const;
void CreateAndDispatchEvent(nsIDocument* aDoc, const nsAString& aEventName);
@ -143,17 +142,17 @@ public:
protected:
// nsStyleLinkElement
virtual already_AddRefed<nsIURI> GetStyleSheetURL(bool* aIsInline) MOZ_OVERRIDE;
virtual already_AddRefed<nsIURI> GetStyleSheetURL(bool* aIsInline);
virtual void GetStyleSheetInfo(nsAString& aTitle,
nsAString& aType,
nsAString& aMedia,
bool* aIsScoped,
bool* aIsAlternate) MOZ_OVERRIDE;
bool* aIsAlternate);
virtual CORSMode GetCORSMode() const;
protected:
// nsGenericHTMLElement
virtual void GetItemValueText(nsAString& text) MOZ_OVERRIDE;
virtual void SetItemValueText(const nsAString& text) MOZ_OVERRIDE;
virtual void GetItemValueText(nsAString& text);
virtual void SetItemValueText(const nsAString& text);
};
} // namespace dom

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

@ -6,7 +6,6 @@
#ifndef mozilla_dom_HTMLMapElement_h
#define mozilla_dom_HTMLMapElement_h
#include "mozilla/Attributes.h"
#include "nsGenericHTMLElement.h"
#include "nsIDOMHTMLMapElement.h"
#include "nsAutoPtr.h"
@ -38,12 +37,12 @@ public:
// nsIDOMHTMLMapElement
NS_DECL_NSIDOMHTMLMAPELEMENT
virtual nsresult Clone(nsINodeInfo *aNodeInfo, nsINode **aResult) const MOZ_OVERRIDE;
virtual nsresult Clone(nsINodeInfo *aNodeInfo, nsINode **aResult) const;
NS_DECL_CYCLE_COLLECTION_CLASS_INHERITED_NO_UNLINK(HTMLMapElement,
nsGenericHTMLElement)
virtual nsIDOMNode* AsDOMNode() MOZ_OVERRIDE { return this; }
virtual nsIDOMNode* AsDOMNode() { return this; }
// XPCOM GetName is fine.
void SetName(const nsAString& aName, ErrorResult& aError)

7
content/html/content/src/HTMLMenuElement.h
View File

@ -6,7 +6,6 @@
#ifndef mozilla_dom_HTMLMenuElement_h
#define mozilla_dom_HTMLMenuElement_h
#include "mozilla/Attributes.h"
#include "nsIDOMHTMLMenuElement.h"
#include "nsIHTMLMenu.h"
#include "nsGenericHTMLElement.h"
@ -45,11 +44,11 @@ public:
virtual bool ParseAttribute(int32_t aNamespaceID,
nsIAtom* aAttribute,
const nsAString& aValue,
nsAttrValue& aResult) MOZ_OVERRIDE;
nsAttrValue& aResult);
virtual nsresult Clone(nsINodeInfo *aNodeInfo, nsINode **aResult) const MOZ_OVERRIDE;
virtual nsresult Clone(nsINodeInfo *aNodeInfo, nsINode **aResult) const;
virtual nsIDOMNode* AsDOMNode() MOZ_OVERRIDE { return this; }
virtual nsIDOMNode* AsDOMNode() { return this; }
uint8_t GetType() const { return mType; }

17
content/html/content/src/HTMLMenuItemElement.h
View File

@ -6,7 +6,6 @@
#ifndef mozilla_dom_HTMLMenuItemElement_h
#define mozilla_dom_HTMLMenuItemElement_h
#include "mozilla/Attributes.h"
#include "nsIDOMHTMLMenuItemElement.h"
#include "nsGenericHTMLElement.h"
@ -45,23 +44,23 @@ public:
// nsIDOMHTMLMenuItemElement
NS_DECL_NSIDOMHTMLMENUITEMELEMENT
virtual nsresult PreHandleEvent(nsEventChainPreVisitor& aVisitor) MOZ_OVERRIDE;
virtual nsresult PostHandleEvent(nsEventChainPostVisitor& aVisitor) MOZ_OVERRIDE;
virtual nsresult PreHandleEvent(nsEventChainPreVisitor& aVisitor);
virtual nsresult PostHandleEvent(nsEventChainPostVisitor& aVisitor);
virtual nsresult BindToTree(nsIDocument* aDocument, nsIContent* aParent,
nsIContent* aBindingParent,
bool aCompileEventHandlers) MOZ_OVERRIDE;
bool aCompileEventHandlers);
virtual bool ParseAttribute(int32_t aNamespaceID,
nsIAtom* aAttribute,
const nsAString& aValue,
nsAttrValue& aResult) MOZ_OVERRIDE;
nsAttrValue& aResult);
virtual void DoneCreatingElement() MOZ_OVERRIDE;
virtual void DoneCreatingElement();
virtual nsresult Clone(nsINodeInfo *aNodeInfo, nsINode **aResult) const MOZ_OVERRIDE;
virtual nsresult Clone(nsINodeInfo *aNodeInfo, nsINode **aResult) const;
virtual nsIDOMNode* AsDOMNode() MOZ_OVERRIDE { return this; }
virtual nsIDOMNode* AsDOMNode() { return this; }
uint8_t GetType() const { return mType; }
@ -133,7 +132,7 @@ protected:
protected:
virtual nsresult AfterSetAttr(int32_t aNamespaceID, nsIAtom* aName,
const nsAttrValue* aValue, bool aNotify) MOZ_OVERRIDE;
const nsAttrValue* aValue, bool aNotify);
void WalkRadioGroup(Visitor* aVisitor);

13
content/html/content/src/HTMLMetaElement.h
View File

@ -6,7 +6,6 @@
#ifndef mozilla_dom_HTMLMetaElement_h
#define mozilla_dom_HTMLMetaElement_h
#include "mozilla/Attributes.h"
#include "nsGenericHTMLElement.h"
#include "nsIDOMHTMLMetaElement.h"
@ -37,14 +36,14 @@ public:
virtual nsresult BindToTree(nsIDocument* aDocument, nsIContent* aParent,
nsIContent* aBindingParent,
bool aCompileEventHandlers) MOZ_OVERRIDE;
bool aCompileEventHandlers);
virtual void UnbindFromTree(bool aDeep = true,
bool aNullParent = true) MOZ_OVERRIDE;
bool aNullParent = true);
void CreateAndDispatchEvent(nsIDocument* aDoc, const nsAString& aEventName);
virtual nsresult Clone(nsINodeInfo *aNodeInfo, nsINode **aResult) const MOZ_OVERRIDE;
virtual nsresult Clone(nsINodeInfo *aNodeInfo, nsINode **aResult) const;
virtual nsIDOMNode* AsDOMNode() MOZ_OVERRIDE { return this; }
virtual nsIDOMNode* AsDOMNode() { return this; }
// XPCOM GetName is fine.
void SetName(const nsAString& aName, ErrorResult& aRv)
@ -71,8 +70,8 @@ public:
JS::Handle<JSObject*> aScope) MOZ_OVERRIDE;
protected:
virtual void GetItemValueText(nsAString& text) MOZ_OVERRIDE;
virtual void SetItemValueText(const nsAString& text) MOZ_OVERRIDE;
virtual void GetItemValueText(nsAString& text);
virtual void SetItemValueText(const nsAString& text);
};
} // namespace dom

9
content/html/content/src/HTMLMeterElement.h
View File

@ -6,7 +6,6 @@
#ifndef mozilla_dom_HTMLMeterElement_h
#define mozilla_dom_HTMLMeterElement_h
#include "mozilla/Attributes.h"
#include "nsIDOMHTMLMeterElement.h"
#include "nsGenericHTMLElement.h"
#include "nsAttrValue.h"
@ -40,14 +39,14 @@ public:
/* nsIDOMHTMLMeterElement */
NS_DECL_NSIDOMHTMLMETERELEMENT
virtual nsEventStates IntrinsicState() const MOZ_OVERRIDE;
virtual nsEventStates IntrinsicState() const;
nsresult Clone(nsINodeInfo* aNodeInfo, nsINode** aResult) const MOZ_OVERRIDE;
nsresult Clone(nsINodeInfo* aNodeInfo, nsINode** aResult) const;
bool ParseAttribute(int32_t aNamespaceID, nsIAtom* aAttribute,
const nsAString& aValue, nsAttrValue& aResult) MOZ_OVERRIDE;
const nsAString& aValue, nsAttrValue& aResult);
virtual nsIDOMNode* AsDOMNode() MOZ_OVERRIDE { return this; }
virtual nsIDOMNode* AsDOMNode() { return this; }
// WebIDL

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

@ -6,7 +6,6 @@
#ifndef mozilla_dom_HTMLModElement_h
#define mozilla_dom_HTMLModElement_h
#include "mozilla/Attributes.h"
#include "nsGenericHTMLElement.h"
#include "nsIDOMHTMLModElement.h"
#include "nsGkAtoms.h"
@ -36,9 +35,9 @@ public:
// nsIDOMHTMLModElement
NS_DECL_NSIDOMHTMLMODELEMENT
virtual nsresult Clone(nsINodeInfo *aNodeInfo, nsINode **aResult) const MOZ_OVERRIDE;
virtual nsresult Clone(nsINodeInfo *aNodeInfo, nsINode **aResult) const;
virtual nsIDOMNode* AsDOMNode() MOZ_OVERRIDE { return this; }
virtual nsIDOMNode* AsDOMNode() { return this; }
void GetCite(nsString& aCite)
{

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

@ -7,7 +7,6 @@
#ifndef mozilla_dom_HTMLObjectElement_h
#define mozilla_dom_HTMLObjectElement_h
#include "mozilla/Attributes.h"
#include "nsGenericHTMLElement.h"
#include "nsObjectLoadingContent.h"
#include "nsIDOMHTMLObjectElement.h"
@ -50,45 +49,45 @@ public:
virtual nsresult BindToTree(nsIDocument *aDocument, nsIContent *aParent,
nsIContent *aBindingParent,
bool aCompileEventHandlers) MOZ_OVERRIDE;
bool aCompileEventHandlers);
virtual void UnbindFromTree(bool aDeep = true,
bool aNullParent = true) MOZ_OVERRIDE;
bool aNullParent = true);
virtual nsresult SetAttr(int32_t aNameSpaceID, nsIAtom *aName,
nsIAtom *aPrefix, const nsAString &aValue,
bool aNotify) MOZ_OVERRIDE;
bool aNotify);
virtual nsresult UnsetAttr(int32_t aNameSpaceID, nsIAtom* aAttribute,
bool aNotify) MOZ_OVERRIDE;
bool aNotify);
virtual bool IsHTMLFocusable(bool aWithMouse, bool *aIsFocusable, int32_t *aTabIndex) MOZ_OVERRIDE;
virtual IMEState GetDesiredIMEState() MOZ_OVERRIDE;
virtual bool IsHTMLFocusable(bool aWithMouse, bool *aIsFocusable, int32_t *aTabIndex);
virtual IMEState GetDesiredIMEState();
// Overriden nsIFormControl methods
NS_IMETHOD_(uint32_t) GetType() const MOZ_OVERRIDE
NS_IMETHOD_(uint32_t) GetType() const
{
return NS_FORM_OBJECT;
}
NS_IMETHOD Reset() MOZ_OVERRIDE;
NS_IMETHOD SubmitNamesValues(nsFormSubmission *aFormSubmission) MOZ_OVERRIDE;
NS_IMETHOD Reset();
NS_IMETHOD SubmitNamesValues(nsFormSubmission *aFormSubmission);
virtual bool IsDisabled() const MOZ_OVERRIDE { return false; }
virtual bool IsDisabled() const { return false; }
virtual void DoneAddingChildren(bool aHaveNotified) MOZ_OVERRIDE;
virtual bool IsDoneAddingChildren() MOZ_OVERRIDE;
virtual void DoneAddingChildren(bool aHaveNotified);
virtual bool IsDoneAddingChildren();
virtual bool ParseAttribute(int32_t aNamespaceID,
nsIAtom *aAttribute,
const nsAString &aValue,
nsAttrValue &aResult) MOZ_OVERRIDE;
virtual nsMapRuleToAttributesFunc GetAttributeMappingFunction() const MOZ_OVERRIDE;
NS_IMETHOD_(bool) IsAttributeMapped(const nsIAtom *aAttribute) const MOZ_OVERRIDE;
virtual nsEventStates IntrinsicState() const MOZ_OVERRIDE;
virtual void DestroyContent() MOZ_OVERRIDE;
nsAttrValue &aResult);
virtual nsMapRuleToAttributesFunc GetAttributeMappingFunction() const;
NS_IMETHOD_(bool) IsAttributeMapped(const nsIAtom *aAttribute) const;
virtual nsEventStates IntrinsicState() const;
virtual void DestroyContent();
// nsObjectLoadingContent
virtual uint32_t GetCapabilities() const MOZ_OVERRIDE;
virtual uint32_t GetCapabilities() const;
virtual nsresult Clone(nsINodeInfo *aNodeInfo, nsINode **aResult) const MOZ_OVERRIDE;
virtual nsresult Clone(nsINodeInfo *aNodeInfo, nsINode **aResult) const;
nsresult CopyInnerTo(Element* aDest);
@ -97,7 +96,7 @@ public:
NS_DECL_CYCLE_COLLECTION_CLASS_INHERITED(HTMLObjectElement,
nsGenericHTMLFormElement)
virtual nsIDOMNode* AsDOMNode() MOZ_OVERRIDE { return this; }
virtual nsIDOMNode* AsDOMNode() { return this; }
// Web IDL binding methods
// XPCOM GetData is ok; note that it's a URI attribute with a weird base URI
@ -241,8 +240,8 @@ private:
*/
bool IsFocusableForTabIndex();
virtual void GetItemValueText(nsAString& text) MOZ_OVERRIDE;
virtual void SetItemValueText(const nsAString& text) MOZ_OVERRIDE;
virtual void GetItemValueText(nsAString& text);
virtual void SetItemValueText(const nsAString& text);
virtual JSObject* WrapNode(JSContext *aCx,
JS::Handle<JSObject*> aScope) MOZ_OVERRIDE;

17
content/html/content/src/HTMLOptGroupElement.h
View File

@ -6,7 +6,6 @@
#ifndef mozilla_dom_HTMLOptGroupElement_h
#define mozilla_dom_HTMLOptGroupElement_h
#include "mozilla/Attributes.h"
#include "nsIDOMHTMLOptGroupElement.h"
#include "nsGenericHTMLElement.h"
@ -37,22 +36,22 @@ public:
// nsINode
virtual nsresult InsertChildAt(nsIContent* aKid, uint32_t aIndex,
bool aNotify) MOZ_OVERRIDE;
virtual void RemoveChildAt(uint32_t aIndex, bool aNotify) MOZ_OVERRIDE;
bool aNotify);
virtual void RemoveChildAt(uint32_t aIndex, bool aNotify);
// nsIContent
virtual nsresult PreHandleEvent(nsEventChainPreVisitor& aVisitor) MOZ_OVERRIDE;
virtual nsresult PreHandleEvent(nsEventChainPreVisitor& aVisitor);
virtual nsEventStates IntrinsicState() const MOZ_OVERRIDE;
virtual nsEventStates IntrinsicState() const;
virtual nsresult Clone(nsINodeInfo* aNodeInfo, nsINode** aResult) const MOZ_OVERRIDE;
virtual nsresult Clone(nsINodeInfo* aNodeInfo, nsINode** aResult) const;
virtual nsresult AfterSetAttr(int32_t aNameSpaceID, nsIAtom* aName,
const nsAttrValue* aValue, bool aNotify) MOZ_OVERRIDE;
const nsAttrValue* aValue, bool aNotify);
virtual nsIDOMNode* AsDOMNode() MOZ_OVERRIDE { return this; }
virtual nsIDOMNode* AsDOMNode() { return this; }
virtual bool IsDisabled() const MOZ_OVERRIDE {
virtual bool IsDisabled() const {
return HasAttr(kNameSpaceID_None, nsGkAtoms::disabled);
}

17
content/html/content/src/HTMLOptionElement.h
View File

@ -7,7 +7,6 @@
#ifndef mozilla_dom_HTMLOptionElement_h__
#define mozilla_dom_HTMLOptionElement_h__
#include "mozilla/Attributes.h"
#include "nsGenericHTMLElement.h"
#include "nsIDOMHTMLOptionElement.h"
#include "nsIJSNativeInitializer.h"
@ -54,30 +53,30 @@ public:
bool DefaultSelected() const;
virtual nsChangeHint GetAttributeChangeHint(const nsIAtom* aAttribute,
int32_t aModType) const MOZ_OVERRIDE;
int32_t aModType) const;
virtual nsresult BeforeSetAttr(int32_t aNamespaceID, nsIAtom* aName,
const nsAttrValueOrString* aValue,
bool aNotify) MOZ_OVERRIDE;
bool aNotify);
void SetSelectedInternal(bool aValue, bool aNotify);
virtual nsresult BindToTree(nsIDocument* aDocument, nsIContent* aParent,
nsIContent* aBindingParent,
bool aCompileEventHandlers) MOZ_OVERRIDE;
bool aCompileEventHandlers);
virtual void UnbindFromTree(bool aDeep = true,
bool aNullParent = true) MOZ_OVERRIDE;
bool aNullParent = true);
// nsIContent
virtual nsEventStates IntrinsicState() const MOZ_OVERRIDE;
virtual nsEventStates IntrinsicState() const;
virtual nsresult Clone(nsINodeInfo* aNodeInfo, nsINode** aResult) const MOZ_OVERRIDE;
virtual nsresult Clone(nsINodeInfo* aNodeInfo, nsINode** aResult) const;
nsresult CopyInnerTo(mozilla::dom::Element* aDest);
virtual nsIDOMNode* AsDOMNode() MOZ_OVERRIDE { return this; }
virtual nsIDOMNode* AsDOMNode() { return this; }
virtual bool IsDisabled() const MOZ_OVERRIDE {
virtual bool IsDisabled() const {
return HasAttr(kNameSpaceID_None, nsGkAtoms::disabled);
}

7
content/html/content/src/HTMLOptionsCollection.h
View File

@ -5,7 +5,6 @@
#ifndef mozilla_dom_HTMLOptionsCollection_h
#define mozilla_dom_HTMLOptionsCollection_h
#include "mozilla/Attributes.h"
#include "nsIHTMLCollection.h"
#include "nsIDOMHTMLOptionsCollection.h"
#include "nsWrapperCache.h"
@ -52,7 +51,7 @@ public:
// nsIDOMHTMLOptionsCollection
virtual Element* GetElementAt(uint32_t aIndex);
virtual nsINode* GetParentObject() MOZ_OVERRIDE;
virtual nsINode* GetParentObject();
NS_DECL_CYCLE_COLLECTION_SCRIPT_HOLDER_CLASS_AMBIGUOUS(HTMLOptionsCollection,
nsIHTMLCollection)
@ -123,7 +122,7 @@ public:
int32_t* aIndex);
virtual JSObject* NamedItem(JSContext* aCx, const nsAString& aName,
ErrorResult& error) MOZ_OVERRIDE;
ErrorResult& error);
void Add(const HTMLOptionOrOptGroupElement& aElement,
const Nullable<HTMLElementOrLong>& aBefore,
@ -136,7 +135,7 @@ public:
{
aError = SetOption(aIndex, aOption);
}
virtual void GetSupportedNames(nsTArray<nsString>& aNames) MOZ_OVERRIDE;
virtual void GetSupportedNames(nsTArray<nsString>& aNames);
private:
/** The list of options (holds strong references). This is infallible, so

17
content/html/content/src/HTMLOutputElement.h
View File

@ -6,7 +6,6 @@
#ifndef mozilla_dom_HTMLOutputElement_h
#define mozilla_dom_HTMLOutputElement_h
#include "mozilla/Attributes.h"
#include "nsGenericHTMLElement.h"
#include "nsIDOMHTMLOutputElement.h"
#include "nsStubMutationObserver.h"
@ -43,21 +42,21 @@ public:
// nsIFormControl
NS_IMETHOD_(uint32_t) GetType() const { return NS_FORM_OUTPUT; }
NS_IMETHOD Reset() MOZ_OVERRIDE;
NS_IMETHOD SubmitNamesValues(nsFormSubmission* aFormSubmission) MOZ_OVERRIDE;
NS_IMETHOD Reset();
NS_IMETHOD SubmitNamesValues(nsFormSubmission* aFormSubmission);
virtual bool IsDisabled() const MOZ_OVERRIDE { return false; }
virtual bool IsDisabled() const { return false; }
nsresult Clone(nsINodeInfo* aNodeInfo, nsINode** aResult) const MOZ_OVERRIDE;
nsresult Clone(nsINodeInfo* aNodeInfo, nsINode** aResult) const;
bool ParseAttribute(int32_t aNamespaceID, nsIAtom* aAttribute,
const nsAString& aValue, nsAttrValue& aResult) MOZ_OVERRIDE;
const nsAString& aValue, nsAttrValue& aResult);
nsEventStates IntrinsicState() const MOZ_OVERRIDE;
nsEventStates IntrinsicState() const;
virtual nsresult BindToTree(nsIDocument* aDocument, nsIContent* aParent,
nsIContent* aBindingParent,
bool aCompileEventHandlers) MOZ_OVERRIDE;
bool aCompileEventHandlers);
// This function is called when a callback function from nsIMutationObserver
// has to be used to update the defaultValue attribute.
@ -72,7 +71,7 @@ public:
NS_DECL_CYCLE_COLLECTION_CLASS_INHERITED(HTMLOutputElement,
nsGenericHTMLFormElement)
virtual nsIDOMNode* AsDOMNode() MOZ_OVERRIDE { return this; }
virtual nsIDOMNode* AsDOMNode() { return this; }
virtual JSObject* WrapNode(JSContext* aCx,
JS::Handle<JSObject*> aScope) MOZ_OVERRIDE;

11
content/html/content/src/HTMLParagraphElement.h
View File

@ -6,7 +6,6 @@
#ifndef mozilla_dom_HTMLParagraphElement_h
#define mozilla_dom_HTMLParagraphElement_h
#include "mozilla/Attributes.h"
#include "mozilla/Util.h"
#include "nsIDOMHTMLParagraphElement.h"
@ -44,13 +43,13 @@ public:
virtual bool ParseAttribute(int32_t aNamespaceID,
nsIAtom* aAttribute,
const nsAString& aValue,
nsAttrValue& aResult) MOZ_OVERRIDE;
NS_IMETHOD_(bool) IsAttributeMapped(const nsIAtom* aAttribute) const MOZ_OVERRIDE;
virtual nsMapRuleToAttributesFunc GetAttributeMappingFunction() const MOZ_OVERRIDE;
nsAttrValue& aResult);
NS_IMETHOD_(bool) IsAttributeMapped(const nsIAtom* aAttribute) const;
virtual nsMapRuleToAttributesFunc GetAttributeMappingFunction() const;
virtual nsresult Clone(nsINodeInfo *aNodeInfo, nsINode **aResult) const MOZ_OVERRIDE;
virtual nsresult Clone(nsINodeInfo *aNodeInfo, nsINode **aResult) const;
virtual nsIDOMNode* AsDOMNode() MOZ_OVERRIDE { return this; }
virtual nsIDOMNode* AsDOMNode() { return this; }
// WebIDL API
// The XPCOM GetAlign is fine for our purposes

15
content/html/content/src/HTMLPreElement.h
View File

@ -6,7 +6,6 @@
#ifndef mozilla_dom_HTMLPreElement_h
#define mozilla_dom_HTMLPreElement_h
#include "mozilla/Attributes.h"
#include "mozilla/Util.h"
#include "nsIDOMHTMLPreElement.h"
@ -39,19 +38,19 @@ public:
NS_FORWARD_NSIDOMHTMLELEMENT_TO_GENERIC
// nsIDOMHTMLPreElement
NS_IMETHOD GetWidth(int32_t* aWidth) MOZ_OVERRIDE;
NS_IMETHOD SetWidth(int32_t aWidth) MOZ_OVERRIDE;
NS_IMETHOD GetWidth(int32_t* aWidth);
NS_IMETHOD SetWidth(int32_t aWidth);
virtual bool ParseAttribute(int32_t aNamespaceID,
nsIAtom* aAttribute,
const nsAString& aValue,
nsAttrValue& aResult) MOZ_OVERRIDE;
NS_IMETHOD_(bool) IsAttributeMapped(const nsIAtom* aAttribute) const MOZ_OVERRIDE;
virtual nsMapRuleToAttributesFunc GetAttributeMappingFunction() const MOZ_OVERRIDE;
nsAttrValue& aResult);
NS_IMETHOD_(bool) IsAttributeMapped(const nsIAtom* aAttribute) const;
virtual nsMapRuleToAttributesFunc GetAttributeMappingFunction() const;
virtual nsresult Clone(nsINodeInfo *aNodeInfo, nsINode **aResult) const MOZ_OVERRIDE;
virtual nsresult Clone(nsINodeInfo *aNodeInfo, nsINode **aResult) const;
virtual nsIDOMNode* AsDOMNode() MOZ_OVERRIDE { return this; }
virtual nsIDOMNode* AsDOMNode() { return this; }
// WebIDL API
int32_t Width() const

9
content/html/content/src/HTMLProgressElement.h
View File

@ -6,7 +6,6 @@
#ifndef mozilla_dom_HTMLProgressElement_h
#define mozilla_dom_HTMLProgressElement_h
#include "mozilla/Attributes.h"
#include "nsIDOMHTMLProgressElement.h"
#include "nsGenericHTMLElement.h"
#include "nsAttrValue.h"
@ -39,14 +38,14 @@ public:
// nsIDOMHTMLProgressElement
NS_DECL_NSIDOMHTMLPROGRESSELEMENT
nsEventStates IntrinsicState() const MOZ_OVERRIDE;
nsEventStates IntrinsicState() const;
nsresult Clone(nsINodeInfo* aNodeInfo, nsINode** aResult) const MOZ_OVERRIDE;
nsresult Clone(nsINodeInfo* aNodeInfo, nsINode** aResult) const;
bool ParseAttribute(int32_t aNamespaceID, nsIAtom* aAttribute,
const nsAString& aValue, nsAttrValue& aResult) MOZ_OVERRIDE;
const nsAString& aValue, nsAttrValue& aResult);
virtual nsIDOMNode* AsDOMNode() MOZ_OVERRIDE { return this; }
virtual nsIDOMNode* AsDOMNode() { return this; }
// WebIDL
double Value() const;

13
content/html/content/src/HTMLPropertiesCollection.h
View File

@ -7,7 +7,6 @@
#ifndef HTMLPropertiesCollection_h_
#define HTMLPropertiesCollection_h_
#include "mozilla/Attributes.h"
#include "nsDOMLists.h"
#include "nsCycleCollectionParticipant.h"
#include "nsAutoPtr.h"
@ -63,9 +62,9 @@ public:
virtual Element* GetElementAt(uint32_t aIndex);
void SetDocument(nsIDocument* aDocument);
nsINode* GetParentObject() MOZ_OVERRIDE;
nsINode* GetParentObject();
virtual JSObject* NamedItem(JSContext* cx, const nsAString& name,
mozilla::ErrorResult& error) MOZ_OVERRIDE;
mozilla::ErrorResult& error);
PropertyNodeList* NamedItem(const nsAString& aName);
PropertyNodeList* NamedGetter(const nsAString& aName, bool& aFound)
{
@ -77,7 +76,7 @@ public:
EnsureFresh();
return mNames;
}
virtual void GetSupportedNames(nsTArray<nsString>& aNames) MOZ_OVERRIDE;
virtual void GetSupportedNames(nsTArray<nsString>& aNames);
NS_DECL_NSIDOMHTMLCOLLECTION
@ -142,7 +141,7 @@ public:
void GetValues(JSContext* aCx, nsTArray<JS::Value >& aResult,
ErrorResult& aError);
virtual nsIContent* Item(uint32_t aIndex) MOZ_OVERRIDE;
virtual nsIContent* Item(uint32_t aIndex);
NS_DECL_CYCLE_COLLECTING_ISUPPORTS
@ -156,8 +155,8 @@ public:
NS_DECL_NSIMUTATIONOBSERVER_CONTENTREMOVED
// nsINodeList interface
virtual int32_t IndexOf(nsIContent* aContent) MOZ_OVERRIDE;
virtual nsINode* GetParentObject() MOZ_OVERRIDE;
virtual int32_t IndexOf(nsIContent* aContent);
virtual nsINode* GetParentObject();
void AppendElement(nsGenericHTMLElement* aElement)
{

20
content/html/content/src/HTMLScriptElement.h
View File

@ -48,28 +48,28 @@ public:
NS_DECL_NSIDOMHTMLSCRIPTELEMENT
// nsIScriptElement
virtual void GetScriptType(nsAString& type) MOZ_OVERRIDE;
virtual void GetScriptText(nsAString& text) MOZ_OVERRIDE;
virtual void GetScriptCharset(nsAString& charset) MOZ_OVERRIDE;
virtual void FreezeUriAsyncDefer() MOZ_OVERRIDE;
virtual void GetScriptType(nsAString& type);
virtual void GetScriptText(nsAString& text);
virtual void GetScriptCharset(nsAString& charset);
virtual void FreezeUriAsyncDefer();
virtual CORSMode GetCORSMode() const;
// nsIContent
virtual nsresult BindToTree(nsIDocument* aDocument, nsIContent* aParent,
nsIContent* aBindingParent,
bool aCompileEventHandlers) MOZ_OVERRIDE;
bool aCompileEventHandlers);
virtual bool ParseAttribute(int32_t aNamespaceID,
nsIAtom* aAttribute,
const nsAString& aValue,
nsAttrValue& aResult) MOZ_OVERRIDE;
nsAttrValue& aResult);
virtual nsresult Clone(nsINodeInfo *aNodeInfo, nsINode **aResult) const MOZ_OVERRIDE;
virtual nsresult Clone(nsINodeInfo *aNodeInfo, nsINode **aResult) const;
// Element
virtual nsresult AfterSetAttr(int32_t aNamespaceID, nsIAtom* aName,
const nsAttrValue* aValue, bool aNotify) MOZ_OVERRIDE;
const nsAttrValue* aValue, bool aNotify);
virtual nsIDOMNode* AsDOMNode() MOZ_OVERRIDE { return this; }
virtual nsIDOMNode* AsDOMNode() { return this; }
// WebIDL
void SetText(const nsAString& aValue, ErrorResult& rv);
@ -88,7 +88,7 @@ protected:
virtual JSObject* WrapNode(JSContext *aCx,
JS::Handle<JSObject*> aScope) MOZ_OVERRIDE;
// nsScriptElement
virtual bool HasScriptContent() MOZ_OVERRIDE;
virtual bool HasScriptContent();
};
} // namespace dom

55
content/html/content/src/HTMLSelectElement.h
View File

@ -5,7 +5,6 @@
#ifndef mozilla_dom_HTMLSelectElement_h
#define mozilla_dom_HTMLSelectElement_h
#include "mozilla/Attributes.h"
#include "nsGenericHTMLElement.h"
#include "nsIDOMHTMLSelectElement.h"
#include "nsIConstraintValidation.h"
@ -247,25 +246,25 @@ public:
JS::Handle<JSObject*> aScope) MOZ_OVERRIDE;
// nsIContent
virtual nsresult PreHandleEvent(nsEventChainPreVisitor& aVisitor) MOZ_OVERRIDE;
virtual nsresult PostHandleEvent(nsEventChainPostVisitor& aVisitor) MOZ_OVERRIDE;
virtual nsresult PreHandleEvent(nsEventChainPreVisitor& aVisitor);
virtual nsresult PostHandleEvent(nsEventChainPostVisitor& aVisitor);
virtual bool IsHTMLFocusable(bool aWithMouse, bool* aIsFocusable, int32_t* aTabIndex) MOZ_OVERRIDE;
virtual bool IsHTMLFocusable(bool aWithMouse, bool* aIsFocusable, int32_t* aTabIndex);
virtual nsresult InsertChildAt(nsIContent* aKid, uint32_t aIndex,
bool aNotify) MOZ_OVERRIDE;
virtual void RemoveChildAt(uint32_t aIndex, bool aNotify) MOZ_OVERRIDE;
bool aNotify);
virtual void RemoveChildAt(uint32_t aIndex, bool aNotify);
// Overriden nsIFormControl methods
NS_IMETHOD_(uint32_t) GetType() const MOZ_OVERRIDE { return NS_FORM_SELECT; }
NS_IMETHOD Reset() MOZ_OVERRIDE;
NS_IMETHOD SubmitNamesValues(nsFormSubmission* aFormSubmission) MOZ_OVERRIDE;
NS_IMETHOD SaveState() MOZ_OVERRIDE;
virtual bool RestoreState(nsPresState* aState) MOZ_OVERRIDE;
virtual bool IsDisabledForEvents(uint32_t aMessage) MOZ_OVERRIDE;
NS_IMETHOD_(uint32_t) GetType() const { return NS_FORM_SELECT; }
NS_IMETHOD Reset();
NS_IMETHOD SubmitNamesValues(nsFormSubmission* aFormSubmission);
NS_IMETHOD SaveState();
virtual bool RestoreState(nsPresState* aState);
virtual bool IsDisabledForEvents(uint32_t aMessage);
virtual void FieldSetDisabledChanged(bool aNotify) MOZ_OVERRIDE;
virtual void FieldSetDisabledChanged(bool aNotify);
nsEventStates IntrinsicState() const MOZ_OVERRIDE;
nsEventStates IntrinsicState() const;
/**
* To be called when stuff is added under a child of the select--but *before*
@ -346,31 +345,31 @@ public:
*/
virtual nsresult BindToTree(nsIDocument* aDocument, nsIContent* aParent,
nsIContent* aBindingParent,
bool aCompileEventHandlers) MOZ_OVERRIDE;
virtual void UnbindFromTree(bool aDeep, bool aNullParent) MOZ_OVERRIDE;
bool aCompileEventHandlers);
virtual void UnbindFromTree(bool aDeep, bool aNullParent);
virtual nsresult BeforeSetAttr(int32_t aNameSpaceID, nsIAtom* aName,
const nsAttrValueOrString* aValue,
bool aNotify) MOZ_OVERRIDE;
bool aNotify);
virtual nsresult AfterSetAttr(int32_t aNameSpaceID, nsIAtom* aName,
const nsAttrValue* aValue, bool aNotify) MOZ_OVERRIDE;
const nsAttrValue* aValue, bool aNotify);
virtual nsresult UnsetAttr(int32_t aNameSpaceID, nsIAtom* aAttribute,
bool aNotify) MOZ_OVERRIDE;
bool aNotify);
virtual void DoneAddingChildren(bool aHaveNotified) MOZ_OVERRIDE;
virtual bool IsDoneAddingChildren() MOZ_OVERRIDE {
virtual void DoneAddingChildren(bool aHaveNotified);
virtual bool IsDoneAddingChildren() {
return mIsDoneAddingChildren;
}
virtual bool ParseAttribute(int32_t aNamespaceID,
nsIAtom* aAttribute,
const nsAString& aValue,
nsAttrValue& aResult) MOZ_OVERRIDE;
virtual nsMapRuleToAttributesFunc GetAttributeMappingFunction() const MOZ_OVERRIDE;
nsAttrValue& aResult);
virtual nsMapRuleToAttributesFunc GetAttributeMappingFunction() const;
virtual nsChangeHint GetAttributeChangeHint(const nsIAtom* aAttribute,
int32_t aModType) const MOZ_OVERRIDE;
NS_IMETHOD_(bool) IsAttributeMapped(const nsIAtom* aAttribute) const MOZ_OVERRIDE;
int32_t aModType) const;
NS_IMETHOD_(bool) IsAttributeMapped(const nsIAtom* aAttribute) const;
virtual nsresult Clone(nsINodeInfo* aNodeInfo, nsINode** aResult) const MOZ_OVERRIDE;
virtual nsresult Clone(nsINodeInfo* aNodeInfo, nsINode** aResult) const;
NS_DECL_CYCLE_COLLECTION_CLASS_INHERITED(HTMLSelectElement,
nsGenericHTMLFormElement)
@ -380,11 +379,11 @@ public:
return mOptions;
}
virtual nsIDOMNode* AsDOMNode() MOZ_OVERRIDE { return this; }
virtual nsIDOMNode* AsDOMNode() { return this; }
// nsIConstraintValidation
nsresult GetValidationMessage(nsAString& aValidationMessage,
ValidityStateType aType) MOZ_OVERRIDE;
ValidityStateType aType);
/**
* Insert aElement before the node given by aBefore

18
content/html/content/src/HTMLSharedElement.h
View File

@ -72,7 +72,7 @@ public:
virtual bool ParseAttribute(int32_t aNamespaceID,
nsIAtom* aAttribute,
const nsAString& aValue,
nsAttrValue& aResult) MOZ_OVERRIDE;
nsAttrValue& aResult);
nsresult SetAttr(int32_t aNameSpaceID, nsIAtom* aName,
const nsAString& aValue, bool aNotify)
{
@ -80,24 +80,24 @@ public:
}
virtual nsresult SetAttr(int32_t aNameSpaceID, nsIAtom* aName,
nsIAtom* aPrefix, const nsAString& aValue,
bool aNotify) MOZ_OVERRIDE;
bool aNotify);
virtual nsresult UnsetAttr(int32_t aNameSpaceID, nsIAtom* aName,
bool aNotify) MOZ_OVERRIDE;
bool aNotify);
virtual nsresult BindToTree(nsIDocument* aDocument, nsIContent* aParent,
nsIContent* aBindingParent,
bool aCompileEventHandlers) MOZ_OVERRIDE;
bool aCompileEventHandlers);
virtual void UnbindFromTree(bool aDeep = true,
bool aNullParent = true) MOZ_OVERRIDE;
bool aNullParent = true);
virtual nsMapRuleToAttributesFunc GetAttributeMappingFunction() const MOZ_OVERRIDE;
NS_IMETHOD_(bool) IsAttributeMapped(const nsIAtom* aAttribute) const MOZ_OVERRIDE;
virtual nsMapRuleToAttributesFunc GetAttributeMappingFunction() const;
NS_IMETHOD_(bool) IsAttributeMapped(const nsIAtom* aAttribute) const;
virtual nsresult Clone(nsINodeInfo *aNodeInfo, nsINode **aResult) const MOZ_OVERRIDE;
virtual nsresult Clone(nsINodeInfo *aNodeInfo, nsINode **aResult) const;
virtual nsIDOMNode* AsDOMNode() MOZ_OVERRIDE
virtual nsIDOMNode* AsDOMNode()
{
return static_cast<nsIDOMHTMLParamElement*>(this);
}

9
content/html/content/src/HTMLSharedListElement.h
View File

@ -5,7 +5,6 @@
#ifndef mozilla_dom_HTMLSharedListElement_h
#define mozilla_dom_HTMLSharedListElement_h
#include "mozilla/Attributes.h"
#include "mozilla/Util.h"
#include "nsIDOMHTMLOListElement.h"
@ -53,12 +52,12 @@ public:
virtual bool ParseAttribute(int32_t aNamespaceID,
nsIAtom* aAttribute,
const nsAString& aValue,
nsAttrValue& aResult) MOZ_OVERRIDE;
virtual nsMapRuleToAttributesFunc GetAttributeMappingFunction() const MOZ_OVERRIDE;
NS_IMETHOD_(bool) IsAttributeMapped(const nsIAtom* aAttribute) const MOZ_OVERRIDE;
nsAttrValue& aResult);
virtual nsMapRuleToAttributesFunc GetAttributeMappingFunction() const;
NS_IMETHOD_(bool) IsAttributeMapped(const nsIAtom* aAttribute) const;
virtual nsresult Clone(nsINodeInfo *aNodeInfo, nsINode **aResult) const MOZ_OVERRIDE;
virtual nsIDOMNode* AsDOMNode() MOZ_OVERRIDE
virtual nsIDOMNode* AsDOMNode()
{
return static_cast<nsIDOMHTMLOListElement*>(this);
}

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

@ -7,7 +7,6 @@
#ifndef mozilla_dom_HTMLSharedObjectElement_h
#define mozilla_dom_HTMLSharedObjectElement_h
#include "mozilla/Attributes.h"
#include "nsGenericHTMLElement.h"
#include "nsObjectLoadingContent.h"
#include "nsGkAtoms.h"
@ -51,42 +50,42 @@ public:
// NS_DECL_NSIDOMHTMLAPPLETELEMENT.
// nsIDOMHTMLEmbedElement
NS_IMETHOD GetSrc(nsAString &aSrc) MOZ_OVERRIDE;
NS_IMETHOD SetSrc(const nsAString &aSrc) MOZ_OVERRIDE;
NS_IMETHOD GetType(nsAString &aType) MOZ_OVERRIDE;
NS_IMETHOD SetType(const nsAString &aType) MOZ_OVERRIDE;
NS_IMETHOD GetSrc(nsAString &aSrc);
NS_IMETHOD SetSrc(const nsAString &aSrc);
NS_IMETHOD GetType(nsAString &aType);
NS_IMETHOD SetType(const nsAString &aType);
// nsIDOMGetSVGDocument
NS_DECL_NSIDOMGETSVGDOCUMENT
virtual nsresult BindToTree(nsIDocument *aDocument, nsIContent *aParent,
nsIContent *aBindingParent,
bool aCompileEventHandlers) MOZ_OVERRIDE;
bool aCompileEventHandlers);
virtual void UnbindFromTree(bool aDeep = true,
bool aNullParent = true) MOZ_OVERRIDE;
bool aNullParent = true);
virtual nsresult SetAttr(int32_t aNameSpaceID, nsIAtom *aName,
nsIAtom *aPrefix, const nsAString &aValue,
bool aNotify) MOZ_OVERRIDE;
bool aNotify);
virtual bool IsHTMLFocusable(bool aWithMouse, bool *aIsFocusable, int32_t *aTabIndex) MOZ_OVERRIDE;
virtual IMEState GetDesiredIMEState() MOZ_OVERRIDE;
virtual bool IsHTMLFocusable(bool aWithMouse, bool *aIsFocusable, int32_t *aTabIndex);
virtual IMEState GetDesiredIMEState();
virtual void DoneAddingChildren(bool aHaveNotified) MOZ_OVERRIDE;
virtual bool IsDoneAddingChildren() MOZ_OVERRIDE;
virtual void DoneAddingChildren(bool aHaveNotified);
virtual bool IsDoneAddingChildren();
virtual bool ParseAttribute(int32_t aNamespaceID,
nsIAtom *aAttribute,
const nsAString &aValue,
nsAttrValue &aResult) MOZ_OVERRIDE;
virtual nsMapRuleToAttributesFunc GetAttributeMappingFunction() const MOZ_OVERRIDE;
NS_IMETHOD_(bool) IsAttributeMapped(const nsIAtom *aAttribute) const MOZ_OVERRIDE;
virtual nsEventStates IntrinsicState() const MOZ_OVERRIDE;
virtual void DestroyContent() MOZ_OVERRIDE;
nsAttrValue &aResult);
virtual nsMapRuleToAttributesFunc GetAttributeMappingFunction() const;
NS_IMETHOD_(bool) IsAttributeMapped(const nsIAtom *aAttribute) const;
virtual nsEventStates IntrinsicState() const;
virtual void DestroyContent();
// nsObjectLoadingContent
virtual uint32_t GetCapabilities() const MOZ_OVERRIDE;
virtual uint32_t GetCapabilities() const;
virtual nsresult Clone(nsINodeInfo *aNodeInfo, nsINode **aResult) const MOZ_OVERRIDE;
virtual nsresult Clone(nsINodeInfo *aNodeInfo, nsINode **aResult) const;
nsresult CopyInnerTo(Element* aDest);
@ -95,7 +94,7 @@ public:
NS_DECL_CYCLE_COLLECTION_CLASS_INHERITED_NO_UNLINK(HTMLSharedObjectElement,
nsGenericHTMLElement)
virtual nsIDOMNode* AsDOMNode() MOZ_OVERRIDE
virtual nsIDOMNode* AsDOMNode()
{
return static_cast<nsIDOMHTMLAppletElement*>(this);
}
@ -237,8 +236,8 @@ private:
// always true for <embed>, per the documentation in nsIContent.h.
bool mIsDoneAddingChildren;
virtual void GetItemValueText(nsAString& text) MOZ_OVERRIDE;
virtual void SetItemValueText(const nsAString& text) MOZ_OVERRIDE;
virtual void GetItemValueText(nsAString& text);
virtual void SetItemValueText(const nsAString& text);
virtual JSObject* WrapNode(JSContext *aCx,
JS::Handle<JSObject*> aScope) MOZ_OVERRIDE;

11
content/html/content/src/HTMLSourceElement.h
View File

@ -7,7 +7,6 @@
#ifndef mozilla_dom_HTMLSourceElement_h
#define mozilla_dom_HTMLSourceElement_h
#include "mozilla/Attributes.h"
#include "nsIDOMHTMLSourceElement.h"
#include "nsGenericHTMLElement.h"
#include "mozilla/dom/HTMLMediaElement.h"
@ -37,15 +36,15 @@ public:
// nsIDOMHTMLSourceElement
NS_DECL_NSIDOMHTMLSOURCEELEMENT
virtual nsresult Clone(nsINodeInfo* aNodeInfo, nsINode** aResult) const MOZ_OVERRIDE;
virtual nsresult Clone(nsINodeInfo* aNodeInfo, nsINode** aResult) const;
// Override BindToTree() so that we can trigger a load when we add a
// child source element.
virtual nsresult BindToTree(nsIDocument* aDocument, nsIContent* aParent,
nsIContent* aBindingParent,
bool aCompileEventHandlers) MOZ_OVERRIDE;
bool aCompileEventHandlers);
virtual nsIDOMNode* AsDOMNode() MOZ_OVERRIDE { return this; }
virtual nsIDOMNode* AsDOMNode() { return this; }
// WebIDL
void GetSrc(nsString& aSrc)
@ -80,8 +79,8 @@ protected:
JS::Handle<JSObject*> aScope) MOZ_OVERRIDE;
protected:
virtual void GetItemValueText(nsAString& text) MOZ_OVERRIDE;
virtual void SetItemValueText(const nsAString& text) MOZ_OVERRIDE;
virtual void GetItemValueText(nsAString& text);
virtual void SetItemValueText(const nsAString& text);
};
} // namespace dom

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

@ -6,7 +6,6 @@
#ifndef mozilla_dom_HTMLSpanElement_h
#define mozilla_dom_HTMLSpanElement_h
#include "mozilla/Attributes.h"
#include "nsIDOMHTMLElement.h"
#include "nsGenericHTMLElement.h"
#include "nsGkAtoms.h"
@ -40,9 +39,9 @@ public:
// nsIDOMHTMLElement
NS_FORWARD_NSIDOMHTMLELEMENT_TO_GENERIC
virtual nsresult Clone(nsINodeInfo *aNodeInfo, nsINode **aResult) const MOZ_OVERRIDE;
virtual nsresult Clone(nsINodeInfo *aNodeInfo, nsINode **aResult) const;
virtual nsIDOMNode* AsDOMNode() MOZ_OVERRIDE { return this; }
virtual nsIDOMNode* AsDOMNode() { return this; }
protected:
virtual JSObject* WrapNode(JSContext *aCx,

17
content/html/content/src/HTMLStyleElement.h
View File

@ -6,7 +6,6 @@
#ifndef mozilla_dom_HTMLStyleElement_h
#define mozilla_dom_HTMLStyleElement_h
#include "mozilla/Attributes.h"
#include "nsIDOMHTMLStyleElement.h"
#include "nsGenericHTMLElement.h"
#include "nsStyleLinkElement.h"
@ -52,9 +51,9 @@ public:
virtual nsresult BindToTree(nsIDocument* aDocument, nsIContent* aParent,
nsIContent* aBindingParent,
bool aCompileEventHandlers) MOZ_OVERRIDE;
bool aCompileEventHandlers);
virtual void UnbindFromTree(bool aDeep = true,
bool aNullParent = true) MOZ_OVERRIDE;
bool aNullParent = true);
nsresult SetAttr(int32_t aNameSpaceID, nsIAtom* aName,
const nsAString& aValue, bool aNotify)
{
@ -62,11 +61,11 @@ public:
}
virtual nsresult SetAttr(int32_t aNameSpaceID, nsIAtom* aName,
nsIAtom* aPrefix, const nsAString& aValue,
bool aNotify) MOZ_OVERRIDE;
bool aNotify);
virtual nsresult UnsetAttr(int32_t aNameSpaceID, nsIAtom* aAttribute,
bool aNotify) MOZ_OVERRIDE;
bool aNotify);
virtual nsresult Clone(nsINodeInfo *aNodeInfo, nsINode **aResult) const MOZ_OVERRIDE;
virtual nsresult Clone(nsINodeInfo *aNodeInfo, nsINode **aResult) const;
// nsIMutationObserver
NS_DECL_NSIMUTATIONOBSERVER_CHARACTERDATACHANGED
@ -96,14 +95,14 @@ public:
virtual JSObject* WrapNode(JSContext *aCx,
JS::Handle<JSObject*> aScope) MOZ_OVERRIDE;
virtual nsIDOMNode* AsDOMNode() MOZ_OVERRIDE { return this; }
virtual nsIDOMNode* AsDOMNode() { return this; }
protected:
already_AddRefed<nsIURI> GetStyleSheetURL(bool* aIsInline) MOZ_OVERRIDE;
already_AddRefed<nsIURI> GetStyleSheetURL(bool* aIsInline);
void GetStyleSheetInfo(nsAString& aTitle,
nsAString& aType,
nsAString& aMedia,
bool* aIsScoped,
bool* aIsAlternate) MOZ_OVERRIDE;
bool* aIsAlternate);
/**
* Common method to call from the various mutation observer methods.
* aContent is a content node that's either the one that changed or its

Some files were not shown because too many files have changed in this diff Show More