Skip to content

Commit

Permalink
Bug 835800 - Convert more DOM attribute reflectors to DOMString. r=bz…
Browse files Browse the repository at this point in the history
…barsky
  • Loading branch information
diorahman committed Feb 13, 2015
1 parent 3fc4729 commit 3d354b6
Show file tree
Hide file tree
Showing 44 changed files with 153 additions and 149 deletions.
2 changes: 1 addition & 1 deletion dom/html/HTMLAnchorElement.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ HTMLAnchorElement::TabIndexDefault()
}

void
HTMLAnchorElement::GetItemValueText(nsAString& aValue)
HTMLAnchorElement::GetItemValueText(DOMString& aValue)
{
GetHref(aValue);
}
Expand Down
20 changes: 10 additions & 10 deletions dom/html/HTMLAnchorElement.h
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ class HTMLAnchorElement MOZ_FINAL : public nsGenericHTMLElement,
{
SetHTMLAttr(nsGkAtoms::target, aValue, rv);
}
void GetDownload(nsString& aValue)
void GetDownload(DOMString& aValue)
{
GetHTMLAttr(nsGkAtoms::download, aValue);
}
Expand All @@ -118,7 +118,7 @@ class HTMLAnchorElement MOZ_FINAL : public nsGenericHTMLElement,
{
SetHTMLAttr(nsGkAtoms::ping, aValue, rv);
}
void GetRel(nsString& aValue)
void GetRel(DOMString& aValue)
{
GetHTMLAttr(nsGkAtoms::rel, aValue);
}
Expand All @@ -127,15 +127,15 @@ class HTMLAnchorElement MOZ_FINAL : public nsGenericHTMLElement,
SetHTMLAttr(nsGkAtoms::rel, aValue, rv);
}
nsDOMTokenList* RelList();
void GetHreflang(nsString& aValue)
void GetHreflang(DOMString& aValue)
{
GetHTMLAttr(nsGkAtoms::hreflang, aValue);
}
void SetHreflang(const nsAString& aValue, mozilla::ErrorResult& rv)
{
SetHTMLAttr(nsGkAtoms::hreflang, aValue, rv);
}
void GetType(nsString& aValue)
void GetType(DOMString& aValue)
{
GetHTMLAttr(nsGkAtoms::type, aValue);
}
Expand Down Expand Up @@ -179,39 +179,39 @@ class HTMLAnchorElement MOZ_FINAL : public nsGenericHTMLElement,
using Link::SetHash;

// The XPCOM URI decomposition attributes are fine for us
void GetCoords(nsString& aValue)
void GetCoords(DOMString& aValue)
{
GetHTMLAttr(nsGkAtoms::coords, aValue);
}
void SetCoords(const nsAString& aValue, mozilla::ErrorResult& rv)
{
SetHTMLAttr(nsGkAtoms::coords, aValue, rv);
}
void GetCharset(nsString& aValue)
void GetCharset(DOMString& aValue)
{
GetHTMLAttr(nsGkAtoms::charset, aValue);
}
void SetCharset(const nsAString& aValue, mozilla::ErrorResult& rv)
{
SetHTMLAttr(nsGkAtoms::charset, aValue, rv);
}
void GetName(nsString& aValue)
void GetName(DOMString& aValue)
{
GetHTMLAttr(nsGkAtoms::name, aValue);
}
void SetName(const nsAString& aValue, mozilla::ErrorResult& rv)
{
SetHTMLAttr(nsGkAtoms::name, aValue, rv);
}
void GetRev(nsString& aValue)
void GetRev(DOMString& aValue)
{
GetHTMLAttr(nsGkAtoms::rev, aValue);
}
void SetRev(const nsAString& aValue, mozilla::ErrorResult& rv)
{
SetHTMLAttr(nsGkAtoms::rev, aValue, rv);
}
void GetShape(nsString& aValue)
void GetShape(DOMString& aValue)
{
GetHTMLAttr(nsGkAtoms::shape, aValue);
}
Expand All @@ -227,7 +227,7 @@ class HTMLAnchorElement MOZ_FINAL : public nsGenericHTMLElement,
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;
Expand Down
2 changes: 1 addition & 1 deletion dom/html/HTMLAreaElement.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ HTMLAreaElement::TabIndexDefault()
}

void
HTMLAreaElement::GetItemValueText(nsAString& aValue)
HTMLAreaElement::GetItemValueText(DOMString& aValue)
{
GetHref(aValue);
}
Expand Down
4 changes: 2 additions & 2 deletions dom/html/HTMLAreaElement.h
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ class HTMLAreaElement MOZ_FINAL : public nsGenericHTMLElement,
SetHTMLAttr(nsGkAtoms::ping, aPing, aError);
}

void GetRel(nsString& aValue)
void GetRel(DOMString& aValue)
{
GetHTMLAttr(nsGkAtoms::rel, aValue);
}
Expand Down Expand Up @@ -180,7 +180,7 @@ class HTMLAreaElement MOZ_FINAL : public nsGenericHTMLElement,

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;
};
Expand Down
24 changes: 12 additions & 12 deletions dom/html/HTMLBodyElement.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand All @@ -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;
}

Expand All @@ -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;
}

Expand All @@ -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;
}

Expand All @@ -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;
}

Expand All @@ -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;
}

Expand Down
12 changes: 6 additions & 6 deletions dom/html/HTMLBodyElement.h
Original file line number Diff line number Diff line change
Expand Up @@ -68,47 +68,47 @@ class HTMLBodyElement MOZ_FINAL : public nsGenericHTMLElement,
#undef WINDOW_EVENT_HELPER
#undef EVENT

void GetText(nsString& aText)
void GetText(DOMString& aText)
{
GetHTMLAttr(nsGkAtoms::text, aText);
}
void SetText(const nsAString& aText, ErrorResult& aError)
{
SetHTMLAttr(nsGkAtoms::text, aText, aError);
}
void GetLink(nsString& aLink)
void GetLink(DOMString& aLink)
{
GetHTMLAttr(nsGkAtoms::link, aLink);
}
void SetLink(const nsAString& aLink, ErrorResult& aError)
{
SetHTMLAttr(nsGkAtoms::link, aLink, aError);
}
void GetVLink(nsString& aVLink)
void GetVLink(DOMString& aVLink)
{
GetHTMLAttr(nsGkAtoms::vlink, aVLink);
}
void SetVLink(const nsAString& aVLink, ErrorResult& aError)
{
SetHTMLAttr(nsGkAtoms::vlink, aVLink, aError);
}
void GetALink(nsString& aALink)
void GetALink(DOMString& aALink)
{
GetHTMLAttr(nsGkAtoms::alink, aALink);
}
void SetALink(const nsAString& aALink, ErrorResult& aError)
{
SetHTMLAttr(nsGkAtoms::alink, aALink, aError);
}
void GetBgColor(nsString& aBgColor)
void GetBgColor(DOMString& aBgColor)
{
GetHTMLAttr(nsGkAtoms::bgcolor, aBgColor);
}
void SetBgColor(const nsAString& aBgColor, ErrorResult& aError)
{
SetHTMLAttr(nsGkAtoms::bgcolor, aBgColor, aError);
}
void GetBackground(nsString& aBackground)
void GetBackground(DOMString& aBackground)
{
GetHTMLAttr(nsGkAtoms::background, aBackground);
}
Expand Down
2 changes: 1 addition & 1 deletion dom/html/HTMLDataElement.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ HTMLDataElement::WrapNode(JSContext* aCx)
}

void
HTMLDataElement::GetItemValueText(nsAString& text)
HTMLDataElement::GetItemValueText(DOMString& text)
{
GetValue(text);
}
Expand Down
4 changes: 2 additions & 2 deletions dom/html/HTMLDataElement.h
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ class HTMLDataElement MOZ_FINAL : public nsGenericHTMLElement
explicit HTMLDataElement(already_AddRefed<mozilla::dom::NodeInfo>& aNodeInfo);

// HTMLDataElement WebIDL
void GetValue(nsAString& aValue)
void GetValue(DOMString& aValue)
{
GetHTMLAttr(nsGkAtoms::value, aValue);
}
Expand All @@ -30,7 +30,7 @@ class HTMLDataElement MOZ_FINAL : public nsGenericHTMLElement
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;

Expand Down
6 changes: 3 additions & 3 deletions dom/html/HTMLDivElement.h
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,9 @@ class HTMLDivElement MOZ_FINAL : public nsGenericHTMLElement,
// 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
Expand All @@ -39,7 +39,7 @@ class HTMLDivElement MOZ_FINAL : public nsGenericHTMLElement,
return rv.ErrorCode();
}

void GetAlign(nsString& aAlign)
void GetAlign(DOMString& aAlign)
{
GetHTMLAttr(nsGkAtoms::align, aAlign);
}
Expand Down
6 changes: 3 additions & 3 deletions dom/html/HTMLFontElement.h
Original file line number Diff line number Diff line change
Expand Up @@ -19,23 +19,23 @@ class HTMLFontElement MOZ_FINAL : public nsGenericHTMLElement
{
}

void GetColor(nsString& aColor)
void GetColor(DOMString& aColor)
{
GetHTMLAttr(nsGkAtoms::color, aColor);
}
void SetColor(const nsAString& aColor, ErrorResult& aError)
{
SetHTMLAttr(nsGkAtoms::color, aColor, aError);
}
void GetFace(nsString& aFace)
void GetFace(DOMString& aFace)
{
GetHTMLAttr(nsGkAtoms::face, aFace);
}
void SetFace(const nsAString& aFace, ErrorResult& aError)
{
SetHTMLAttr(nsGkAtoms::face, aFace, aError);
}
void GetSize(nsString& aSize)
void GetSize(DOMString& aSize)
{
GetHTMLAttr(nsGkAtoms::size, aSize);
}
Expand Down
8 changes: 4 additions & 4 deletions dom/html/HTMLFrameSetElement.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand All @@ -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;
}

Expand Down
4 changes: 2 additions & 2 deletions dom/html/HTMLFrameSetElement.h
Original file line number Diff line number Diff line change
Expand Up @@ -63,15 +63,15 @@ class HTMLFrameSetElement MOZ_FINAL : public nsGenericHTMLElement,
// nsIDOMHTMLFrameSetElement
NS_DECL_NSIDOMHTMLFRAMESETELEMENT

void GetCols(nsString& aCols)
void GetCols(DOMString& aCols)
{
GetHTMLAttr(nsGkAtoms::cols, aCols);
}
void SetCols(const nsAString& aCols, ErrorResult& aError)
{
SetHTMLAttr(nsGkAtoms::cols, aCols, aError);
}
void GetRows(nsString& aRows)
void GetRows(DOMString& aRows)
{
GetHTMLAttr(nsGkAtoms::rows, aRows);
}
Expand Down
2 changes: 1 addition & 1 deletion dom/html/HTMLIFrameElement.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Expand Down
2 changes: 1 addition & 1 deletion dom/html/HTMLIFrameElement.h
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,7 @@ class HTMLIFrameElement MOZ_FINAL : public nsGenericHTMLFrameElement
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;
Expand Down
2 changes: 1 addition & 1 deletion dom/html/HTMLImageElement.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,7 @@ HTMLImageElement::GetCurrentSrc(nsAString& aValue)
}

void
HTMLImageElement::GetItemValueText(nsAString& aValue)
HTMLImageElement::GetItemValueText(DOMString& aValue)
{
GetSrc(aValue);
}
Expand Down
Loading

0 comments on commit 3d354b6

Please sign in to comment.