author | Mounir Lamouri <mounir.lamouri@gmail.com> |
Thu, 18 Aug 2011 00:14:53 +0200 | |
changeset 75438 | 410678e3b7137a6d912ad553ce2ad2d2704b9142 |
parent 75437 | f345becaf55b05b3f0a05fd9aea4d7d4457377a0 |
child 75439 | 4e2365ec6145d5bc246c0d07f210921be2b03641 |
push id | 21023 |
push user | mak77@bonardo.net |
push date | Thu, 18 Aug 2011 09:39:20 +0000 |
treeherder | mozilla-central@f69a10f23bf3 [default view] [failures only] |
perfherder | [talos] [build metrics] [platform microbench] (compared to previous push) |
reviewers | jst |
bugs | 679499 |
milestone | 9.0a1 |
first release with | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
last release without | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
--- a/content/html/content/src/nsHTMLAnchorElement.cpp +++ b/content/html/content/src/nsHTMLAnchorElement.cpp @@ -46,16 +46,17 @@ #include "nsContentUtils.h" #include "nsReadableUtils.h" #include "nsUnicharUtils.h" #include "nsGkAtoms.h" #include "nsIPresShell.h" #include "nsIDocument.h" #include "nsPresContext.h" #include "nsHTMLDNSPrefetch.h" +#include "nsDOMMemoryReporter.h" using namespace mozilla::dom; class nsHTMLAnchorElement : public nsGenericHTMLElement, public nsIDOMHTMLAnchorElement, public nsILink, public Link { @@ -76,16 +77,21 @@ public: NS_FORWARD_NSIDOMELEMENT(nsGenericHTMLElement::) // nsIDOMHTMLElement NS_FORWARD_NSIDOMHTMLELEMENT(nsGenericHTMLElement::) // nsIDOMHTMLAnchorElement NS_DECL_NSIDOMHTMLANCHORELEMENT + // TODO: we do not really count Link::mCachedURI but given that it's a + // nsCOMPtr<nsIURI>, that would be required adding SizeOf() to the interface. + NS_DECL_AND_IMPL_DOM_MEMORY_REPORTER_SIZEOF(nsHTMLAnchorElement, + nsGenericHTMLElement) + // nsILink NS_IMETHOD LinkAdded() { return NS_OK; } NS_IMETHOD LinkRemoved() { return NS_OK; } // override from nsGenericHTMLElement NS_IMETHOD GetDraggable(PRBool* aDraggable); virtual nsresult BindToTree(nsIDocument* aDocument, nsIContent* aParent, @@ -449,8 +455,9 @@ nsHTMLAnchorElement::ParseAttribute(PRIn aResult); } nsEventStates nsHTMLAnchorElement::IntrinsicState() const { return Link::LinkState() | nsGenericHTMLElement::IntrinsicState(); } +
--- a/content/html/content/src/nsHTMLDivElement.cpp +++ b/content/html/content/src/nsHTMLDivElement.cpp @@ -35,16 +35,17 @@ * * ***** END LICENSE BLOCK ***** */ #include "nsIDOMHTMLDivElement.h" #include "nsIDOMEventTarget.h" #include "nsGenericHTMLElement.h" #include "nsGkAtoms.h" #include "nsStyleConsts.h" #include "nsMappedAttributes.h" +#include "nsDOMMemoryReporter.h" class nsHTMLDivElement : public nsGenericHTMLElement, public nsIDOMHTMLDivElement { public: nsHTMLDivElement(already_AddRefed<nsINodeInfo> aNodeInfo); virtual ~nsHTMLDivElement(); @@ -58,16 +59,19 @@ public: NS_FORWARD_NSIDOMELEMENT(nsGenericHTMLElement::) // nsIDOMHTMLElement NS_FORWARD_NSIDOMHTMLELEMENT(nsGenericHTMLElement::) // nsIDOMHTMLDivElement NS_DECL_NSIDOMHTMLDIVELEMENT + NS_DECL_AND_IMPL_DOM_MEMORY_REPORTER_SIZEOF(nsHTMLDivElement, + nsGenericHTMLElement) + virtual PRBool ParseAttribute(PRInt32 aNamespaceID, nsIAtom* aAttribute, const nsAString& aValue, nsAttrValue& aResult); NS_IMETHOD_(PRBool) IsAttributeMapped(const nsIAtom* aAttribute) const; virtual nsMapRuleToAttributesFunc GetAttributeMappingFunction() const; virtual nsresult Clone(nsINodeInfo *aNodeInfo, nsINode **aResult) const;
--- a/content/html/content/src/nsHTMLSpanElement.cpp +++ b/content/html/content/src/nsHTMLSpanElement.cpp @@ -36,16 +36,17 @@ * ***** END LICENSE BLOCK ***** */ #include "nsIDOMHTMLElement.h" #include "nsIDOMEventTarget.h" #include "nsGenericHTMLElement.h" #include "nsGkAtoms.h" #include "nsStyleConsts.h" #include "nsIAtom.h" #include "nsRuleData.h" +#include "nsDOMMemoryReporter.h" class nsHTMLSpanElement : public nsGenericHTMLElement, public nsIDOMHTMLElement { public: nsHTMLSpanElement(already_AddRefed<nsINodeInfo> aNodeInfo); virtual ~nsHTMLSpanElement(); @@ -56,16 +57,19 @@ public: NS_FORWARD_NSIDOMNODE(nsGenericHTMLElement::) // nsIDOMElement NS_FORWARD_NSIDOMELEMENT(nsGenericHTMLElement::) // nsIDOMHTMLElement NS_FORWARD_NSIDOMHTMLELEMENT(nsGenericHTMLElement::) + NS_DECL_AND_IMPL_DOM_MEMORY_REPORTER_SIZEOF(nsHTMLSpanElement, + nsGenericHTMLElement) + virtual nsresult Clone(nsINodeInfo *aNodeInfo, nsINode **aResult) const; virtual nsXPCClassInfo* GetClassInfo(); }; NS_IMPL_NS_NEW_HTML_ELEMENT(Span)