Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-02-28 13:21:28 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 835800 - Convert more DOM attribute reflectors to DOMString. r=bzbarsky

Browse Source
This commit is contained in:
Dhi Aurrahman 2015-02-13 08:27:39 +07:00
parent 3fc47297c7
commit 3d354b6e25
44 changed files with 153 additions and 149 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dom/html/HTMLAnchorElement.cpp
View File

@ -92,7 +92,7 @@ HTMLAnchorElement::TabIndexDefault()
}
void
HTMLAnchorElement::GetItemValueText(nsAString& aValue)
HTMLAnchorElement::GetItemValueText(DOMString& aValue)
{
GetHref(aValue);
}

20
dom/html/HTMLAnchorElement.h
View File

@ -105,7 +105,7 @@ public:
{
SetHTMLAttr(nsGkAtoms::target, aValue, rv);
}
void GetDownload(nsString& aValue)
void GetDownload(DOMString& aValue)
{
GetHTMLAttr(nsGkAtoms::download, aValue);
}
@ -118,7 +118,7 @@ public:
{
SetHTMLAttr(nsGkAtoms::ping, aValue, rv);
}
void GetRel(nsString& aValue)
void GetRel(DOMString& aValue)
{
GetHTMLAttr(nsGkAtoms::rel, aValue);
}
@ -127,7 +127,7 @@ public:
SetHTMLAttr(nsGkAtoms::rel, aValue, rv);
}
nsDOMTokenList* RelList();
void GetHreflang(nsString& aValue)
void GetHreflang(DOMString& aValue)
{
GetHTMLAttr(nsGkAtoms::hreflang, aValue);
}
@ -135,7 +135,7 @@ public:
{
SetHTMLAttr(nsGkAtoms::hreflang, aValue, rv);
}
void GetType(nsString& aValue)
void GetType(DOMString& aValue)
{
GetHTMLAttr(nsGkAtoms::type, aValue);
}
@ -179,7 +179,7 @@ public:
using Link::SetHash;
// The XPCOM URI decomposition attributes are fine for us
void GetCoords(nsString& aValue)
void GetCoords(DOMString& aValue)
{
GetHTMLAttr(nsGkAtoms::coords, aValue);
}
@ -187,7 +187,7 @@ public:
{
SetHTMLAttr(nsGkAtoms::coords, aValue, rv);
}
void GetCharset(nsString& aValue)
void GetCharset(DOMString& aValue)
{
GetHTMLAttr(nsGkAtoms::charset, aValue);
}
@ -195,7 +195,7 @@ public:
{
SetHTMLAttr(nsGkAtoms::charset, aValue, rv);
}
void GetName(nsString& aValue)
void GetName(DOMString& aValue)
{
GetHTMLAttr(nsGkAtoms::name, aValue);
}
@ -203,7 +203,7 @@ public:
{
SetHTMLAttr(nsGkAtoms::name, aValue, rv);
}
void GetRev(nsString& aValue)
void GetRev(DOMString& aValue)
{
GetHTMLAttr(nsGkAtoms::rev, aValue);
}
@ -211,7 +211,7 @@ public:
{
SetHTMLAttr(nsGkAtoms::rev, aValue, rv);
}
void GetShape(nsString& aValue)
void GetShape(DOMString& aValue)
{
GetHTMLAttr(nsGkAtoms::shape, aValue);
}
@ -227,7 +227,7 @@ public:
protected:
virtual ~HTMLAnchorElement();
virtual void GetItemValueText(nsAString& text) MOZ_OVERRIDE;
virtual void GetItemValueText(DOMString& text) MOZ_OVERRIDE;
virtual void SetItemValueText(const nsAString& text) MOZ_OVERRIDE;
virtual JSObject* WrapNode(JSContext *aCx) MOZ_OVERRIDE;
nsRefPtr<nsDOMTokenList > mRelList;

2
dom/html/HTMLAreaElement.cpp
View File

@ -67,7 +67,7 @@ HTMLAreaElement::TabIndexDefault()
}
void
HTMLAreaElement::GetItemValueText(nsAString& aValue)
HTMLAreaElement::GetItemValueText(DOMString& aValue)
{
GetHref(aValue);
}

4
dom/html/HTMLAreaElement.h
View File

@ -117,7 +117,7 @@ public:
SetHTMLAttr(nsGkAtoms::ping, aPing, aError);
}
void GetRel(nsString& aValue)
void GetRel(DOMString& aValue)
{
GetHTMLAttr(nsGkAtoms::rel, aValue);
}
@ -180,7 +180,7 @@ protected:
virtual JSObject* WrapNode(JSContext* aCx) MOZ_OVERRIDE;
virtual void GetItemValueText(nsAString& text) MOZ_OVERRIDE;
virtual void GetItemValueText(DOMString& text) MOZ_OVERRIDE;
virtual void SetItemValueText(const nsAString& text) MOZ_OVERRIDE;
nsRefPtr<nsDOMTokenList > mRelList;
};

24
dom/html/HTMLBodyElement.cpp
View File

@ -210,9 +210,9 @@ HTMLBodyElement::SetBackground(const nsAString& aBackground)
NS_IMETHODIMP
HTMLBodyElement::GetBackground(nsAString& aBackground)
{
nsString background;
DOMString background;
GetBackground(background);
aBackground = background;
background.ToString(aBackground);
return NS_OK;
}
@ -227,9 +227,9 @@ HTMLBodyElement::SetVLink(const nsAString& aVLink)
NS_IMETHODIMP
HTMLBodyElement::GetVLink(nsAString& aVLink)
{
nsString vLink;
DOMString vLink;
GetVLink(vLink);
aVLink = vLink;
vLink.ToString(aVLink);
return NS_OK;
}
@ -244,9 +244,9 @@ HTMLBodyElement::SetALink(const nsAString& aALink)
NS_IMETHODIMP
HTMLBodyElement::GetALink(nsAString& aALink)
{
nsString aLink;
DOMString aLink;
GetALink(aLink);
aALink = aLink;
aLink.ToString(aALink);
return NS_OK;
}
@ -261,9 +261,9 @@ HTMLBodyElement::SetLink(const nsAString& aLink)
NS_IMETHODIMP
HTMLBodyElement::GetLink(nsAString& aLink)
{
nsString link;
DOMString link;
GetLink(link);
aLink = link;
link.ToString(aLink);
return NS_OK;
}
@ -278,9 +278,9 @@ HTMLBodyElement::SetText(const nsAString& aText)
NS_IMETHODIMP
HTMLBodyElement::GetText(nsAString& aText)
{
nsString text;
DOMString text;
GetText(text);
aText = text;
text.ToString(aText);
return NS_OK;
}
@ -295,9 +295,9 @@ HTMLBodyElement::SetBgColor(const nsAString& aBgColor)
NS_IMETHODIMP
HTMLBodyElement::GetBgColor(nsAString& aBgColor)
{
nsString bgColor;
DOMString bgColor;
GetBgColor(bgColor);
aBgColor = bgColor;
bgColor.ToString(aBgColor);
return NS_OK;
}

12
dom/html/HTMLBodyElement.h
View File

@ -68,7 +68,7 @@ public:
#undef WINDOW_EVENT_HELPER
#undef EVENT
void GetText(nsString& aText)
void GetText(DOMString& aText)
{
GetHTMLAttr(nsGkAtoms::text, aText);
}
@ -76,7 +76,7 @@ public:
{
SetHTMLAttr(nsGkAtoms::text, aText, aError);
}
void GetLink(nsString& aLink)
void GetLink(DOMString& aLink)
{
GetHTMLAttr(nsGkAtoms::link, aLink);
}
@ -84,7 +84,7 @@ public:
{
SetHTMLAttr(nsGkAtoms::link, aLink, aError);
}
void GetVLink(nsString& aVLink)
void GetVLink(DOMString& aVLink)
{
GetHTMLAttr(nsGkAtoms::vlink, aVLink);
}
@ -92,7 +92,7 @@ public:
{
SetHTMLAttr(nsGkAtoms::vlink, aVLink, aError);
}
void GetALink(nsString& aALink)
void GetALink(DOMString& aALink)
{
GetHTMLAttr(nsGkAtoms::alink, aALink);
}
@ -100,7 +100,7 @@ public:
{
SetHTMLAttr(nsGkAtoms::alink, aALink, aError);
}
void GetBgColor(nsString& aBgColor)
void GetBgColor(DOMString& aBgColor)
{
GetHTMLAttr(nsGkAtoms::bgcolor, aBgColor);
}
@ -108,7 +108,7 @@ public:
{
SetHTMLAttr(nsGkAtoms::bgcolor, aBgColor, aError);
}
void GetBackground(nsString& aBackground)
void GetBackground(DOMString& aBackground)
{
GetHTMLAttr(nsGkAtoms::background, aBackground);
}

2
dom/html/HTMLDataElement.cpp
View File

@ -30,7 +30,7 @@ HTMLDataElement::WrapNode(JSContext* aCx)
}
void
HTMLDataElement::GetItemValueText(nsAString& text)
HTMLDataElement::GetItemValueText(DOMString& text)
{
GetValue(text);
}

4
dom/html/HTMLDataElement.h
View File

@ -20,7 +20,7 @@ public:
explicit HTMLDataElement(already_AddRefed<mozilla::dom::NodeInfo>& aNodeInfo);
// HTMLDataElement WebIDL
void GetValue(nsAString& aValue)
void GetValue(DOMString& aValue)
{
GetHTMLAttr(nsGkAtoms::value, aValue);
}
@ -30,7 +30,7 @@ public:
SetHTMLAttr(nsGkAtoms::value, aValue, aError);
}
virtual void GetItemValueText(nsAString& text) MOZ_OVERRIDE;
virtual void GetItemValueText(DOMString& text) MOZ_OVERRIDE;
virtual void SetItemValueText(const nsAString& text) MOZ_OVERRIDE;
virtual nsresult Clone(mozilla::dom::NodeInfo* aNodeInfo, nsINode** aResult) const MOZ_OVERRIDE;

6
dom/html/HTMLDivElement.h
View File

@ -27,9 +27,9 @@ public:
// nsIDOMHTMLDivElement
NS_IMETHOD GetAlign(nsAString& aAlign) MOZ_OVERRIDE
{
nsString align;
DOMString align;
GetAlign(align);
aAlign = align;
align.ToString(aAlign);
return NS_OK;
}
NS_IMETHOD SetAlign(const nsAString& aAlign) MOZ_OVERRIDE
@ -39,7 +39,7 @@ public:
return rv.ErrorCode();
}
void GetAlign(nsString& aAlign)
void GetAlign(DOMString& aAlign)
{
GetHTMLAttr(nsGkAtoms::align, aAlign);
}

6
dom/html/HTMLFontElement.h
View File

@ -19,7 +19,7 @@ public:
{
}
void GetColor(nsString& aColor)
void GetColor(DOMString& aColor)
{
GetHTMLAttr(nsGkAtoms::color, aColor);
}
@ -27,7 +27,7 @@ public:
{
SetHTMLAttr(nsGkAtoms::color, aColor, aError);
}
void GetFace(nsString& aFace)
void GetFace(DOMString& aFace)
{
GetHTMLAttr(nsGkAtoms::face, aFace);
}
@ -35,7 +35,7 @@ public:
{
SetHTMLAttr(nsGkAtoms::face, aFace, aError);
}
void GetSize(nsString& aSize)
void GetSize(DOMString& aSize)
{
GetHTMLAttr(nsGkAtoms::size, aSize);
}

8
dom/html/HTMLFrameSetElement.cpp
View File

@ -39,9 +39,9 @@ HTMLFrameSetElement::SetCols(const nsAString& aCols)
NS_IMETHODIMP
HTMLFrameSetElement::GetCols(nsAString& aCols)
{
nsString cols;
DOMString cols;
GetCols(cols);
aCols = cols;
cols.ToString(aCols);
return NS_OK;
}
@ -56,9 +56,9 @@ HTMLFrameSetElement::SetRows(const nsAString& aRows)
NS_IMETHODIMP
HTMLFrameSetElement::GetRows(nsAString& aRows)
{
nsString rows;
DOMString rows;
GetRows(rows);
aRows = rows;
rows.ToString(aRows);
return NS_OK;
}

4
dom/html/HTMLFrameSetElement.h
View File

@ -63,7 +63,7 @@ public:
// nsIDOMHTMLFrameSetElement
NS_DECL_NSIDOMHTMLFRAMESETELEMENT
void GetCols(nsString& aCols)
void GetCols(DOMString& aCols)
{
GetHTMLAttr(nsGkAtoms::cols, aCols);
}
@ -71,7 +71,7 @@ public:
{
SetHTMLAttr(nsGkAtoms::cols, aCols, aError);
}
void GetRows(nsString& aRows)
void GetRows(DOMString& aRows)
{
GetHTMLAttr(nsGkAtoms::rows, aRows);
}

2
dom/html/HTMLIFrameElement.cpp
View File

@ -46,7 +46,7 @@ NS_IMPL_BOOL_ATTR(HTMLIFrameElement, AllowFullscreen, allowfullscreen)
NS_IMPL_STRING_ATTR(HTMLIFrameElement, Srcdoc, srcdoc)
void
HTMLIFrameElement::GetItemValueText(nsAString& aValue)
HTMLIFrameElement::GetItemValueText(DOMString& aValue)
{
GetSrc(aValue);
}

2
dom/html/HTMLIFrameElement.h
View File

@ -177,7 +177,7 @@ public:
protected:
virtual ~HTMLIFrameElement();
virtual void GetItemValueText(nsAString& text) MOZ_OVERRIDE;
virtual void GetItemValueText(DOMString& text) MOZ_OVERRIDE;
virtual void SetItemValueText(const nsAString& text) MOZ_OVERRIDE;
virtual JSObject* WrapNode(JSContext* aCx) MOZ_OVERRIDE;

2
dom/html/HTMLImageElement.cpp
View File

@ -181,7 +181,7 @@ HTMLImageElement::GetCurrentSrc(nsAString& aValue)
}
void
HTMLImageElement::GetItemValueText(nsAString& aValue)
HTMLImageElement::GetItemValueText(DOMString& aValue)
{
GetSrc(aValue);
}

2
dom/html/HTMLImageElement.h
View File

@ -311,7 +311,7 @@ protected:
const nsAString *aSizes = nullptr);
CSSIntPoint GetXY();
virtual void GetItemValueText(nsAString& text) MOZ_OVERRIDE;
virtual void GetItemValueText(DOMString& text) MOZ_OVERRIDE;
virtual void SetItemValueText(const nsAString& text) MOZ_OVERRIDE;
virtual JSObject* WrapNode(JSContext *aCx) MOZ_OVERRIDE;
void UpdateFormOwner();

2
dom/html/HTMLLIElement.h
View File

@ -38,7 +38,7 @@ public:
virtual nsresult Clone(mozilla::dom::NodeInfo *aNodeInfo, nsINode **aResult) const MOZ_OVERRIDE;
// WebIDL API
void GetType(nsString& aType)
void GetType(DOMString& aType)
{
GetHTMLAttr(nsGkAtoms::type, aType);
}

2
dom/html/HTMLLegendElement.h
View File

@ -67,7 +67,7 @@ public:
already_AddRefed<HTMLFormElement> GetForm();
void GetAlign(nsAString& aAlign)
void GetAlign(DOMString& aAlign)
{
GetHTMLAttr(nsGkAtoms::align, aAlign);
}

2
dom/html/HTMLLinkElement.cpp
View File

@ -119,7 +119,7 @@ NS_IMPL_STRING_ATTR(HTMLLinkElement, Target, target)
NS_IMPL_STRING_ATTR(HTMLLinkElement, Type, type)
void
HTMLLinkElement::GetItemValueText(nsAString& aValue)
HTMLLinkElement::GetItemValueText(DOMString& aValue)
{
GetHref(aValue);
}

2
dom/html/HTMLLinkElement.h
View File

@ -161,7 +161,7 @@ protected:
virtual CORSMode GetCORSMode() const MOZ_OVERRIDE;
protected:
// nsGenericHTMLElement
virtual void GetItemValueText(nsAString& text) MOZ_OVERRIDE;
virtual void GetItemValueText(DOMString& text) MOZ_OVERRIDE;
virtual void SetItemValueText(const nsAString& text) MOZ_OVERRIDE;
nsRefPtr<nsDOMTokenList > mRelList;
private:

2
dom/html/HTMLMediaElement.cpp
View File

@ -2141,7 +2141,7 @@ HTMLMediaElement::~HTMLMediaElement()
}
void
HTMLMediaElement::GetItemValueText(nsAString& aValue)
HTMLMediaElement::GetItemValueText(DOMString& aValue)
{
// Can't call GetSrc because we don't have a JSContext
GetURIAttr(nsGkAtoms::src, nullptr, aValue);

2
dom/html/HTMLMediaElement.h
View File

@ -632,7 +632,7 @@ protected:
class MediaStreamTracksAvailableCallback;
class StreamListener;
virtual void GetItemValueText(nsAString& text) MOZ_OVERRIDE;
virtual void GetItemValueText(DOMString& text) MOZ_OVERRIDE;
virtual void SetItemValueText(const nsAString& text) MOZ_OVERRIDE;
class WakeLockBoolWrapper {

2
dom/html/HTMLMetaElement.cpp
View File

@ -36,7 +36,7 @@ NS_IMPL_STRING_ATTR(HTMLMetaElement, Name, name)
NS_IMPL_STRING_ATTR(HTMLMetaElement, Scheme, scheme)
void
HTMLMetaElement::GetItemValueText(nsAString& aValue)
HTMLMetaElement::GetItemValueText(DOMString& aValue)
{
GetContent(aValue);
}

2
dom/html/HTMLMetaElement.h
View File

@ -64,7 +64,7 @@ public:
protected:
virtual ~HTMLMetaElement();
virtual void GetItemValueText(nsAString& text) MOZ_OVERRIDE;
virtual void GetItemValueText(DOMString& text) MOZ_OVERRIDE;
virtual void SetItemValueText(const nsAString& text) MOZ_OVERRIDE;
};

2
dom/html/HTMLModElement.h
View File

@ -28,7 +28,7 @@ public:
{
SetHTMLAttr(nsGkAtoms::cite, aCite, aRv);
}
void GetDateTime(nsAString& aDateTime)
void GetDateTime(DOMString& aDateTime)
{
GetHTMLAttr(nsGkAtoms::datetime, aDateTime);
}

2
dom/html/HTMLObjectElement.cpp
View File

@ -111,7 +111,7 @@ HTMLObjectElement::GetForm(nsIDOMHTMLFormElement **aForm)
}
void
HTMLObjectElement::GetItemValueText(nsAString& aValue)
HTMLObjectElement::GetItemValueText(DOMString& aValue)
{
GetData(aValue);
}

2
dom/html/HTMLObjectElement.h
View File

@ -235,7 +235,7 @@ private:
*/
bool IsFocusableForTabIndex();
virtual void GetItemValueText(nsAString& text) MOZ_OVERRIDE;
virtual void GetItemValueText(DOMString& text) MOZ_OVERRIDE;
virtual void SetItemValueText(const nsAString& text) MOZ_OVERRIDE;
virtual ~HTMLObjectElement();

2
dom/html/HTMLSharedListElement.h
View File

@ -58,7 +58,7 @@ public:
{
SetHTMLIntAttr(nsGkAtoms::start, aStart, rv);
}
void GetType(nsString& aType)
void GetType(DOMString& aType)
{
GetHTMLAttr(nsGkAtoms::type, aType);
}

2
dom/html/HTMLSharedObjectElement.cpp
View File

@ -36,7 +36,7 @@ HTMLSharedObjectElement::HTMLSharedObjectElement(already_AddRefed<mozilla::dom::
}
void
HTMLSharedObjectElement::GetItemValueText(nsAString& aValue)
HTMLSharedObjectElement::GetItemValueText(DOMString& aValue)
{
if (mNodeInfo->Equals(nsGkAtoms::applet)) {
nsGenericHTMLElement::GetItemValueText(aValue);

2
dom/html/HTMLSharedObjectElement.h
View File

@ -206,7 +206,7 @@ private:
// always true for <embed>, per the documentation in nsIContent.h.
bool mIsDoneAddingChildren;
virtual void GetItemValueText(nsAString& text) MOZ_OVERRIDE;
virtual void GetItemValueText(DOMString& text) MOZ_OVERRIDE;
virtual void SetItemValueText(const nsAString& text) MOZ_OVERRIDE;
virtual JSObject* WrapNode(JSContext *aCx) MOZ_OVERRIDE;

2
dom/html/HTMLSourceElement.cpp
View File

@ -121,7 +121,7 @@ HTMLSourceElement::AfterSetAttr(int32_t aNameSpaceID, nsIAtom* aName,
}
void
HTMLSourceElement::GetItemValueText(nsAString& aValue)
HTMLSourceElement::GetItemValueText(DOMString& aValue)
{
GetSrc(aValue);
}

10
dom/html/HTMLSourceElement.h
View File

@ -60,7 +60,7 @@ public:
SetHTMLAttr(nsGkAtoms::src, aSrc, rv);
}
void GetType(nsString& aType)
void GetType(DOMString& aType)
{
GetHTMLAttr(nsGkAtoms::type, aType);
}
@ -69,7 +69,7 @@ public:
SetHTMLAttr(nsGkAtoms::type, aType, rv);
}
void GetSrcset(nsString& aSrcset)
void GetSrcset(DOMString& aSrcset)
{
GetHTMLAttr(nsGkAtoms::srcset, aSrcset);
}
@ -78,7 +78,7 @@ public:
SetHTMLAttr(nsGkAtoms::srcset, aSrcset, rv);
}
void GetSizes(nsString& aSizes)
void GetSizes(DOMString& aSizes)
{
GetHTMLAttr(nsGkAtoms::sizes, aSizes);
}
@ -87,7 +87,7 @@ public:
SetHTMLAttr(nsGkAtoms::sizes, aSizes, rv);
}
void GetMedia(nsString& aMedia)
void GetMedia(DOMString& aMedia)
{
GetHTMLAttr(nsGkAtoms::media, aMedia);
}
@ -102,7 +102,7 @@ protected:
virtual JSObject* WrapNode(JSContext* aCx) MOZ_OVERRIDE;
protected:
virtual void GetItemValueText(nsAString& text) MOZ_OVERRIDE;
virtual void GetItemValueText(DOMString& text) MOZ_OVERRIDE;
virtual void SetItemValueText(const nsAString& text) MOZ_OVERRIDE;
virtual nsresult AfterSetAttr(int32_t aNameSpaceID, nsIAtom* aName,

2
dom/html/HTMLTableCaptionElement.h
View File

@ -28,7 +28,7 @@ public:
// nsIDOMHTMLTableCaptionElement
NS_DECL_NSIDOMHTMLTABLECAPTIONELEMENT
void GetAlign(nsString& aAlign)
void GetAlign(DOMString& aAlign)
{
GetHTMLAttr(nsGkAtoms::align, aAlign);
}

46
dom/html/HTMLTableCellElement.cpp
View File

@ -127,9 +127,9 @@ HTMLTableCellElement::SetAbbr(const nsAString& aAbbr)
NS_IMETHODIMP
HTMLTableCellElement::GetAbbr(nsAString& aAbbr)
{
nsString abbr;
DOMString abbr;
GetAbbr(abbr);
aAbbr = abbr;
abbr.ToString(aAbbr);
return NS_OK;
}
@ -144,9 +144,9 @@ HTMLTableCellElement::SetAxis(const nsAString& aAxis)
NS_IMETHODIMP
HTMLTableCellElement::GetAxis(nsAString& aAxis)
{
nsString axis;
DOMString axis;
GetAxis(axis);
aAxis = axis;
axis.ToString(aAxis);
return NS_OK;
}
@ -161,9 +161,9 @@ HTMLTableCellElement::SetAlign(const nsAString& aAlign)
NS_IMETHODIMP
HTMLTableCellElement::GetAlign(nsAString& aAlign)
{
nsString align;
DOMString align;
GetAlign(align);
aAlign = align;
align.ToString(aAlign);
return NS_OK;
}
@ -178,9 +178,9 @@ HTMLTableCellElement::SetVAlign(const nsAString& aVAlign)
NS_IMETHODIMP
HTMLTableCellElement::GetVAlign(nsAString& aVAlign)
{
nsString vAlign;
DOMString vAlign;
GetVAlign(vAlign);
aVAlign = vAlign;
vAlign.ToString(aVAlign);
return NS_OK;
}
@ -195,9 +195,9 @@ HTMLTableCellElement::SetCh(const nsAString& aCh)
NS_IMETHODIMP
HTMLTableCellElement::GetCh(nsAString& aCh)
{
nsString ch;
DOMString ch;
GetCh(ch);
aCh = ch;
ch.ToString(aCh);
return NS_OK;
}
@ -212,9 +212,9 @@ HTMLTableCellElement::SetChOff(const nsAString& aChOff)
NS_IMETHODIMP
HTMLTableCellElement::GetChOff(nsAString& aChOff)
{
nsString chOff;
DOMString chOff;
GetChOff(chOff);
aChOff = chOff;
chOff.ToString(aChOff);
return NS_OK;
}
@ -229,9 +229,9 @@ HTMLTableCellElement::SetBgColor(const nsAString& aBgColor)
NS_IMETHODIMP
HTMLTableCellElement::GetBgColor(nsAString& aBgColor)
{
nsString bgColor;
DOMString bgColor;
GetBgColor(bgColor);
aBgColor = bgColor;
bgColor.ToString(aBgColor);
return NS_OK;
}
@ -246,9 +246,9 @@ HTMLTableCellElement::SetHeight(const nsAString& aHeight)
NS_IMETHODIMP
HTMLTableCellElement::GetHeight(nsAString& aHeight)
{
nsString height;
DOMString height;
GetHeight(height);
aHeight = height;
height.ToString(aHeight);
return NS_OK;
}
@ -263,9 +263,9 @@ HTMLTableCellElement::SetWidth(const nsAString& aWidth)
NS_IMETHODIMP
HTMLTableCellElement::GetWidth(nsAString& aWidth)
{
nsString width;
DOMString width;
GetWidth(width);
aWidth = width;
width.ToString(aWidth);
return NS_OK;
}
@ -295,9 +295,9 @@ HTMLTableCellElement::SetScope(const nsAString& aScope)
NS_IMETHODIMP
HTMLTableCellElement::GetScope(nsAString& aScope)
{
nsString scope;
DOMString scope;
GetScope(scope);
aScope = scope;
scope.ToString(aScope);
return NS_OK;
}
@ -312,9 +312,9 @@ HTMLTableCellElement::SetHeaders(const nsAString& aHeaders)
NS_IMETHODIMP
HTMLTableCellElement::GetHeaders(nsAString& aHeaders)
{
nsString headers;
DOMString headers;
GetHeaders(headers);
aHeaders = headers;
headers.ToString(aHeaders);
return NS_OK;
}
@ -349,7 +349,7 @@ HTMLTableCellElement::GetRowSpan(int32_t* aRowSpan)
}
void
HTMLTableCellElement::GetAlign(nsString& aValue)
HTMLTableCellElement::GetAlign(DOMString& aValue)
{
if (!GetAttr(kNameSpaceID_None, nsGkAtoms::align, aValue)) {
// There's no align attribute, ask the row for the alignment.

22
dom/html/HTMLTableCellElement.h
View File

@ -49,7 +49,7 @@ public:
SetHTMLIntAttr(nsGkAtoms::rowspan, aRowSpan, aError);
}
//already_AddRefed<nsDOMSettableTokenList> Headers() const;
void GetHeaders(nsString& aHeaders)
void GetHeaders(DOMString& aHeaders)
{
GetHTMLAttr(nsGkAtoms::headers, aHeaders);
}
@ -59,7 +59,7 @@ public:
}
int32_t CellIndex() const;
void GetAbbr(nsString& aAbbr)
void GetAbbr(DOMString& aAbbr)
{
GetHTMLAttr(nsGkAtoms::abbr, aAbbr);
}
@ -67,7 +67,7 @@ public:
{
SetHTMLAttr(nsGkAtoms::abbr, aAbbr, aError);
}
void GetScope(nsString& aScope)
void GetScope(DOMString& aScope)
{
GetHTMLAttr(nsGkAtoms::scope, aScope);
}
@ -75,12 +75,12 @@ public:
{
SetHTMLAttr(nsGkAtoms::scope, aScope, aError);
}
void GetAlign(nsString& aAlign);
void GetAlign(DOMString& aAlign);
void SetAlign(const nsAString& aAlign, ErrorResult& aError)
{
SetHTMLAttr(nsGkAtoms::align, aAlign, aError);
}
void GetAxis(nsString& aAxis)
void GetAxis(DOMString& aAxis)
{
GetHTMLAttr(nsGkAtoms::axis, aAxis);
}
@ -88,7 +88,7 @@ public:
{
SetHTMLAttr(nsGkAtoms::axis, aAxis, aError);
}
void GetHeight(nsString& aHeight)
void GetHeight(DOMString& aHeight)
{
GetHTMLAttr(nsGkAtoms::height, aHeight);
}
@ -96,7 +96,7 @@ public:
{
SetHTMLAttr(nsGkAtoms::height, aHeight, aError);
}
void GetWidth(nsString& aWidth)
void GetWidth(DOMString& aWidth)
{
GetHTMLAttr(nsGkAtoms::width, aWidth);
}
@ -104,7 +104,7 @@ public:
{
SetHTMLAttr(nsGkAtoms::width, aWidth, aError);
}
void GetCh(nsString& aCh)
void GetCh(DOMString& aCh)
{
GetHTMLAttr(nsGkAtoms::_char, aCh);
}
@ -112,7 +112,7 @@ public:
{
SetHTMLAttr(nsGkAtoms::_char, aCh, aError);
}
void GetChOff(nsString& aChOff)
void GetChOff(DOMString& aChOff)
{
GetHTMLAttr(nsGkAtoms::charoff, aChOff);
}
@ -128,7 +128,7 @@ public:
{
SetHTMLBoolAttr(nsGkAtoms::nowrap, aNoWrap, aError);
}
void GetVAlign(nsString& aVAlign)
void GetVAlign(DOMString& aVAlign)
{
GetHTMLAttr(nsGkAtoms::valign, aVAlign);
}
@ -136,7 +136,7 @@ public:
{
SetHTMLAttr(nsGkAtoms::valign, aVAlign, aError);
}
void GetBgColor(nsString& aBgColor)
void GetBgColor(DOMString& aBgColor)
{
GetHTMLAttr(nsGkAtoms::bgcolor, aBgColor);
}

10
dom/html/HTMLTableColElement.h
View File

@ -29,7 +29,7 @@ public:
SetHTMLIntAttr(nsGkAtoms::span, aSpan, aError);
}
void GetAlign(nsString& aAlign)
void GetAlign(DOMString& aAlign)
{
GetHTMLAttr(nsGkAtoms::align, aAlign);
}
@ -37,7 +37,7 @@ public:
{
SetHTMLAttr(nsGkAtoms::align, aAlign, aError);
}
void GetCh(nsString& aCh)
void GetCh(DOMString& aCh)
{
GetHTMLAttr(nsGkAtoms::_char, aCh);
}
@ -45,7 +45,7 @@ public:
{
SetHTMLAttr(nsGkAtoms::_char, aCh, aError);
}
void GetChOff(nsString& aChOff)
void GetChOff(DOMString& aChOff)
{
GetHTMLAttr(nsGkAtoms::charoff, aChOff);
}
@ -53,7 +53,7 @@ public:
{
SetHTMLAttr(nsGkAtoms::charoff, aChOff, aError);
}
void GetVAlign(nsString& aVAlign)
void GetVAlign(DOMString& aVAlign)
{
GetHTMLAttr(nsGkAtoms::valign, aVAlign);
}
@ -61,7 +61,7 @@ public:
{
SetHTMLAttr(nsGkAtoms::valign, aVAlign, aError);
}
void GetWidth(nsString& aWidth)
void GetWidth(DOMString& aWidth)
{
GetHTMLAttr(nsGkAtoms::width, aWidth);
}

20
dom/html/HTMLTableElement.h
View File

@ -96,7 +96,7 @@ public:
ErrorResult& aError);
void DeleteRow(int32_t aIndex, ErrorResult& aError);
void GetAlign(nsString& aAlign)
void GetAlign(DOMString& aAlign)
{
GetHTMLAttr(nsGkAtoms::align, aAlign);
}
@ -104,7 +104,7 @@ public:
{
SetHTMLAttr(nsGkAtoms::align, aAlign, aError);
}
void GetBorder(nsString& aBorder)
void GetBorder(DOMString& aBorder)
{
GetHTMLAttr(nsGkAtoms::border, aBorder);
}
@ -112,7 +112,7 @@ public:
{
SetHTMLAttr(nsGkAtoms::border, aBorder, aError);
}
void GetFrame(nsString& aFrame)
void GetFrame(DOMString& aFrame)
{
GetHTMLAttr(nsGkAtoms::frame, aFrame);
}
@ -120,7 +120,7 @@ public:
{
SetHTMLAttr(nsGkAtoms::frame, aFrame, aError);
}
void GetRules(nsString& aRules)
void GetRules(DOMString& aRules)
{
GetHTMLAttr(nsGkAtoms::rules, aRules);
}
@ -132,11 +132,15 @@ public:
{
GetHTMLAttr(nsGkAtoms::summary, aSummary);
}
void GetSummary(DOMString& aSummary)
{
GetHTMLAttr(nsGkAtoms::summary, aSummary);
}
void SetSummary(const nsAString& aSummary, ErrorResult& aError)
{
SetHTMLAttr(nsGkAtoms::summary, aSummary, aError);
}
void GetWidth(nsString& aWidth)
void GetWidth(DOMString& aWidth)
{
GetHTMLAttr(nsGkAtoms::width, aWidth);
}
@ -144,7 +148,7 @@ public:
{
SetHTMLAttr(nsGkAtoms::width, aWidth, aError);
}
void GetBgColor(nsString& aBgColor)
void GetBgColor(DOMString& aBgColor)
{
GetHTMLAttr(nsGkAtoms::bgcolor, aBgColor);
}
@ -152,7 +156,7 @@ public:
{
SetHTMLAttr(nsGkAtoms::bgcolor, aBgColor, aError);
}
void GetCellPadding(nsString& aCellPadding)
void GetCellPadding(DOMString& aCellPadding)
{
GetHTMLAttr(nsGkAtoms::cellpadding, aCellPadding);
}
@ -160,7 +164,7 @@ public:
{
SetHTMLAttr(nsGkAtoms::cellpadding, aCellPadding, aError);
}
void GetCellSpacing(nsString& aCellSpacing)
void GetCellSpacing(DOMString& aCellSpacing)
{
GetHTMLAttr(nsGkAtoms::cellspacing, aCellSpacing);
}

10
dom/html/HTMLTableRowElement.h
View File

@ -37,7 +37,7 @@ public:
InsertCell(int32_t aIndex, ErrorResult& aError);
void DeleteCell(int32_t aValue, ErrorResult& aError);
void GetAlign(nsString& aAlign)
void GetAlign(DOMString& aAlign)
{
GetHTMLAttr(nsGkAtoms::align, aAlign);
}
@ -45,7 +45,7 @@ public:
{
SetHTMLAttr(nsGkAtoms::align, aAlign, aError);
}
void GetCh(nsString& aCh)
void GetCh(DOMString& aCh)
{
GetHTMLAttr(nsGkAtoms::_char, aCh);
}
@ -53,7 +53,7 @@ public:
{
SetHTMLAttr(nsGkAtoms::_char, aCh, aError);
}
void GetChOff(nsString& aChOff)
void GetChOff(DOMString& aChOff)
{
GetHTMLAttr(nsGkAtoms::charoff, aChOff);
}
@ -61,7 +61,7 @@ public:
{
SetHTMLAttr(nsGkAtoms::charoff, aChOff, aError);
}
void GetVAlign(nsString& aVAlign)
void GetVAlign(DOMString& aVAlign)
{
GetHTMLAttr(nsGkAtoms::valign, aVAlign);
}
@ -69,7 +69,7 @@ public:
{
SetHTMLAttr(nsGkAtoms::valign, aVAlign, aError);
}
void GetBgColor(nsString& aBgColor)
void GetBgColor(DOMString& aBgColor)
{
GetHTMLAttr(nsGkAtoms::bgcolor, aBgColor);
}

8
dom/html/HTMLTableSectionElement.h
View File

@ -29,7 +29,7 @@ public:
InsertRow(int32_t aIndex, ErrorResult& aError);
void DeleteRow(int32_t aValue, ErrorResult& aError);
void GetAlign(nsString& aAlign)
void GetAlign(DOMString& aAlign)
{
GetHTMLAttr(nsGkAtoms::align, aAlign);
}
@ -37,7 +37,7 @@ public:
{
SetHTMLAttr(nsGkAtoms::align, aAlign, aError);
}
void GetCh(nsString& aCh)
void GetCh(DOMString& aCh)
{
GetHTMLAttr(nsGkAtoms::_char, aCh);
}
@ -45,7 +45,7 @@ public:
{
SetHTMLAttr(nsGkAtoms::_char, aCh, aError);
}
void GetChOff(nsString& aChOff)
void GetChOff(DOMString& aChOff)
{
GetHTMLAttr(nsGkAtoms::charoff, aChOff);
}
@ -53,7 +53,7 @@ public:
{
SetHTMLAttr(nsGkAtoms::charoff, aChOff, aError);
}
void GetVAlign(nsString& aVAlign)
void GetVAlign(DOMString& aVAlign)
{
GetHTMLAttr(nsGkAtoms::valign, aVAlign);
}

2
dom/html/HTMLTimeElement.cpp
View File

@ -32,7 +32,7 @@ HTMLTimeElement::WrapNode(JSContext* cx)
}
void
HTMLTimeElement::GetItemValueText(nsAString& text)
HTMLTimeElement::GetItemValueText(DOMString& text)
{
if (HasAttr(kNameSpaceID_None, nsGkAtoms::datetime)) {
GetDateTime(text);

4
dom/html/HTMLTimeElement.h
View File

@ -21,7 +21,7 @@ public:
virtual ~HTMLTimeElement();
// HTMLTimeElement WebIDL
void GetDateTime(nsAString& aDateTime)
void GetDateTime(DOMString& aDateTime)
{
GetHTMLAttr(nsGkAtoms::datetime, aDateTime);
}
@ -31,7 +31,7 @@ public:
SetHTMLAttr(nsGkAtoms::datetime, aDateTime, aError);
}
virtual void GetItemValueText(nsAString& text) MOZ_OVERRIDE;
virtual void GetItemValueText(DOMString& text) MOZ_OVERRIDE;
virtual void SetItemValueText(const nsAString& text) MOZ_OVERRIDE;
virtual nsresult Clone(mozilla::dom::NodeInfo* aNodeInfo, nsINode** aResult) const MOZ_OVERRIDE;

6
dom/html/HTMLTrackElement.h
View File

@ -93,11 +93,9 @@ public:
virtual nsresult Clone(mozilla::dom::NodeInfo* aNodeInfo, nsINode** aResult) const MOZ_OVERRIDE;
// For Track, ItemValue reflects the src attribute
virtual void GetItemValueText(nsAString& aText) MOZ_OVERRIDE
virtual void GetItemValueText(DOMString& aText) MOZ_OVERRIDE
{
DOMString value;
GetSrc(value);
value.ToString(aText);
GetSrc(aText);
}
virtual void SetItemValueText(const nsAString& aText) MOZ_OVERRIDE
{

10
dom/html/nsGenericHTMLElement.cpp
View File

@ -3034,7 +3034,7 @@ nsGenericHTMLElement::GetItemValue(JSContext* aCx, JSObject* aScope,
return;
}
nsString string;
DOMString string;
GetItemValueText(string);
if (!xpc::NonVoidStringToJsval(aCx, string, aRetval)) {
aError.Throw(NS_ERROR_FAILURE);
@ -3055,9 +3055,11 @@ nsGenericHTMLElement::GetItemValue(nsIVariant** aValue)
if (ItemScope()) {
out->SetAsISupports(static_cast<nsIContent*>(this));
} else {
nsAutoString string;
DOMString string;
GetItemValueText(string);
out->SetAsAString(string);
nsString xpcomString;
string.ToString(xpcomString);
out->SetAsAString(xpcomString);
}
out.forget(aValue);
@ -3098,7 +3100,7 @@ nsGenericHTMLElement::SetItemValue(nsIVariant* aValue)
}
void
nsGenericHTMLElement::GetItemValueText(nsAString& text)
nsGenericHTMLElement::GetItemValueText(DOMString& text)
{
ErrorResult rv;
GetTextContentInternal(text, rv);

20
dom/html/nsGenericHTMLElement.h
View File

@ -68,7 +68,7 @@ public:
// From Element
nsresult CopyInnerTo(mozilla::dom::Element* aDest);
void GetTitle(nsString& aTitle)
void GetTitle(mozilla::dom::DOMString& aTitle)
{
GetHTMLAttr(nsGkAtoms::title, aTitle);
}
@ -77,7 +77,7 @@ public:
SetHTMLAttr(nsGkAtoms::title, aTitle);
return NS_OK;
}
void GetLang(nsString& aLang)
void GetLang(mozilla::dom::DOMString& aLang)
{
GetHTMLAttr(nsGkAtoms::lang, aLang);
}
@ -86,7 +86,7 @@ public:
SetHTMLAttr(nsGkAtoms::lang, aLang);
return NS_OK;
}
void GetDir(nsString& aDir)
void GetDir(mozilla::dom::DOMString& aDir)
{
GetHTMLEnumAttr(nsGkAtoms::dir, aDir);
}
@ -296,7 +296,7 @@ protected:
// These methods are used to implement element-specific behavior of Get/SetItemValue
// when an element has @itemprop but no @itemscope.
virtual void GetItemValueText(nsAString& text);
virtual void GetItemValueText(mozilla::dom::DOMString& text);
virtual void SetItemValueText(const nsAString& text);
public:
virtual already_AddRefed<mozilla::dom::UndoManager> GetUndoManager() MOZ_OVERRIDE;
@ -318,21 +318,21 @@ public:
NS_FORWARD_NSIDOMELEMENT_TO_GENERIC
NS_IMETHOD GetTitle(nsAString& aTitle) MOZ_FINAL MOZ_OVERRIDE {
nsString title;
mozilla::dom::DOMString title;
GetTitle(title);
aTitle.Assign(title);
title.ToString(aTitle);
return NS_OK;
}
NS_IMETHOD GetLang(nsAString& aLang) MOZ_FINAL MOZ_OVERRIDE {
nsString lang;
mozilla::dom::DOMString lang;
GetLang(lang);
aLang.Assign(lang);
lang.ToString(aLang);
return NS_OK;
}
NS_IMETHOD GetDir(nsAString& aDir) MOZ_FINAL MOZ_OVERRIDE {
nsString dir;
mozilla::dom::DOMString dir;
GetDir(dir);
aDir.Assign(dir);
dir.ToString(aDir);
return NS_OK;
}
NS_IMETHOD SetDir(const nsAString& aDir) MOZ_FINAL MOZ_OVERRIDE {