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

Convert users of nsAReadable[C]String and nsAWritable[C]String typedefs to [const] nsA[C]String. b=131899 r=scc sr=jag a=asa

This commit is contained in:
dbaron%fas.harvard.edu 2002-03-23 22:56:05 +00:00
Родитель 0a2e157db4
Коммит 2407cfe7f8
69 изменённых файлов: 694 добавлений и 840 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

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

@ -78,7 +78,7 @@ nsHTMLValue::nsHTMLValue(float aValue)
mValue.mFloat = aValue;
}
nsHTMLValue::nsHTMLValue(const nsAReadableString& aValue, nsHTMLUnit aUnit)
nsHTMLValue::nsHTMLValue(const nsAString& aValue, nsHTMLUnit aUnit)
: mUnit(aUnit)
{
NS_ASSERTION((eHTMLUnit_String == aUnit) ||
@ -245,7 +245,7 @@ void nsHTMLValue::SetPercentValue(float aValue)
mValue.mFloat = aValue;
}
void nsHTMLValue::SetStringValue(const nsAReadableString& aValue,
void nsHTMLValue::SetStringValue(const nsAString& aValue,
nsHTMLUnit aUnit)
{
Reset();
@ -277,7 +277,7 @@ void nsHTMLValue::SetEmptyValue(void)
}
#ifdef DEBUG
void nsHTMLValue::AppendToString(nsAWritableString& aBuffer) const
void nsHTMLValue::AppendToString(nsAString& aBuffer) const
{
if (eHTMLUnit_Null == mUnit) {
return;

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

@ -64,7 +64,7 @@ public:
nsHTMLValue(nsHTMLUnit aUnit = eHTMLUnit_Null);
nsHTMLValue(PRInt32 aValue, nsHTMLUnit aUnit);
nsHTMLValue(float aValue);
nsHTMLValue(const nsAReadableString& aValue, nsHTMLUnit aUnit = eHTMLUnit_String);
nsHTMLValue(const nsAString& aValue, nsHTMLUnit aUnit = eHTMLUnit_String);
nsHTMLValue(nsISupports* aValue);
nsHTMLValue(nscolor aValue);
nsHTMLValue(const nsHTMLValue& aCopy);
@ -79,7 +79,7 @@ public:
PRInt32 GetIntValue(void) const;
PRInt32 GetPixelValue(void) const;
float GetPercentValue(void) const;
nsAWritableString& GetStringValue(nsAWritableString& aBuffer) const;
nsAString& GetStringValue(nsAString& aBuffer) const;
nsISupports* GetISupportsValue(void) const;
nscolor GetColorValue(void) const;
@ -87,13 +87,13 @@ public:
void SetIntValue(PRInt32 aValue, nsHTMLUnit aUnit);
void SetPixelValue(PRInt32 aValue);
void SetPercentValue(float aValue);
void SetStringValue(const nsAReadableString& aValue, nsHTMLUnit aUnit = eHTMLUnit_String);
void SetStringValue(const nsAString& aValue, nsHTMLUnit aUnit = eHTMLUnit_String);
void SetISupportsValue(nsISupports* aValue);
void SetColorValue(nscolor aValue);
void SetEmptyValue(void);
#ifdef DEBUG
void AppendToString(nsAWritableString& aBuffer) const;
void AppendToString(nsAString& aBuffer) const;
#endif
protected:
@ -146,7 +146,7 @@ inline float nsHTMLValue::GetPercentValue(void) const
return 0.0f;
}
inline nsAWritableString& nsHTMLValue::GetStringValue(nsAWritableString& aBuffer) const
inline nsAString& nsHTMLValue::GetStringValue(nsAString& aBuffer) const
{
NS_ASSERTION((mUnit == eHTMLUnit_String) || (mUnit == eHTMLUnit_ColorName) ||
(mUnit == eHTMLUnit_Null), "not a string value");

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

@ -38,7 +38,7 @@
#ifndef nsTextFragment_h___
#define nsTextFragment_h___
#include "nsAWritableString.h"
#include "nsAString.h"
class nsString;
// XXX should this normalize the code to keep a \u0000 at the end?
@ -128,7 +128,7 @@ public:
* Change the contents of this fragment to be a copy of the
* the argument string.
*/
nsTextFragment& operator=(const nsAReadableString& aString);
nsTextFragment& operator=(const nsAString& aString);
/**
* Return PR_TRUE if this fragment is represented by PRUnichar data

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

@ -48,7 +48,7 @@
/*static*/
nsresult nsImageMapUtils::FindImageMap(nsIDocument *aDocument,
const nsAReadableString &aUsemap,
const nsAString &aUsemap,
nsIDOMHTMLMapElement **aMap)
{
NS_ENSURE_ARG_POINTER(aDocument);

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

@ -64,7 +64,7 @@ public:
* @return XPCOM return values.
*/
static nsresult FindImageMap(nsIDocument *aDocument,
const nsAReadableString &aUsemap,
const nsAString &aUsemap,
nsIDOMHTMLMapElement **aMap);
};

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

@ -39,7 +39,7 @@
#define nsICSSLoader_h___
#include "nsISupports.h"
#include "nsAReadableString.h"
#include "nsAString.h"
#include "nsICSSImportRule.h"
class nsIAtom;
@ -69,7 +69,7 @@ public:
NS_IMETHOD SetCaseSensitive(PRBool aCaseSensitive) = 0;
NS_IMETHOD SetQuirkMode(PRBool aQuirkMode) = 0;
NS_IMETHOD SetPreferredSheet(const nsAReadableString& aTitle) = 0;
NS_IMETHOD SetPreferredSheet(const nsAString& aTitle) = 0;
// Get/Recycle a CSS parser for general use
NS_IMETHOD GetParserFor(nsICSSStyleSheet* aSheet,

16
content/html/style/public/nsICSSParser.h
Просмотреть файл

@ -39,7 +39,7 @@
#define nsCSS1Parser_h___
#include "nsISupports.h"
#include "nsAWritableString.h"
#include "nsAString.h"
class nsIStyleRule;
class nsICSSStyleSheet;
class nsIUnicharInputStream;
@ -85,22 +85,22 @@ public:
// Parse HTML style attribute or its equivalent in other markup
// languages. aBaseURL is the base url to use for relative links in
// the declaration.
NS_IMETHOD ParseStyleAttribute(const nsAReadableString& aAttributeValue,
NS_IMETHOD ParseStyleAttribute(const nsAString& aAttributeValue,
nsIURI* aBaseURL,
nsIStyleRule** aResult) = 0;
NS_IMETHOD ParseAndAppendDeclaration(const nsAReadableString& aBuffer,
NS_IMETHOD ParseAndAppendDeclaration(const nsAString& aBuffer,
nsIURI* aBaseURL,
nsCSSDeclaration* aDeclaration,
PRBool aParseOnlyOneDecl,
PRInt32* aHint) = 0;
NS_IMETHOD ParseRule(nsAReadableString& aRule,
NS_IMETHOD ParseRule(const nsAString& aRule,
nsIURI* aBaseURL,
nsISupportsArray** aResult) = 0;
NS_IMETHOD ParseProperty(const nsAReadableString& aPropName,
const nsAReadableString& aPropValue,
NS_IMETHOD ParseProperty(const nsAString& aPropName,
const nsAString& aPropValue,
nsIURI* aBaseURL,
nsCSSDeclaration* aDeclaration,
PRInt32* aHint) = 0;
@ -110,11 +110,11 @@ public:
// charset to be anything other than the default
// sets the out-param to the current charset, as set by SetCharset
NS_IMETHOD GetCharset(/*out*/nsAWritableString &aCharsetDest) const = 0;
NS_IMETHOD GetCharset(/*out*/nsAString &aCharsetDest) const = 0;
// SetCharset expects the charset to be the preferred charset
// and it just records the string exactly as passed in (no alias resolution)
NS_IMETHOD SetCharset(/*in*/ const nsAReadableString &aCharsetSrc) = 0;
NS_IMETHOD SetCharset(/*in*/ const nsAString &aCharsetSrc) = 0;
};
// Values or'd in the GetInfoMask; other bits are reserved

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

@ -68,7 +68,7 @@ public:
NS_IMETHOD GetStyleRuleAt(PRInt32 aIndex, nsICSSRule*& aRule) const = 0;
NS_IMETHOD DeleteRuleFromGroup(nsICSSGroupRule* aGroup, PRUint32 aIndex) = 0;
NS_IMETHOD InsertRuleIntoGroup(nsAReadableString & aRule, nsICSSGroupRule* aGroup, PRUint32 aIndex, PRUint32* _retval) = 0;
NS_IMETHOD InsertRuleIntoGroup(const nsAString & aRule, nsICSSGroupRule* aGroup, PRUint32 aIndex, PRUint32* _retval) = 0;
NS_IMETHOD StyleSheetCount(PRInt32& aCount) const = 0;
NS_IMETHOD GetStyleSheetAt(PRInt32 aIndex, nsICSSStyleSheet*& aSheet) const = 0;

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

@ -52,7 +52,7 @@ class nsIComputedDOMStyle : public nsIDOMCSSStyleDeclaration
public:
NS_DEFINE_STATIC_IID_ACCESSOR(NS_ICOMPUTEDDOMSTYLE_IID)
NS_IMETHOD Init(nsIDOMElement *aElement, const nsAReadableString& aPseudoElt,
NS_IMETHOD Init(nsIDOMElement *aElement, const nsAString& aPseudoElt,
nsIPresShell *aPresShell) = 0;
};

10
content/html/style/public/nsIMediaList.h
Просмотреть файл

@ -31,21 +31,21 @@ class nsIMediaList : public nsISupportsArray {
public:
static const nsIID& GetIID() { static nsIID iid = NS_IMEDIA_LIST_IID; return iid; }
NS_IMETHOD GetText(nsAWritableString& aMediaText) = 0;
NS_IMETHOD SetText(nsAReadableString& aMediaText) = 0;
NS_IMETHOD GetText(nsAString& aMediaText) = 0;
NS_IMETHOD SetText(const nsAString& aMediaText) = 0;
NS_IMETHOD MatchesMedium(nsIAtom* aMedium, PRBool* aMatch) = 0;
NS_IMETHOD DropReference(void) = 0;
};
/* Use this macro when declaring classes that implement this interface. */
#define NS_DECL_NSIMEDIALIST \
NS_IMETHOD GetText(nsAWritableString& aMediaText); \
NS_IMETHOD SetText(nsAReadableString& aMediaText); \
NS_IMETHOD GetText(nsAString& aMediaText); \
NS_IMETHOD SetText(const nsAString& aMediaText); \
NS_IMETHOD MatchesMedium(nsIAtom* aMedium, PRBool* aMatch); \
NS_IMETHOD DropReference(void);
extern NS_EXPORT nsresult
NS_NewMediaList(const nsAReadableString& aMediaText, nsIMediaList** aInstancePtrResult);
NS_NewMediaList(const nsAString& aMediaText, nsIMediaList** aInstancePtrResult);
extern NS_EXPORT nsresult
NS_NewMediaList(nsIMediaList** aInstancePtrResult);

30
content/html/style/src/nsCSSDeclaration.cpp
Просмотреть файл

@ -4013,7 +4013,7 @@ nsCSSDeclaration::RemoveProperty(nsCSSProperty aProperty, nsCSSValue& aValue)
}
nsresult
nsCSSDeclaration::AppendComment(const nsAReadableString& aComment)
nsCSSDeclaration::AppendComment(const nsAString& aComment)
{
return /* NS_ERROR_NOT_IMPLEMENTED, or not any longer that is */ NS_OK;
}
@ -4747,21 +4747,21 @@ nsCSSDeclaration::GetValue(nsCSSProperty aProperty, nsCSSValue& aValue)
nsresult
nsCSSDeclaration::GetValue(const nsAReadableString& aProperty,
nsAWritableString& aValue)
nsCSSDeclaration::GetValue(const nsAString& aProperty,
nsAString& aValue)
{
nsCSSProperty propID = nsCSSProps::LookupProperty(aProperty);
return GetValue(propID, aValue);
}
PRBool nsCSSDeclaration::AppendValueToString(nsCSSProperty aProperty, nsAWritableString& aResult)
PRBool nsCSSDeclaration::AppendValueToString(nsCSSProperty aProperty, nsAString& aResult)
{
nsCSSValue value;
GetValue(aProperty, value);
return AppendValueToString(aProperty, value, aResult);
}
PRBool nsCSSDeclaration::AppendValueToString(nsCSSProperty aProperty, const nsCSSValue& aValue, nsAWritableString& aResult)
PRBool nsCSSDeclaration::AppendValueToString(nsCSSProperty aProperty, const nsCSSValue& aValue, nsAString& aResult)
{
nsCSSUnit unit = aValue.GetUnit();
@ -4968,7 +4968,7 @@ PRBool nsCSSDeclaration::AppendValueToString(nsCSSProperty aProperty, const nsCS
nsresult
nsCSSDeclaration::GetValue(nsCSSProperty aProperty,
nsAWritableString& aValue)
nsAString& aValue)
{
PRBool isImportant = GetValueIsImportant(aProperty);
if (PR_TRUE == isImportant) {
@ -5323,7 +5323,7 @@ nsCSSDeclaration::GetImportantValues()
}
PRBool
nsCSSDeclaration::GetValueIsImportant(const nsAReadableString& aProperty)
nsCSSDeclaration::GetValueIsImportant(const nsAString& aProperty)
{
nsCSSProperty propID = nsCSSProps::LookupProperty(aProperty);
return GetValueIsImportant(propID);
@ -5376,7 +5376,7 @@ nsCSSDeclaration::AllPropertiesSameValue(PRInt32 aFirst, PRInt32 aSecond,
void
nsCSSDeclaration::AppendPropertyAndValueToString(nsCSSProperty aProperty,
nsAWritableString& aString)
nsAString& aString)
{
NS_ASSERTION(aProperty, "null CSS property passed to AppendPropertyAndValueToString.");
aString.Append(NS_ConvertASCIItoUCS2(nsCSSProps::GetStringValue(aProperty))
@ -5386,7 +5386,7 @@ nsCSSDeclaration::AppendPropertyAndValueToString(nsCSSProperty aProperty,
}
void
nsCSSDeclaration::TryBorderShorthand(nsAWritableString & aString,
nsCSSDeclaration::TryBorderShorthand(nsAString & aString,
PRInt32 & aBorderTopWidth,
PRInt32 & aBorderTopStyle,
PRInt32 & aBorderTopColor,
@ -5461,7 +5461,7 @@ nsCSSDeclaration::TryBorderShorthand(nsAWritableString & aString,
}
void
nsCSSDeclaration::TryBorderSideShorthand(nsAWritableString & aString,
nsCSSDeclaration::TryBorderSideShorthand(nsAString & aString,
nsCSSProperty aShorthand,
PRInt32 & aBorderWidth,
PRInt32 & aBorderStyle,
@ -5497,7 +5497,7 @@ nsCSSDeclaration::TryBorderSideShorthand(nsAWritableString & aString,
}
void
nsCSSDeclaration::TryMarginOrPaddingShorthand(nsAWritableString & aString,
nsCSSDeclaration::TryMarginOrPaddingShorthand(nsAString & aString,
nsCSSProperty aShorthand,
PRInt32 & aTop,
PRInt32 & aBottom,
@ -5537,7 +5537,7 @@ nsCSSDeclaration::TryMarginOrPaddingShorthand(nsAWritableString & aString,
}
void
nsCSSDeclaration::TryBackgroundShorthand(nsAWritableString & aString,
nsCSSDeclaration::TryBackgroundShorthand(nsAString & aString,
PRInt32 & aBgColor,
PRInt32 & aBgImage,
PRInt32 & aBgRepeat,
@ -5583,7 +5583,7 @@ nsCSSDeclaration::TryBackgroundShorthand(nsAWritableString & aString,
}
void
nsCSSDeclaration::TryBackgroundPosition(nsAWritableString & aString,
nsCSSDeclaration::TryBackgroundPosition(nsAString & aString,
PRInt32 & aBgPositionX,
PRInt32 & aBgPositionY)
{
@ -5612,7 +5612,7 @@ case _prop: \
break;
nsresult
nsCSSDeclaration::ToString(nsAWritableString& aString)
nsCSSDeclaration::ToString(nsAString& aString)
{
if (nsnull != mOrder) {
PRInt32 count = mOrder->Count();
@ -5930,7 +5930,7 @@ nsCSSDeclaration::Count()
}
nsresult
nsCSSDeclaration::GetNthProperty(PRUint32 aIndex, nsAWritableString& aReturn)
nsCSSDeclaration::GetNthProperty(PRUint32 aIndex, nsAString& aReturn)
{
aReturn.Truncate();
if (nsnull != mOrder && aIndex < (PRUint32)mOrder->Count()) {

28
content/html/style/src/nsCSSDeclaration.h
Просмотреть файл

@ -575,23 +575,23 @@ public:
nsresult AppendValue(nsCSSProperty aProperty, const nsCSSValue& aValue);
nsresult AppendStructValue(nsCSSProperty aProperty, void* aStruct);
nsresult SetValueImportant(nsCSSProperty aProperty);
nsresult AppendComment(const nsAReadableString& aComment);
nsresult AppendComment(const nsAString& aComment);
nsresult RemoveProperty(nsCSSProperty aProperty, nsCSSValue& aValue);
nsresult GetValue(nsCSSProperty aProperty, nsCSSValue& aValue);
nsresult GetValue(nsCSSProperty aProperty, nsAWritableString& aValue);
nsresult GetValue(const nsAReadableString& aProperty, nsAWritableString& aValue);
nsresult GetValue(nsCSSProperty aProperty, nsAString& aValue);
nsresult GetValue(const nsAString& aProperty, nsAString& aValue);
nsCSSDeclaration* GetImportantValues();
PRBool GetValueIsImportant(nsCSSProperty aProperty);
PRBool GetValueIsImportant(const nsAReadableString& aProperty);
PRBool GetValueIsImportant(const nsAString& aProperty);
PRUint32 Count();
nsresult GetNthProperty(PRUint32 aIndex, nsAWritableString& aReturn);
nsresult GetNthProperty(PRUint32 aIndex, nsAString& aReturn);
PRInt32 GetStyleImpact() const;
nsresult ToString(nsAWritableString& aString);
nsresult ToString(nsAString& aString);
nsCSSDeclaration* Clone() const;
@ -605,12 +605,12 @@ protected:
nsresult RemoveProperty(nsCSSProperty aProperty);
private:
PRBool AppendValueToString(nsCSSProperty aProperty, nsAWritableString& aResult);
PRBool AppendValueToString(nsCSSProperty aProperty, const nsCSSValue& aValue, nsAWritableString& aResult);
PRBool AppendValueToString(nsCSSProperty aProperty, nsAString& aResult);
PRBool AppendValueToString(nsCSSProperty aProperty, const nsCSSValue& aValue, nsAString& aResult);
nsCSSDeclaration& operator=(const nsCSSDeclaration& aCopy);
PRBool operator==(const nsCSSDeclaration& aCopy) const;
void TryBorderShorthand(nsAWritableString & aString,
void TryBorderShorthand(nsAString & aString,
PRInt32 & aBorderTopWidth,
PRInt32 & aBorderTopStyle,
PRInt32 & aBorderTopColor,
@ -623,28 +623,28 @@ private:
PRInt32 & aBorderRightWidth,
PRInt32 & aBorderRightStyle,
PRInt32 & aBorderRightColor);
void TryBorderSideShorthand(nsAWritableString & aString,
void TryBorderSideShorthand(nsAString & aString,
nsCSSProperty aShorthand,
PRInt32 & aBorderWidth,
PRInt32 & aBorderStyle,
PRInt32 & aBorderColor);
void TryMarginOrPaddingShorthand(nsAWritableString & aString,
void TryMarginOrPaddingShorthand(nsAString & aString,
nsCSSProperty aShorthand,
PRInt32 & aTop, PRInt32 & aBottom,
PRInt32 & aLeft, PRInt32 & aRight);
void TryBackgroundShorthand(nsAWritableString & aString,
void TryBackgroundShorthand(nsAString & aString,
PRInt32 & aBgColor, PRInt32 & aBgImage,
PRInt32 & aBgRepeat, PRInt32 & aBgAttachment,
PRInt32 & aBgPositionX,
PRInt32 & aBgPositionY);
void TryBackgroundPosition(nsAWritableString & aString,
void TryBackgroundPosition(nsAString & aString,
PRInt32 & aBgPositionX,
PRInt32 & aBgPositionY);
PRBool AllPropertiesSameValue(PRInt32 aFirst, PRInt32 aSecond,
PRInt32 aThird, PRInt32 aFourth);
void AppendPropertyAndValueToString(nsCSSProperty aProperty,
nsAWritableString& aResult);
nsAString& aResult);
protected:
//

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

@ -217,7 +217,7 @@ public:
NS_IMETHOD SetCaseSensitive(PRBool aCaseSensitive);
NS_IMETHOD SetQuirkMode(PRBool aQuirkMode);
NS_IMETHOD SetPreferredSheet(const nsAReadableString& aTitle);
NS_IMETHOD SetPreferredSheet(const nsAString& aTitle);
NS_IMETHOD GetParserFor(nsICSSStyleSheet* aSheet,
nsICSSParser** aParser);
@ -533,7 +533,7 @@ CSSLoaderImpl::SetQuirkMode(PRBool aQuirkMode)
}
NS_IMETHODIMP
CSSLoaderImpl::SetPreferredSheet(const nsAReadableString& aTitle)
CSSLoaderImpl::SetPreferredSheet(const nsAString& aTitle)
{
mPreferredSheet = aTitle;

42
content/html/style/src/nsCSSParser.cpp
Просмотреть файл

@ -162,29 +162,29 @@ public:
nsIURI* aInputURL,
nsICSSStyleSheet*& aResult);
NS_IMETHOD ParseStyleAttribute(const nsAReadableString& aAttributeValue,
nsIURI* aBaseURL,
nsIStyleRule** aResult);
NS_IMETHOD ParseStyleAttribute(const nsAString& aAttributeValue,
nsIURI* aBaseURL,
nsIStyleRule** aResult);
NS_IMETHOD ParseAndAppendDeclaration(const nsAReadableString& aBuffer,
nsIURI* aBaseURL,
nsCSSDeclaration* aDeclaration,
PRBool aParseOnlyOneDecl,
PRInt32* aHint);
NS_IMETHOD ParseAndAppendDeclaration(const nsAString& aBuffer,
nsIURI* aBaseURL,
nsCSSDeclaration* aDeclaration,
PRBool aParseOnlyOneDecl,
PRInt32* aHint);
NS_IMETHOD ParseRule(nsAReadableString& aRule,
NS_IMETHOD ParseRule(const nsAString& aRule,
nsIURI* aBaseURL,
nsISupportsArray** aResult);
NS_IMETHOD ParseProperty(const nsAReadableString& aPropName,
const nsAReadableString& aPropValue,
NS_IMETHOD ParseProperty(const nsAString& aPropName,
const nsAString& aPropValue,
nsIURI* aBaseURL,
nsCSSDeclaration* aDeclaration,
PRInt32* aHint);
NS_IMETHOD GetCharset(/*out*/nsAWritableString &aCharsetDest) const;
NS_IMETHOD GetCharset(/*out*/nsAString &aCharsetDest) const;
// sets the out-param to the current charset, as set by SetCharset
NS_IMETHOD SetCharset(/*in*/ const nsAReadableString &aCharsetSrc);
NS_IMETHOD SetCharset(/*in*/ const nsAString &aCharsetSrc);
// NOTE: SetCharset expects the charset to be the preferred charset
// and it just records the string exactly as passed in (no alias resolution)
void AppendRule(nsICSSRule* aRule);
@ -403,7 +403,7 @@ NS_NewCSSParser(nsICSSParser** aInstancePtrResult)
static void ReportUnexpectedToken(nsCSSScanner *sc,
nsCSSToken& tok,
const nsAReadableString& err)
const nsAString& err)
{
nsAutoString error(err + NS_LITERAL_STRING(" '"));
tok.AppendToString(error);
@ -624,7 +624,7 @@ CSSParserImpl::Parse(nsIUnicharInputStream* aInput,
}
NS_IMETHODIMP
CSSParserImpl::ParseStyleAttribute(const nsAReadableString& aAttributeValue,
CSSParserImpl::ParseStyleAttribute(const nsAString& aAttributeValue,
nsIURI* aBaseURL,
nsIStyleRule** aResult)
{
@ -684,7 +684,7 @@ CSSParserImpl::ParseStyleAttribute(const nsAReadableString& aAttributeValue,
}
NS_IMETHODIMP
CSSParserImpl::ParseAndAppendDeclaration(const nsAReadableString& aBuffer,
CSSParserImpl::ParseAndAppendDeclaration(const nsAString& aBuffer,
nsIURI* aBaseURL,
nsCSSDeclaration* aDeclaration,
PRBool aParseOnlyOneDecl,
@ -745,7 +745,7 @@ CSSParserImpl::ParseAndAppendDeclaration(const nsAReadableString& aBuffer,
}
NS_IMETHODIMP
CSSParserImpl::ParseRule(nsAReadableString& aRule,
CSSParserImpl::ParseRule(const nsAString& aRule,
nsIURI* aBaseURL,
nsISupportsArray** aResult)
{
@ -795,8 +795,8 @@ CSSParserImpl::ParseRule(nsAReadableString& aRule,
}
NS_IMETHODIMP
CSSParserImpl::ParseProperty(const nsAReadableString& aPropName,
const nsAReadableString& aPropValue,
CSSParserImpl::ParseProperty(const nsAString& aPropName,
const nsAString& aPropValue,
nsIURI* aBaseURL,
nsCSSDeclaration* aDeclaration,
PRInt32* aHint)
@ -5298,13 +5298,13 @@ PRBool CSSParserImpl::ParseTextShadow(PRInt32& aErrorCode,
return PR_FALSE;
}
NS_IMETHODIMP CSSParserImpl::GetCharset(/*out*/nsAWritableString &aCharsetDest) const
NS_IMETHODIMP CSSParserImpl::GetCharset(/*out*/nsAString &aCharsetDest) const
{
aCharsetDest = mCharset;
return NS_OK;
}
NS_IMETHODIMP CSSParserImpl::SetCharset(/*in*/ const nsAReadableString &aCharsetSrc)
NS_IMETHODIMP CSSParserImpl::SetCharset(/*in*/ const nsAString &aCharsetSrc)
{
mCharset = aCharsetSrc;
return NS_OK;

20
content/html/style/src/nsCSSRules.cpp
Просмотреть файл

@ -345,7 +345,7 @@ CSSCharsetRuleImpl::GetType(PRUint16* aType)
}
NS_IMETHODIMP
CSSCharsetRuleImpl::GetCssText(nsAWritableString& aCssText)
CSSCharsetRuleImpl::GetCssText(nsAString& aCssText)
{
aCssText.Assign(NS_LITERAL_STRING("@charset \""));
aCssText.Append(mEncoding);
@ -354,7 +354,7 @@ CSSCharsetRuleImpl::GetCssText(nsAWritableString& aCssText)
}
NS_IMETHODIMP
CSSCharsetRuleImpl::SetCssText(const nsAReadableString& aCssText)
CSSCharsetRuleImpl::SetCssText(const nsAString& aCssText)
{
return NS_ERROR_NOT_IMPLEMENTED;
}
@ -633,7 +633,7 @@ CSSImportRuleImpl::GetType(PRUint16* aType)
}
NS_IMETHODIMP
CSSImportRuleImpl::GetCssText(nsAWritableString& aCssText)
CSSImportRuleImpl::GetCssText(nsAString& aCssText)
{
aCssText.Assign(NS_LITERAL_STRING("@import url("));
aCssText.Append(mURLSpec);
@ -651,7 +651,7 @@ CSSImportRuleImpl::GetCssText(nsAWritableString& aCssText)
}
NS_IMETHODIMP
CSSImportRuleImpl::SetCssText(const nsAReadableString& aCssText)
CSSImportRuleImpl::SetCssText(const nsAString& aCssText)
{
return NS_ERROR_NOT_IMPLEMENTED;
}
@ -678,7 +678,7 @@ CSSImportRuleImpl::GetParentRule(nsIDOMCSSRule** aParentRule)
}
NS_IMETHODIMP
CSSImportRuleImpl::GetHref(nsAWritableString & aHref)
CSSImportRuleImpl::GetHref(nsAString & aHref)
{
aHref = mURLSpec;
return NS_OK;
@ -1119,7 +1119,7 @@ CSSMediaRuleImpl::GetType(PRUint16* aType)
}
NS_IMETHODIMP
CSSMediaRuleImpl::GetCssText(nsAWritableString& aCssText)
CSSMediaRuleImpl::GetCssText(nsAString& aCssText)
{
PRUint32 index;
PRUint32 count;
@ -1163,7 +1163,7 @@ CSSMediaRuleImpl::GetCssText(nsAWritableString& aCssText)
}
NS_IMETHODIMP
CSSMediaRuleImpl::SetCssText(const nsAReadableString& aCssText)
CSSMediaRuleImpl::SetCssText(const nsAString& aCssText)
{
return NS_ERROR_NOT_IMPLEMENTED;
}
@ -1216,7 +1216,7 @@ CSSMediaRuleImpl::GetCssRules(nsIDOMCSSRuleList* *aRuleList)
}
NS_IMETHODIMP
CSSMediaRuleImpl::InsertRule(nsAReadableString & aRule, PRUint32 aIndex, PRUint32* _retval)
CSSMediaRuleImpl::InsertRule(const nsAString & aRule, PRUint32 aIndex, PRUint32* _retval)
{
NS_ENSURE_TRUE(mSheet, NS_ERROR_FAILURE);
@ -1470,7 +1470,7 @@ CSSNameSpaceRuleImpl::GetType(PRUint16* aType)
}
NS_IMETHODIMP
CSSNameSpaceRuleImpl::GetCssText(nsAWritableString& aCssText)
CSSNameSpaceRuleImpl::GetCssText(nsAString& aCssText)
{
aCssText.Assign(NS_LITERAL_STRING("@namespace "));
if (mPrefix) {
@ -1486,7 +1486,7 @@ CSSNameSpaceRuleImpl::GetCssText(nsAWritableString& aCssText)
}
NS_IMETHODIMP
CSSNameSpaceRuleImpl::SetCssText(const nsAReadableString& aCssText)
CSSNameSpaceRuleImpl::SetCssText(const nsAString& aCssText)
{
return NS_ERROR_NOT_IMPLEMENTED;
}

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

@ -227,7 +227,7 @@ void nsCSSScanner::Init(nsIUnicharInputStream* aInput, nsIURI* aURI)
#ifdef CSS_REPORT_PARSE_ERRORS
void nsCSSScanner::AddToError(const nsAReadableString& aErrorText)
void nsCSSScanner::AddToError(const nsAString& aErrorText)
{
if (mError.IsEmpty()) {
mErrorLineNumber = mLineNumber;

2
content/html/style/src/nsCSSScanner.h
Просмотреть файл

@ -128,7 +128,7 @@ class nsCSSScanner {
void Init(nsIUnicharInputStream* aInput, nsIURI* aURI);
#ifdef CSS_REPORT_PARSE_ERRORS
void AddToError(const nsAReadableString& aErrorText);
void AddToError(const nsAString& aErrorText);
void OutputError();
void ClearError();
#endif

30
content/html/style/src/nsCSSStruct.cpp
Просмотреть файл

@ -4013,7 +4013,7 @@ nsCSSDeclaration::RemoveProperty(nsCSSProperty aProperty, nsCSSValue& aValue)
}
nsresult
nsCSSDeclaration::AppendComment(const nsAReadableString& aComment)
nsCSSDeclaration::AppendComment(const nsAString& aComment)
{
return /* NS_ERROR_NOT_IMPLEMENTED, or not any longer that is */ NS_OK;
}
@ -4747,21 +4747,21 @@ nsCSSDeclaration::GetValue(nsCSSProperty aProperty, nsCSSValue& aValue)
nsresult
nsCSSDeclaration::GetValue(const nsAReadableString& aProperty,
nsAWritableString& aValue)
nsCSSDeclaration::GetValue(const nsAString& aProperty,
nsAString& aValue)
{
nsCSSProperty propID = nsCSSProps::LookupProperty(aProperty);
return GetValue(propID, aValue);
}
PRBool nsCSSDeclaration::AppendValueToString(nsCSSProperty aProperty, nsAWritableString& aResult)
PRBool nsCSSDeclaration::AppendValueToString(nsCSSProperty aProperty, nsAString& aResult)
{
nsCSSValue value;
GetValue(aProperty, value);
return AppendValueToString(aProperty, value, aResult);
}
PRBool nsCSSDeclaration::AppendValueToString(nsCSSProperty aProperty, const nsCSSValue& aValue, nsAWritableString& aResult)
PRBool nsCSSDeclaration::AppendValueToString(nsCSSProperty aProperty, const nsCSSValue& aValue, nsAString& aResult)
{
nsCSSUnit unit = aValue.GetUnit();
@ -4968,7 +4968,7 @@ PRBool nsCSSDeclaration::AppendValueToString(nsCSSProperty aProperty, const nsCS
nsresult
nsCSSDeclaration::GetValue(nsCSSProperty aProperty,
nsAWritableString& aValue)
nsAString& aValue)
{
PRBool isImportant = GetValueIsImportant(aProperty);
if (PR_TRUE == isImportant) {
@ -5323,7 +5323,7 @@ nsCSSDeclaration::GetImportantValues()
}
PRBool
nsCSSDeclaration::GetValueIsImportant(const nsAReadableString& aProperty)
nsCSSDeclaration::GetValueIsImportant(const nsAString& aProperty)
{
nsCSSProperty propID = nsCSSProps::LookupProperty(aProperty);
return GetValueIsImportant(propID);
@ -5376,7 +5376,7 @@ nsCSSDeclaration::AllPropertiesSameValue(PRInt32 aFirst, PRInt32 aSecond,
void
nsCSSDeclaration::AppendPropertyAndValueToString(nsCSSProperty aProperty,
nsAWritableString& aString)
nsAString& aString)
{
NS_ASSERTION(aProperty, "null CSS property passed to AppendPropertyAndValueToString.");
aString.Append(NS_ConvertASCIItoUCS2(nsCSSProps::GetStringValue(aProperty))
@ -5386,7 +5386,7 @@ nsCSSDeclaration::AppendPropertyAndValueToString(nsCSSProperty aProperty,
}
void
nsCSSDeclaration::TryBorderShorthand(nsAWritableString & aString,
nsCSSDeclaration::TryBorderShorthand(nsAString & aString,
PRInt32 & aBorderTopWidth,
PRInt32 & aBorderTopStyle,
PRInt32 & aBorderTopColor,
@ -5461,7 +5461,7 @@ nsCSSDeclaration::TryBorderShorthand(nsAWritableString & aString,
}
void
nsCSSDeclaration::TryBorderSideShorthand(nsAWritableString & aString,
nsCSSDeclaration::TryBorderSideShorthand(nsAString & aString,
nsCSSProperty aShorthand,
PRInt32 & aBorderWidth,
PRInt32 & aBorderStyle,
@ -5497,7 +5497,7 @@ nsCSSDeclaration::TryBorderSideShorthand(nsAWritableString & aString,
}
void
nsCSSDeclaration::TryMarginOrPaddingShorthand(nsAWritableString & aString,
nsCSSDeclaration::TryMarginOrPaddingShorthand(nsAString & aString,
nsCSSProperty aShorthand,
PRInt32 & aTop,
PRInt32 & aBottom,
@ -5537,7 +5537,7 @@ nsCSSDeclaration::TryMarginOrPaddingShorthand(nsAWritableString & aString,
}
void
nsCSSDeclaration::TryBackgroundShorthand(nsAWritableString & aString,
nsCSSDeclaration::TryBackgroundShorthand(nsAString & aString,
PRInt32 & aBgColor,
PRInt32 & aBgImage,
PRInt32 & aBgRepeat,
@ -5583,7 +5583,7 @@ nsCSSDeclaration::TryBackgroundShorthand(nsAWritableString & aString,
}
void
nsCSSDeclaration::TryBackgroundPosition(nsAWritableString & aString,
nsCSSDeclaration::TryBackgroundPosition(nsAString & aString,
PRInt32 & aBgPositionX,
PRInt32 & aBgPositionY)
{
@ -5612,7 +5612,7 @@ case _prop: \
break;
nsresult
nsCSSDeclaration::ToString(nsAWritableString& aString)
nsCSSDeclaration::ToString(nsAString& aString)
{
if (nsnull != mOrder) {
PRInt32 count = mOrder->Count();
@ -5930,7 +5930,7 @@ nsCSSDeclaration::Count()
}
nsresult
nsCSSDeclaration::GetNthProperty(PRUint32 aIndex, nsAWritableString& aReturn)
nsCSSDeclaration::GetNthProperty(PRUint32 aIndex, nsAString& aReturn)
{
aReturn.Truncate();
if (nsnull != mOrder && aIndex < (PRUint32)mOrder->Count()) {

28
content/html/style/src/nsCSSStruct.h
Просмотреть файл

@ -575,23 +575,23 @@ public:
nsresult AppendValue(nsCSSProperty aProperty, const nsCSSValue& aValue);
nsresult AppendStructValue(nsCSSProperty aProperty, void* aStruct);
nsresult SetValueImportant(nsCSSProperty aProperty);
nsresult AppendComment(const nsAReadableString& aComment);
nsresult AppendComment(const nsAString& aComment);
nsresult RemoveProperty(nsCSSProperty aProperty, nsCSSValue& aValue);
nsresult GetValue(nsCSSProperty aProperty, nsCSSValue& aValue);
nsresult GetValue(nsCSSProperty aProperty, nsAWritableString& aValue);
nsresult GetValue(const nsAReadableString& aProperty, nsAWritableString& aValue);
nsresult GetValue(nsCSSProperty aProperty, nsAString& aValue);
nsresult GetValue(const nsAString& aProperty, nsAString& aValue);
nsCSSDeclaration* GetImportantValues();
PRBool GetValueIsImportant(nsCSSProperty aProperty);
PRBool GetValueIsImportant(const nsAReadableString& aProperty);
PRBool GetValueIsImportant(const nsAString& aProperty);
PRUint32 Count();
nsresult GetNthProperty(PRUint32 aIndex, nsAWritableString& aReturn);
nsresult GetNthProperty(PRUint32 aIndex, nsAString& aReturn);
PRInt32 GetStyleImpact() const;
nsresult ToString(nsAWritableString& aString);
nsresult ToString(nsAString& aString);
nsCSSDeclaration* Clone() const;
@ -605,12 +605,12 @@ protected:
nsresult RemoveProperty(nsCSSProperty aProperty);
private:
PRBool AppendValueToString(nsCSSProperty aProperty, nsAWritableString& aResult);
PRBool AppendValueToString(nsCSSProperty aProperty, const nsCSSValue& aValue, nsAWritableString& aResult);
PRBool AppendValueToString(nsCSSProperty aProperty, nsAString& aResult);
PRBool AppendValueToString(nsCSSProperty aProperty, const nsCSSValue& aValue, nsAString& aResult);
nsCSSDeclaration& operator=(const nsCSSDeclaration& aCopy);
PRBool operator==(const nsCSSDeclaration& aCopy) const;
void TryBorderShorthand(nsAWritableString & aString,
void TryBorderShorthand(nsAString & aString,
PRInt32 & aBorderTopWidth,
PRInt32 & aBorderTopStyle,
PRInt32 & aBorderTopColor,
@ -623,28 +623,28 @@ private:
PRInt32 & aBorderRightWidth,
PRInt32 & aBorderRightStyle,
PRInt32 & aBorderRightColor);
void TryBorderSideShorthand(nsAWritableString & aString,
void TryBorderSideShorthand(nsAString & aString,
nsCSSProperty aShorthand,
PRInt32 & aBorderWidth,
PRInt32 & aBorderStyle,
PRInt32 & aBorderColor);
void TryMarginOrPaddingShorthand(nsAWritableString & aString,
void TryMarginOrPaddingShorthand(nsAString & aString,
nsCSSProperty aShorthand,
PRInt32 & aTop, PRInt32 & aBottom,
PRInt32 & aLeft, PRInt32 & aRight);
void TryBackgroundShorthand(nsAWritableString & aString,
void TryBackgroundShorthand(nsAString & aString,
PRInt32 & aBgColor, PRInt32 & aBgImage,
PRInt32 & aBgRepeat, PRInt32 & aBgAttachment,
PRInt32 & aBgPositionX,
PRInt32 & aBgPositionY);
void TryBackgroundPosition(nsAWritableString & aString,
void TryBackgroundPosition(nsAString & aString,
PRInt32 & aBgPositionX,
PRInt32 & aBgPositionY);
PRBool AllPropertiesSameValue(PRInt32 aFirst, PRInt32 aSecond,
PRInt32 aThird, PRInt32 aFourth);
void AppendPropertyAndValueToString(nsCSSProperty aProperty,
nsAWritableString& aResult);
nsAString& aResult);
protected:
//

32
content/html/style/src/nsCSSStyleRule.cpp
Просмотреть файл

@ -695,7 +695,7 @@ static PRBool IsPseudoElement(nsIAtom* aAtom)
return PR_FALSE;
}
void nsCSSSelector::AppendNegationToString(nsAWritableString& aString)
void nsCSSSelector::AppendNegationToString(nsAString& aString)
{
aString.Append(NS_LITERAL_STRING(":not("));
}
@ -704,7 +704,7 @@ void nsCSSSelector::AppendNegationToString(nsAWritableString& aString)
// Builds the textual representation of a selector. Called by DOM 2 CSS
// StyleRule:selectorText
//
nsresult nsCSSSelector::ToString( nsAWritableString& aString, nsICSSStyleSheet* aSheet, PRBool aIsPseudoElem,
nsresult nsCSSSelector::ToString( nsAString& aString, nsICSSStyleSheet* aSheet, PRBool aIsPseudoElem,
PRInt8 aNegatedIndex) const
{
const PRUnichar* temp;
@ -1068,8 +1068,8 @@ public:
DOMCSSDeclarationImpl(nsICSSStyleRule *aRule);
~DOMCSSDeclarationImpl(void);
NS_IMETHOD RemoveProperty(const nsAReadableString& aPropertyName,
nsAWritableString& aReturn);
NS_IMETHOD RemoveProperty(const nsAString& aPropertyName,
nsAString& aReturn);
virtual void DropReference(void);
virtual nsresult GetCSSDeclaration(nsCSSDeclaration **aDecl,
@ -1081,9 +1081,9 @@ public:
nsIURI** aURI,
nsICSSLoader** aCSSLoader,
nsICSSParser** aCSSParser);
virtual nsresult ParsePropertyValue(const nsAReadableString& aPropName,
const nsAReadableString& aPropValue);
virtual nsresult ParseDeclaration(const nsAReadableString& aDecl,
virtual nsresult ParsePropertyValue(const nsAString& aPropName,
const nsAString& aPropValue);
virtual nsresult ParseDeclaration(const nsAString& aDecl,
PRBool aParseOnlyOneDecl,
PRBool aClearOldDecl);
virtual nsresult GetParent(nsISupports **aParent);
@ -1109,8 +1109,8 @@ DOMCSSDeclarationImpl::~DOMCSSDeclarationImpl(void)
}
NS_IMETHODIMP
DOMCSSDeclarationImpl::RemoveProperty(const nsAReadableString& aPropertyName,
nsAWritableString& aReturn)
DOMCSSDeclarationImpl::RemoveProperty(const nsAString& aPropertyName,
nsAString& aReturn)
{
aReturn.Truncate();
@ -1233,8 +1233,8 @@ DOMCSSDeclarationImpl::GetCSSParsingEnvironment(nsICSSStyleRule* aRule,
}
nsresult
DOMCSSDeclarationImpl::ParsePropertyValue(const nsAReadableString& aPropName,
const nsAReadableString& aPropValue)
DOMCSSDeclarationImpl::ParsePropertyValue(const nsAString& aPropName,
const nsAString& aPropValue)
{
nsCSSDeclaration* decl;
nsresult result = GetCSSDeclaration(&decl, PR_TRUE);
@ -1279,7 +1279,7 @@ DOMCSSDeclarationImpl::ParsePropertyValue(const nsAReadableString& aPropName,
}
nsresult
DOMCSSDeclarationImpl::ParseDeclaration(const nsAReadableString& aDecl,
DOMCSSDeclarationImpl::ParseDeclaration(const nsAString& aDecl,
PRBool aParseOnlyOneDecl,
PRBool aClearOldDecl)
{
@ -2500,7 +2500,7 @@ CSSStyleRuleImpl::GetType(PRUint16* aType)
}
NS_IMETHODIMP
CSSStyleRuleImpl::GetCssText(nsAWritableString& aCssText)
CSSStyleRuleImpl::GetCssText(nsAString& aCssText)
{
mSelector.ToString( aCssText, mSheet, IsPseudoElement(mSelector.mTag),
0 );
@ -2519,7 +2519,7 @@ CSSStyleRuleImpl::GetCssText(nsAWritableString& aCssText)
}
NS_IMETHODIMP
CSSStyleRuleImpl::SetCssText(const nsAReadableString& aCssText)
CSSStyleRuleImpl::SetCssText(const nsAString& aCssText)
{
// XXX TBI - need to re-parse rule & declaration
return NS_OK;
@ -2546,14 +2546,14 @@ CSSStyleRuleImpl::GetParentRule(nsIDOMCSSRule** aParentRule)
}
NS_IMETHODIMP
CSSStyleRuleImpl::GetSelectorText(nsAWritableString& aSelectorText)
CSSStyleRuleImpl::GetSelectorText(nsAString& aSelectorText)
{
mSelector.ToString( aSelectorText, mSheet, IsPseudoElement(mSelector.mTag), 0 );
return NS_OK;
}
NS_IMETHODIMP
CSSStyleRuleImpl::SetSelectorText(const nsAReadableString& aSelectorText)
CSSStyleRuleImpl::SetSelectorText(const nsAString& aSelectorText)
{
// XXX TBI - get a parser and re-parse the selectors,
// XXX then need to re-compute the cascade

36
content/html/style/src/nsCSSStyleSheet.cpp
Просмотреть файл

@ -820,7 +820,7 @@ public:
NS_IMETHOD AppendMedium(nsIAtom* aMedium);
NS_IMETHOD ClearMedia(void);
NS_IMETHOD DeleteRuleFromGroup(nsICSSGroupRule* aGroup, PRUint32 aIndex);
NS_IMETHOD InsertRuleIntoGroup(nsAReadableString& aRule, nsICSSGroupRule* aGroup, PRUint32 aIndex, PRUint32* _retval);
NS_IMETHOD InsertRuleIntoGroup(const nsAString& aRule, nsICSSGroupRule* aGroup, PRUint32 aIndex, PRUint32* _retval);
NS_IMETHOD GetEnabled(PRBool& aEnabled) const;
NS_IMETHOD SetEnabled(PRBool aEnabled);
@ -1038,8 +1038,8 @@ class DOMMediaListImpl : public nsIDOMMediaList,
private:
nsresult BeginMediaChange(void);
nsresult EndMediaChange(void);
nsresult Delete(nsAReadableString & aOldMedium);
nsresult Append(nsAReadableString & aOldMedium);
nsresult Delete(const nsAString & aOldMedium);
nsresult Append(const nsAString & aOldMedium);
nsCOMPtr<nsISupportsArray> mArray;
// not refcounted; sheet will let us know when it goes away
@ -1082,7 +1082,7 @@ NS_NewMediaList(nsIMediaList** aInstancePtrResult) {
}
nsresult
NS_NewMediaList(const nsAReadableString& aMediaText, nsIMediaList** aInstancePtrResult) {
NS_NewMediaList(const nsAString& aMediaText, nsIMediaList** aInstancePtrResult) {
nsresult rv;
NS_ASSERTION(aInstancePtrResult, "Null out param.");
@ -1114,7 +1114,7 @@ nsresult NS_NewMediaList(nsISupportsArray* aArray, nsICSSStyleSheet* aSheet, nsI
}
NS_IMETHODIMP
DOMMediaListImpl::GetText(nsAWritableString& aMediaText)
DOMMediaListImpl::GetText(nsAString& aMediaText)
{
aMediaText.Truncate();
@ -1141,7 +1141,7 @@ DOMMediaListImpl::GetText(nsAWritableString& aMediaText)
}
NS_IMETHODIMP
DOMMediaListImpl::SetText(const nsAReadableString& aMediaText)
DOMMediaListImpl::SetText(const nsAString& aMediaText)
{
nsresult rv = Clear();
NS_ENSURE_SUCCESS(rv, rv);
@ -1202,13 +1202,13 @@ DOMMediaListImpl::DropReference(void)
}
NS_IMETHODIMP
DOMMediaListImpl::GetMediaText(nsAWritableString& aMediaText)
DOMMediaListImpl::GetMediaText(nsAString& aMediaText)
{
return GetText(aMediaText);
}
NS_IMETHODIMP
DOMMediaListImpl::SetMediaText(nsAReadableString& aMediaText)
DOMMediaListImpl::SetMediaText(const nsAString& aMediaText)
{
nsresult rv;
rv = BeginMediaChange();
@ -1239,7 +1239,7 @@ DOMMediaListImpl::GetLength(PRUint32* aLength)
}
NS_IMETHODIMP
DOMMediaListImpl::Item(PRUint32 aIndex, nsAWritableString& aReturn)
DOMMediaListImpl::Item(PRUint32 aIndex, nsAString& aReturn)
{
nsCOMPtr<nsISupports> tmp(dont_AddRef(ElementAt(aIndex)));
@ -1258,7 +1258,7 @@ DOMMediaListImpl::Item(PRUint32 aIndex, nsAWritableString& aReturn)
}
NS_IMETHODIMP
DOMMediaListImpl::DeleteMedium(const nsAReadableString& aOldMedium)
DOMMediaListImpl::DeleteMedium(const nsAString& aOldMedium)
{
nsresult rv;
rv = BeginMediaChange();
@ -1274,7 +1274,7 @@ DOMMediaListImpl::DeleteMedium(const nsAReadableString& aOldMedium)
}
NS_IMETHODIMP
DOMMediaListImpl::AppendMedium(const nsAReadableString& aNewMedium)
DOMMediaListImpl::AppendMedium(const nsAString& aNewMedium)
{
nsresult rv;
rv = BeginMediaChange();
@ -1290,7 +1290,7 @@ DOMMediaListImpl::AppendMedium(const nsAReadableString& aNewMedium)
}
nsresult
DOMMediaListImpl::Delete(const nsAReadableString& aOldMedium)
DOMMediaListImpl::Delete(const nsAString& aOldMedium)
{
if (aOldMedium.IsEmpty())
return NS_ERROR_DOM_NOT_FOUND_ERR;
@ -1310,7 +1310,7 @@ DOMMediaListImpl::Delete(const nsAReadableString& aOldMedium)
}
nsresult
DOMMediaListImpl::Append(const nsAReadableString& aNewMedium)
DOMMediaListImpl::Append(const nsAString& aNewMedium)
{
if (aNewMedium.IsEmpty())
return NS_ERROR_DOM_NOT_FOUND_ERR;
@ -2641,7 +2641,7 @@ CSSStyleSheetImpl::SetModified(PRBool aModified)
// nsIDOMStyleSheet interface
NS_IMETHODIMP
CSSStyleSheetImpl::GetType(nsAWritableString& aType)
CSSStyleSheetImpl::GetType(nsAString& aType)
{
aType.Assign(NS_LITERAL_STRING("text/css"));
return NS_OK;
@ -2693,7 +2693,7 @@ CSSStyleSheetImpl::GetParentStyleSheet(nsIDOMStyleSheet** aParentStyleSheet)
}
NS_IMETHODIMP
CSSStyleSheetImpl::GetHref(nsAWritableString& aHref)
CSSStyleSheetImpl::GetHref(nsAString& aHref)
{
if (mInner && mInner->mURL) {
nsCAutoString str;
@ -2715,7 +2715,7 @@ CSSStyleSheetImpl::GetTitle(nsString& aTitle) const
}
NS_IMETHODIMP
CSSStyleSheetImpl::GetTitle(nsAWritableString& aTitle)
CSSStyleSheetImpl::GetTitle(nsAString& aTitle)
{
aTitle.Assign(mTitle);
return NS_OK;
@ -2772,7 +2772,7 @@ CSSStyleSheetImpl::GetCssRules(nsIDOMCSSRuleList** aCssRules)
}
NS_IMETHODIMP
CSSStyleSheetImpl::InsertRule(const nsAReadableString& aRule,
CSSStyleSheetImpl::InsertRule(const nsAString& aRule,
PRUint32 aIndex,
PRUint32* aReturn)
{
@ -3032,7 +3032,7 @@ CSSStyleSheetImpl::DeleteRuleFromGroup(nsICSSGroupRule* aGroup, PRUint32 aIndex)
}
NS_IMETHODIMP
CSSStyleSheetImpl::InsertRuleIntoGroup(nsAReadableString & aRule, nsICSSGroupRule* aGroup, PRUint32 aIndex, PRUint32* _retval)
CSSStyleSheetImpl::InsertRuleIntoGroup(const nsAString & aRule, nsICSSGroupRule* aGroup, PRUint32 aIndex, PRUint32* _retval)
{
nsresult result;
// check that the group actually belongs to this sheet!

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

@ -71,7 +71,7 @@ nsCSSValue::nsCSSValue(float aValue, nsCSSUnit aUnit)
}
}
nsCSSValue::nsCSSValue(const nsAReadableString& aValue, nsCSSUnit aUnit)
nsCSSValue::nsCSSValue(const nsAString& aValue, nsCSSUnit aUnit)
: mUnit(aUnit)
{
NS_ASSERTION((eCSSUnit_String <= aUnit) && (aUnit <= eCSSUnit_Counters), "not a string value");
@ -171,7 +171,7 @@ void nsCSSValue::SetIntValue(PRInt32 aValue, nsCSSUnit aUnit)
}
}
void nsCSSValue::SetStringValue(const nsAReadableString& aValue,
void nsCSSValue::SetStringValue(const nsAString& aValue,
nsCSSUnit aUnit)
{
NS_ASSERTION((eCSSUnit_String <= aUnit) && (aUnit <= eCSSUnit_Counters), "not a string unit");
@ -219,7 +219,7 @@ void nsCSSValue::SetNormalValue(void)
mUnit = eCSSUnit_Normal;
}
void nsCSSValue::AppendToString(nsAWritableString& aBuffer,
void nsCSSValue::AppendToString(nsAString& aBuffer,
nsCSSProperty aPropID) const
{
if (eCSSUnit_Null == mUnit) {
@ -345,7 +345,7 @@ void nsCSSValue::AppendToString(nsAWritableString& aBuffer,
aBuffer.Append(NS_LITERAL_STRING(" "));
}
void nsCSSValue::ToString(nsAWritableString& aBuffer,
void nsCSSValue::ToString(nsAString& aBuffer,
nsCSSProperty aPropID) const
{
aBuffer.Truncate();

12
content/html/style/src/nsCSSValue.h
Просмотреть файл

@ -126,7 +126,7 @@ public:
nsCSSValue(PRInt32 aValue, nsCSSUnit aUnit);
nsCSSValue(float aValue, nsCSSUnit aUnit);
nsCSSValue(const nsAReadableString& aValue, nsCSSUnit aUnit);
nsCSSValue(const nsAString& aValue, nsCSSUnit aUnit);
nsCSSValue(nscolor aValue);
nsCSSValue(const nsCSSValue& aCopy);
~nsCSSValue(void)
@ -156,7 +156,7 @@ public:
PRInt32 GetIntValue(void) const;
float GetPercentValue(void) const;
float GetFloatValue(void) const;
nsAWritableString& GetStringValue(nsAWritableString& aBuffer) const;
nsAString& GetStringValue(nsAString& aBuffer) const;
nscolor GetColorValue(void) const;
nscoord GetLengthTwips(void) const
{
@ -224,7 +224,7 @@ public:
}
}
void SetStringValue(const nsAReadableString& aValue, nsCSSUnit aUnit);
void SetStringValue(const nsAString& aValue, nsCSSUnit aUnit);
void SetColorValue(nscolor aValue);
void SetAutoValue(void);
void SetInheritValue(void);
@ -233,8 +233,8 @@ public:
void SetNormalValue(void);
// debugging methods only
void AppendToString(nsAWritableString& aBuffer, nsCSSProperty aPropID = eCSSProperty_UNKNOWN) const;
void ToString(nsAWritableString& aBuffer, nsCSSProperty aPropID = eCSSProperty_UNKNOWN) const;
void AppendToString(nsAString& aBuffer, nsCSSProperty aPropID = eCSSProperty_UNKNOWN) const;
void ToString(nsAString& aBuffer, nsCSSProperty aPropID = eCSSProperty_UNKNOWN) const;
protected:
nsCSSUnit mUnit;
@ -275,7 +275,7 @@ inline float nsCSSValue::GetFloatValue(void) const
return 0.0f;
}
inline nsAWritableString& nsCSSValue::GetStringValue(nsAWritableString& aBuffer) const
inline nsAString& nsCSSValue::GetStringValue(nsAString& aBuffer) const
{
NS_ASSERTION((eCSSUnit_String <= mUnit) && (mUnit <= eCSSUnit_Counters), "not a string value");
aBuffer.Truncate();

252
content/html/style/src/nsComputedDOMStyle.cpp
Просмотреть файл

@ -210,7 +210,7 @@ NS_IMPL_RELEASE(nsComputedDOMStyle);
NS_IMETHODIMP
nsComputedDOMStyle::Init(nsIDOMElement *aElement,
const nsAReadableString& aPseudoElt,
const nsAString& aPseudoElt,
nsIPresShell *aPresShell)
{
NS_ENSURE_ARG_POINTER(aElement);
@ -241,7 +241,7 @@ nsComputedDOMStyle::Init(nsIDOMElement *aElement,
}
NS_IMETHODIMP
nsComputedDOMStyle::GetCssText(nsAWritableString& aCssText)
nsComputedDOMStyle::GetCssText(nsAString& aCssText)
{
aCssText.Truncate();
return NS_OK;
@ -249,7 +249,7 @@ nsComputedDOMStyle::GetCssText(nsAWritableString& aCssText)
NS_IMETHODIMP
nsComputedDOMStyle::SetCssText(const nsAReadableString& aCssText)
nsComputedDOMStyle::SetCssText(const nsAString& aCssText)
{
return NS_ERROR_DOM_NO_MODIFICATION_ALLOWED_ERR;
}
@ -275,8 +275,8 @@ nsComputedDOMStyle::GetParentRule(nsIDOMCSSRule** aParentRule)
NS_IMETHODIMP
nsComputedDOMStyle::GetPropertyValue(const nsAReadableString& aPropertyName,
nsAWritableString& aReturn)
nsComputedDOMStyle::GetPropertyValue(const nsAString& aPropertyName,
nsAString& aReturn)
{
nsCOMPtr<nsIDOMCSSValue> val;
@ -294,7 +294,7 @@ nsComputedDOMStyle::GetPropertyValue(const nsAReadableString& aPropertyName,
NS_IMETHODIMP
nsComputedDOMStyle::GetPropertyCSSValue(const nsAReadableString& aPropertyName,
nsComputedDOMStyle::GetPropertyCSSValue(const nsAString& aPropertyName,
nsIDOMCSSValue** aReturn)
{
NS_ENSURE_ARG_POINTER(aReturn);
@ -512,16 +512,16 @@ nsComputedDOMStyle::GetPropertyCSSValue(const nsAReadableString& aPropertyName,
NS_IMETHODIMP
nsComputedDOMStyle::RemoveProperty(const nsAReadableString& aPropertyName,
nsAWritableString& aReturn)
nsComputedDOMStyle::RemoveProperty(const nsAString& aPropertyName,
nsAString& aReturn)
{
return NS_ERROR_DOM_NO_MODIFICATION_ALLOWED_ERR;
}
NS_IMETHODIMP
nsComputedDOMStyle::GetPropertyPriority(const nsAReadableString& aPropertyName,
nsAWritableString& aReturn)
nsComputedDOMStyle::GetPropertyPriority(const nsAString& aPropertyName,
nsAString& aReturn)
{
aReturn.Truncate();
return NS_OK;
@ -529,16 +529,16 @@ nsComputedDOMStyle::GetPropertyPriority(const nsAReadableString& aPropertyName,
NS_IMETHODIMP
nsComputedDOMStyle::SetProperty(const nsAReadableString& aPropertyName,
const nsAReadableString& aValue,
const nsAReadableString& aPriority)
nsComputedDOMStyle::SetProperty(const nsAString& aPropertyName,
const nsAString& aValue,
const nsAString& aPriority)
{
return NS_ERROR_DOM_NO_MODIFICATION_ALLOWED_ERR;
}
NS_IMETHODIMP
nsComputedDOMStyle::Item(PRUint32 aIndex, nsAWritableString& aReturn)
nsComputedDOMStyle::Item(PRUint32 aIndex, nsAString& aReturn)
{
PRUint32 length;
GetLength(&length);
@ -555,43 +555,43 @@ nsComputedDOMStyle::Item(PRUint32 aIndex, nsAWritableString& aReturn)
#if 0
NS_IMETHODIMP
nsComputedDOMStyle::GetAzimuth(nsAWritableString& aAzimuth)
nsComputedDOMStyle::GetAzimuth(nsAString& aAzimuth)
{
return NS_ERROR_DOM_NOT_SUPPORTED_ERR;
}
NS_IMETHODIMP
nsComputedDOMStyle::GetBackground(nsAWritableString& aBackground)
nsComputedDOMStyle::GetBackground(nsAString& aBackground)
{
return NS_ERROR_DOM_NOT_SUPPORTED_ERR;
}
NS_IMETHODIMP
nsComputedDOMStyle::GetBackgroundAttachment(nsAWritableString& aBackgroundAttachment)
nsComputedDOMStyle::GetBackgroundAttachment(nsAString& aBackgroundAttachment)
{
return NS_ERROR_DOM_NOT_SUPPORTED_ERR;
}
NS_IMETHODIMP
nsComputedDOMStyle::GetBackgroundColor(nsAWritableString& aBackgroundColor)
nsComputedDOMStyle::GetBackgroundColor(nsAString& aBackgroundColor)
{
return NS_ERROR_DOM_NOT_SUPPORTED_ERR;
}
NS_IMETHODIMP
nsComputedDOMStyle::GetBackgroundImage(nsAWritableString& aBackgroundImage)
nsComputedDOMStyle::GetBackgroundImage(nsAString& aBackgroundImage)
{
return NS_ERROR_DOM_NOT_SUPPORTED_ERR;
}
NS_IMETHODIMP
nsComputedDOMStyle::GetBackgroundPosition(nsAWritableString& aBackgroundPosition)
nsComputedDOMStyle::GetBackgroundPosition(nsAString& aBackgroundPosition)
{
return NS_ERROR_DOM_NOT_SUPPORTED_ERR;
}
NS_IMETHODIMP
nsComputedDOMStyle::GetBackgroundRepeat(nsAWritableString& aBackgroundRepeat)
nsComputedDOMStyle::GetBackgroundRepeat(nsAString& aBackgroundRepeat)
{
return NS_ERROR_DOM_NOT_SUPPORTED_ERR;
}
@ -670,133 +670,133 @@ nsComputedDOMStyle::GetCssFloat(nsIFrame *aFrame,
#if 0
NS_IMETHODIMP
nsComputedDOMStyle::GetBorder(nsAWritableString& aBorder)
nsComputedDOMStyle::GetBorder(nsAString& aBorder)
{
return NS_ERROR_DOM_NOT_SUPPORTED_ERR;
}
NS_IMETHODIMP
nsComputedDOMStyle::GetBorderCollapse(nsAWritableString& aBorderCollapse)
nsComputedDOMStyle::GetBorderCollapse(nsAString& aBorderCollapse)
{
return NS_ERROR_DOM_NOT_SUPPORTED_ERR;
}
NS_IMETHODIMP
nsComputedDOMStyle::GetBorderColor(nsAWritableString& aBorderColor)
nsComputedDOMStyle::GetBorderColor(nsAString& aBorderColor)
{
return NS_ERROR_DOM_NOT_SUPPORTED_ERR;
}
NS_IMETHODIMP
nsComputedDOMStyle::GetBorderSpacing(nsAWritableString& aBorderSpacing)
nsComputedDOMStyle::GetBorderSpacing(nsAString& aBorderSpacing)
{
return NS_ERROR_DOM_NOT_SUPPORTED_ERR;
}
NS_IMETHODIMP
nsComputedDOMStyle::GetBorderStyle(nsAWritableString& aBorderStyle)
nsComputedDOMStyle::GetBorderStyle(nsAString& aBorderStyle)
{
return NS_ERROR_DOM_NOT_SUPPORTED_ERR;
}
NS_IMETHODIMP
nsComputedDOMStyle::GetBorderTop(nsAWritableString& aBorderTop)
nsComputedDOMStyle::GetBorderTop(nsAString& aBorderTop)
{
return NS_ERROR_DOM_NOT_SUPPORTED_ERR;
}
NS_IMETHODIMP
nsComputedDOMStyle::GetBorderRight(nsAWritableString& aBorderRight)
nsComputedDOMStyle::GetBorderRight(nsAString& aBorderRight)
{
return NS_ERROR_DOM_NOT_SUPPORTED_ERR;
}
NS_IMETHODIMP
nsComputedDOMStyle::GetBorderBottom(nsAWritableString& aBorderBottom)
nsComputedDOMStyle::GetBorderBottom(nsAString& aBorderBottom)
{
return NS_ERROR_DOM_NOT_SUPPORTED_ERR;
}
NS_IMETHODIMP
nsComputedDOMStyle::GetBorderLeft(nsAWritableString& aBorderLeft)
nsComputedDOMStyle::GetBorderLeft(nsAString& aBorderLeft)
{
return NS_ERROR_DOM_NOT_SUPPORTED_ERR;
}
NS_IMETHODIMP
nsComputedDOMStyle::GetBorderTopColor(nsAWritableString& aBorderTopColor)
nsComputedDOMStyle::GetBorderTopColor(nsAString& aBorderTopColor)
{
return NS_ERROR_DOM_NOT_SUPPORTED_ERR;
}
NS_IMETHODIMP
nsComputedDOMStyle::GetBorderRightColor(nsAWritableString& aBorderRightColor)
nsComputedDOMStyle::GetBorderRightColor(nsAString& aBorderRightColor)
{
return NS_ERROR_DOM_NOT_SUPPORTED_ERR;
}
NS_IMETHODIMP
nsComputedDOMStyle::GetBorderBottomColor(nsAWritableString& aBorderBottomColor)
nsComputedDOMStyle::GetBorderBottomColor(nsAString& aBorderBottomColor)
{
return NS_ERROR_DOM_NOT_SUPPORTED_ERR;
}
NS_IMETHODIMP
nsComputedDOMStyle::GetBorderLeftColor(nsAWritableString& aBorderLeftColor)
nsComputedDOMStyle::GetBorderLeftColor(nsAString& aBorderLeftColor)
{
return NS_ERROR_DOM_NOT_SUPPORTED_ERR;
}
NS_IMETHODIMP
nsComputedDOMStyle::GetBorderTopStyle(nsAWritableString& aBorderTopStyle)
nsComputedDOMStyle::GetBorderTopStyle(nsAString& aBorderTopStyle)
{
return NS_ERROR_DOM_NOT_SUPPORTED_ERR;
}
NS_IMETHODIMP
nsComputedDOMStyle::GetBorderRightStyle(nsAWritableString& aBorderRightStyle)
nsComputedDOMStyle::GetBorderRightStyle(nsAString& aBorderRightStyle)
{
return NS_ERROR_DOM_NOT_SUPPORTED_ERR;
}
NS_IMETHODIMP
nsComputedDOMStyle::GetBorderBottomStyle(nsAWritableString& aBorderBottomStyle)
nsComputedDOMStyle::GetBorderBottomStyle(nsAString& aBorderBottomStyle)
{
return NS_ERROR_DOM_NOT_SUPPORTED_ERR;
}
NS_IMETHODIMP
nsComputedDOMStyle::GetBorderLeftStyle(nsAWritableString& aBorderLeftStyle)
nsComputedDOMStyle::GetBorderLeftStyle(nsAString& aBorderLeftStyle)
{
return NS_ERROR_DOM_NOT_SUPPORTED_ERR;
}
NS_IMETHODIMP
nsComputedDOMStyle::GetBorderTopWidth(nsAWritableString& aBorderTopWidth)
nsComputedDOMStyle::GetBorderTopWidth(nsAString& aBorderTopWidth)
{
return NS_ERROR_DOM_NOT_SUPPORTED_ERR;
}
NS_IMETHODIMP
nsComputedDOMStyle::GetBorderRightWidth(nsAWritableString& aBorderRightWidth)
nsComputedDOMStyle::GetBorderRightWidth(nsAString& aBorderRightWidth)
{
return NS_ERROR_DOM_NOT_SUPPORTED_ERR;
}
NS_IMETHODIMP
nsComputedDOMStyle::GetBorderBottomWidth(nsAWritableString& aBorderBottomWidth)
nsComputedDOMStyle::GetBorderBottomWidth(nsAString& aBorderBottomWidth)
{
return NS_ERROR_DOM_NOT_SUPPORTED_ERR;
}
NS_IMETHODIMP
nsComputedDOMStyle::GetBorderLeftWidth(nsAWritableString& aBorderLeftWidth)
nsComputedDOMStyle::GetBorderLeftWidth(nsAString& aBorderLeftWidth)
{
return NS_ERROR_DOM_NOT_SUPPORTED_ERR;
}
NS_IMETHODIMP
nsComputedDOMStyle::GetBorderWidth(nsAWritableString& aBorderWidth)
nsComputedDOMStyle::GetBorderWidth(nsAString& aBorderWidth)
{
return NS_ERROR_DOM_NOT_SUPPORTED_ERR;
}
@ -2060,79 +2060,79 @@ nsComputedDOMStyle::GetCursor(nsIFrame *aFrame,
#if 0
NS_IMETHODIMP
nsComputedDOMStyle::GetCaptionSide(nsAWritableString& aCaptionSide)
nsComputedDOMStyle::GetCaptionSide(nsAString& aCaptionSide)
{
return NS_ERROR_DOM_NOT_SUPPORTED_ERR;
}
NS_IMETHODIMP
nsComputedDOMStyle::GetClear(nsAWritableString& aClear)
nsComputedDOMStyle::GetClear(nsAString& aClear)
{
return NS_ERROR_DOM_NOT_SUPPORTED_ERR;
}
NS_IMETHODIMP
nsComputedDOMStyle::GetClip(nsAWritableString& aClip)
nsComputedDOMStyle::GetClip(nsAString& aClip)
{
return NS_ERROR_DOM_NOT_SUPPORTED_ERR;
}
NS_IMETHODIMP
nsComputedDOMStyle::GetColor(nsAWritableString& aColor)
nsComputedDOMStyle::GetColor(nsAString& aColor)
{
return NS_ERROR_DOM_NOT_SUPPORTED_ERR;
}
NS_IMETHODIMP
nsComputedDOMStyle::GetContent(nsAWritableString& aContent)
nsComputedDOMStyle::GetContent(nsAString& aContent)
{
return NS_ERROR_DOM_NOT_SUPPORTED_ERR;
}
NS_IMETHODIMP
nsComputedDOMStyle::GetCounterIncrement(nsAWritableString& aCounterIncrement)
nsComputedDOMStyle::GetCounterIncrement(nsAString& aCounterIncrement)
{
return NS_ERROR_DOM_NOT_SUPPORTED_ERR;
}
NS_IMETHODIMP
nsComputedDOMStyle::GetCounterReset(nsAWritableString& aCounterReset)
nsComputedDOMStyle::GetCounterReset(nsAString& aCounterReset)
{
return NS_ERROR_DOM_NOT_SUPPORTED_ERR;
}
NS_IMETHODIMP
nsComputedDOMStyle::GetCssFloat(nsAWritableString& aFloat)
nsComputedDOMStyle::GetCssFloat(nsAString& aFloat)
{
return NS_ERROR_DOM_NOT_SUPPORTED_ERR;
}
NS_IMETHODIMP
nsComputedDOMStyle::GetCue(nsAWritableString& aCue)
nsComputedDOMStyle::GetCue(nsAString& aCue)
{
return NS_ERROR_DOM_NOT_SUPPORTED_ERR;
}
NS_IMETHODIMP
nsComputedDOMStyle::GetCueAfter(nsAWritableString& aCueAfter)
nsComputedDOMStyle::GetCueAfter(nsAString& aCueAfter)
{
return NS_ERROR_DOM_NOT_SUPPORTED_ERR;
}
NS_IMETHODIMP
nsComputedDOMStyle::GetCueBefore(nsAWritableString& aCueBefore)
nsComputedDOMStyle::GetCueBefore(nsAString& aCueBefore)
{
return NS_ERROR_DOM_NOT_SUPPORTED_ERR;
}
NS_IMETHODIMP
nsComputedDOMStyle::GetCursor(nsAWritableString& aCursor)
nsComputedDOMStyle::GetCursor(nsAString& aCursor)
{
return NS_ERROR_DOM_NOT_SUPPORTED_ERR;
}
NS_IMETHODIMP
nsComputedDOMStyle::GetDirection(nsAWritableString& aDirection)
nsComputedDOMStyle::GetDirection(nsAString& aDirection)
{
return NS_ERROR_DOM_NOT_SUPPORTED_ERR;
}
@ -2307,61 +2307,61 @@ nsComputedDOMStyle::GetOverflow(nsIFrame *aFrame,
#if 0
NS_IMETHODIMP
nsComputedDOMStyle::GetElevation(nsAWritableString& aElevation)
nsComputedDOMStyle::GetElevation(nsAString& aElevation)
{
return NS_ERROR_DOM_NOT_SUPPORTED_ERR;
}
NS_IMETHODIMP
nsComputedDOMStyle::GetEmptyCells(nsAWritableString& aEmptyCells)
nsComputedDOMStyle::GetEmptyCells(nsAString& aEmptyCells)
{
return NS_ERROR_DOM_NOT_SUPPORTED_ERR;
}
NS_IMETHODIMP
nsComputedDOMStyle::GetFont(nsAWritableString& aFont)
nsComputedDOMStyle::GetFont(nsAString& aFont)
{
return NS_ERROR_DOM_NOT_SUPPORTED_ERR;
}
NS_IMETHODIMP
nsComputedDOMStyle::GetFontFamily(nsAWritableString& aFontFamily)
nsComputedDOMStyle::GetFontFamily(nsAString& aFontFamily)
{
return NS_ERROR_DOM_NOT_SUPPORTED_ERR;
}
NS_IMETHODIMP
nsComputedDOMStyle::GetFontSize(nsAWritableString& aFontSize)
nsComputedDOMStyle::GetFontSize(nsAString& aFontSize)
{
return NS_ERROR_DOM_NOT_SUPPORTED_ERR;
}
NS_IMETHODIMP
nsComputedDOMStyle::GetFontSizeAdjust(nsAWritableString& aFontSizeAdjust)
nsComputedDOMStyle::GetFontSizeAdjust(nsAString& aFontSizeAdjust)
{
return NS_ERROR_DOM_NOT_SUPPORTED_ERR;
}
NS_IMETHODIMP
nsComputedDOMStyle::GetFontStretch(nsAWritableString& aFontStretch)
nsComputedDOMStyle::GetFontStretch(nsAString& aFontStretch)
{
return NS_ERROR_DOM_NOT_SUPPORTED_ERR;
}
NS_IMETHODIMP
nsComputedDOMStyle::GetFontStyle(nsAWritableString& aFontStyle)
nsComputedDOMStyle::GetFontStyle(nsAString& aFontStyle)
{
return NS_ERROR_DOM_NOT_SUPPORTED_ERR;
}
NS_IMETHODIMP
nsComputedDOMStyle::GetFontVariant(nsAWritableString& aFontVariant)
nsComputedDOMStyle::GetFontVariant(nsAString& aFontVariant)
{
return NS_ERROR_DOM_NOT_SUPPORTED_ERR;
}
NS_IMETHODIMP
nsComputedDOMStyle::GetFontWeight(nsAWritableString& aFontWeight)
nsComputedDOMStyle::GetFontWeight(nsAString& aFontWeight)
{
return NS_ERROR_DOM_NOT_SUPPORTED_ERR;
}
@ -2758,43 +2758,43 @@ nsComputedDOMStyle::GetLeft(nsIFrame *aFrame,
#if 0
NS_IMETHODIMP
nsComputedDOMStyle::GetLetterSpacing(nsAWritableString& aLetterSpacing)
nsComputedDOMStyle::GetLetterSpacing(nsAString& aLetterSpacing)
{
return NS_ERROR_DOM_NOT_SUPPORTED_ERR;
}
NS_IMETHODIMP
nsComputedDOMStyle::GetLineHeight(nsAWritableString& aLineHeight)
nsComputedDOMStyle::GetLineHeight(nsAString& aLineHeight)
{
return NS_ERROR_DOM_NOT_SUPPORTED_ERR;
}
NS_IMETHODIMP
nsComputedDOMStyle::GetListStyle(nsAWritableString& aListStyle)
nsComputedDOMStyle::GetListStyle(nsAString& aListStyle)
{
return NS_ERROR_DOM_NOT_SUPPORTED_ERR;
}
NS_IMETHODIMP
nsComputedDOMStyle::GetListStyleImage(nsAWritableString& aListStyleImage)
nsComputedDOMStyle::GetListStyleImage(nsAString& aListStyleImage)
{
return NS_ERROR_DOM_NOT_SUPPORTED_ERR;
}
NS_IMETHODIMP
nsComputedDOMStyle::GetListStylePosition(nsAWritableString& aListStylePosition)
nsComputedDOMStyle::GetListStylePosition(nsAString& aListStylePosition)
{
return NS_ERROR_DOM_NOT_SUPPORTED_ERR;
}
NS_IMETHODIMP
nsComputedDOMStyle::GetListStyleType(nsAWritableString& aListStyleType)
nsComputedDOMStyle::GetListStyleType(nsAString& aListStyleType)
{
return NS_ERROR_DOM_NOT_SUPPORTED_ERR;
}
NS_IMETHODIMP
nsComputedDOMStyle::GetMargin(nsAWritableString& aMargin)
nsComputedDOMStyle::GetMargin(nsAString& aMargin)
{
return NS_ERROR_DOM_NOT_SUPPORTED_ERR;
}
@ -2828,181 +2828,181 @@ nsComputedDOMStyle::GetMarginLeft(nsIFrame *aFrame,
}
NS_IMETHODIMP
nsComputedDOMStyle::GetMarkerOffset(nsAWritableString& aMarkerOffset)
nsComputedDOMStyle::GetMarkerOffset(nsAString& aMarkerOffset)
{
return NS_ERROR_DOM_NOT_SUPPORTED_ERR;
}
NS_IMETHODIMP
nsComputedDOMStyle::GetMarks(nsAWritableString& aMarks)
nsComputedDOMStyle::GetMarks(nsAString& aMarks)
{
return NS_ERROR_DOM_NOT_SUPPORTED_ERR;
}
NS_IMETHODIMP
nsComputedDOMStyle::GetMaxHeight(nsAWritableString& aMaxHeight)
nsComputedDOMStyle::GetMaxHeight(nsAString& aMaxHeight)
{
return NS_ERROR_DOM_NOT_SUPPORTED_ERR;
}
NS_IMETHODIMP
nsComputedDOMStyle::GetMaxWidth(nsAWritableString& aMaxWidth)
nsComputedDOMStyle::GetMaxWidth(nsAString& aMaxWidth)
{
return NS_ERROR_DOM_NOT_SUPPORTED_ERR;
}
NS_IMETHODIMP
nsComputedDOMStyle::GetMinHeight(nsAWritableString& aMinHeight)
nsComputedDOMStyle::GetMinHeight(nsAString& aMinHeight)
{
return NS_ERROR_DOM_NOT_SUPPORTED_ERR;
}
NS_IMETHODIMP
nsComputedDOMStyle::GetMinWidth(nsAWritableString& aMinWidth)
nsComputedDOMStyle::GetMinWidth(nsAString& aMinWidth)
{
return NS_ERROR_DOM_NOT_SUPPORTED_ERR;
}
NS_IMETHODIMP
nsComputedDOMStyle::GetOrphans(nsAWritableString& aOrphans)
nsComputedDOMStyle::GetOrphans(nsAString& aOrphans)
{
return NS_ERROR_DOM_NOT_SUPPORTED_ERR;
}
NS_IMETHODIMP
nsComputedDOMStyle::GetOutline(nsAWritableString& aOutline)
nsComputedDOMStyle::GetOutline(nsAString& aOutline)
{
return NS_ERROR_DOM_NOT_SUPPORTED_ERR;
}
NS_IMETHODIMP
nsComputedDOMStyle::GetOutlineColor(nsAWritableString& aOutlineColor)
nsComputedDOMStyle::GetOutlineColor(nsAString& aOutlineColor)
{
return NS_ERROR_DOM_NOT_SUPPORTED_ERR;
}
NS_IMETHODIMP
nsComputedDOMStyle::GetOutlineStyle(nsAWritableString& aOutlineStyle)
nsComputedDOMStyle::GetOutlineStyle(nsAString& aOutlineStyle)
{
return NS_ERROR_DOM_NOT_SUPPORTED_ERR;
}
NS_IMETHODIMP
nsComputedDOMStyle::GetOutlineWidth(nsAWritableString& aOutlineWidth)
nsComputedDOMStyle::GetOutlineWidth(nsAString& aOutlineWidth)
{
return NS_ERROR_DOM_NOT_SUPPORTED_ERR;
}
NS_IMETHODIMP
nsComputedDOMStyle::GetOverflow(nsAWritableString& aOverflow)
nsComputedDOMStyle::GetOverflow(nsAString& aOverflow)
{
return NS_ERROR_DOM_NOT_SUPPORTED_ERR;
}
NS_IMETHODIMP
nsComputedDOMStyle::GetPadding(nsAWritableString& aPadding)
nsComputedDOMStyle::GetPadding(nsAString& aPadding)
{
return NS_ERROR_DOM_NOT_SUPPORTED_ERR;
}
NS_IMETHODIMP
nsComputedDOMStyle::GetPaddingTop(nsAWritableString& aPaddingTop)
nsComputedDOMStyle::GetPaddingTop(nsAString& aPaddingTop)
{
return NS_ERROR_DOM_NOT_SUPPORTED_ERR;
}
NS_IMETHODIMP
nsComputedDOMStyle::GetPaddingRight(nsAWritableString& aPaddingRight)
nsComputedDOMStyle::GetPaddingRight(nsAString& aPaddingRight)
{
return NS_ERROR_DOM_NOT_SUPPORTED_ERR;
}
NS_IMETHODIMP
nsComputedDOMStyle::GetPaddingBottom(nsAWritableString& aPaddingBottom)
nsComputedDOMStyle::GetPaddingBottom(nsAString& aPaddingBottom)
{
return NS_ERROR_DOM_NOT_SUPPORTED_ERR;
}
NS_IMETHODIMP
nsComputedDOMStyle::GetPaddingLeft(nsAWritableString& aPaddingLeft)
nsComputedDOMStyle::GetPaddingLeft(nsAString& aPaddingLeft)
{
return NS_ERROR_DOM_NOT_SUPPORTED_ERR;
}
NS_IMETHODIMP
nsComputedDOMStyle::GetPage(nsAWritableString& aPage)
nsComputedDOMStyle::GetPage(nsAString& aPage)
{
return NS_ERROR_DOM_NOT_SUPPORTED_ERR;
}
NS_IMETHODIMP
nsComputedDOMStyle::GetPageBreakAfter(nsAWritableString& aPageBreakAfter)
nsComputedDOMStyle::GetPageBreakAfter(nsAString& aPageBreakAfter)
{
return NS_ERROR_DOM_NOT_SUPPORTED_ERR;
}
NS_IMETHODIMP
nsComputedDOMStyle::GetPageBreakBefore(nsAWritableString& aPageBreakBefore)
nsComputedDOMStyle::GetPageBreakBefore(nsAString& aPageBreakBefore)
{
return NS_ERROR_DOM_NOT_SUPPORTED_ERR;
}
NS_IMETHODIMP
nsComputedDOMStyle::GetPageBreakInside(nsAWritableString& aPageBreakInside)
nsComputedDOMStyle::GetPageBreakInside(nsAString& aPageBreakInside)
{
return NS_ERROR_DOM_NOT_SUPPORTED_ERR;
}
NS_IMETHODIMP
nsComputedDOMStyle::GetPause(nsAWritableString& aPause)
nsComputedDOMStyle::GetPause(nsAString& aPause)
{
return NS_ERROR_DOM_NOT_SUPPORTED_ERR;
}
NS_IMETHODIMP
nsComputedDOMStyle::GetPauseAfter(nsAWritableString& aPauseAfter)
nsComputedDOMStyle::GetPauseAfter(nsAString& aPauseAfter)
{
return NS_ERROR_DOM_NOT_SUPPORTED_ERR;
}
NS_IMETHODIMP
nsComputedDOMStyle::GetPauseBefore(nsAWritableString& aPauseBefore)
nsComputedDOMStyle::GetPauseBefore(nsAString& aPauseBefore)
{
return NS_ERROR_DOM_NOT_SUPPORTED_ERR;
}
NS_IMETHODIMP
nsComputedDOMStyle::GetPitch(nsAWritableString& aPitch)
nsComputedDOMStyle::GetPitch(nsAString& aPitch)
{
return NS_ERROR_DOM_NOT_SUPPORTED_ERR;
}
NS_IMETHODIMP
nsComputedDOMStyle::GetPitchRange(nsAWritableString& aPitchRange)
nsComputedDOMStyle::GetPitchRange(nsAString& aPitchRange)
{
return NS_ERROR_DOM_NOT_SUPPORTED_ERR;
}
NS_IMETHODIMP
nsComputedDOMStyle::GetPlayDuring(nsAWritableString& aPlayDuring)
nsComputedDOMStyle::GetPlayDuring(nsAString& aPlayDuring)
{
return NS_ERROR_DOM_NOT_SUPPORTED_ERR;
}
NS_IMETHODIMP
nsComputedDOMStyle::GetPosition(nsAWritableString& aPosition)
nsComputedDOMStyle::GetPosition(nsAString& aPosition)
{
return NS_ERROR_DOM_NOT_SUPPORTED_ERR;
}
NS_IMETHODIMP
nsComputedDOMStyle::GetQuotes(nsAWritableString& aQuotes)
nsComputedDOMStyle::GetQuotes(nsAString& aQuotes)
{
return NS_ERROR_DOM_NOT_SUPPORTED_ERR;
}
NS_IMETHODIMP
nsComputedDOMStyle::GetRichness(nsAWritableString& aRichness)
nsComputedDOMStyle::GetRichness(nsAString& aRichness)
{
return NS_ERROR_DOM_NOT_SUPPORTED_ERR;
}
@ -3017,79 +3017,79 @@ nsComputedDOMStyle::GetRight(nsIFrame *aFrame,
#if 0
NS_IMETHODIMP
nsComputedDOMStyle::GetSize(nsAWritableString& aSize)
nsComputedDOMStyle::GetSize(nsAString& aSize)
{
return NS_ERROR_DOM_NOT_SUPPORTED_ERR;
}
NS_IMETHODIMP
nsComputedDOMStyle::GetSpeak(nsAWritableString& aSpeak)
nsComputedDOMStyle::GetSpeak(nsAString& aSpeak)
{
return NS_ERROR_DOM_NOT_SUPPORTED_ERR;
}
NS_IMETHODIMP
nsComputedDOMStyle::GetSpeakHeader(nsAWritableString& aSpeakHeader)
nsComputedDOMStyle::GetSpeakHeader(nsAString& aSpeakHeader)
{
return NS_ERROR_DOM_NOT_SUPPORTED_ERR;
}
NS_IMETHODIMP
nsComputedDOMStyle::GetSpeakNumeral(nsAWritableString& aSpeakNumeral)
nsComputedDOMStyle::GetSpeakNumeral(nsAString& aSpeakNumeral)
{
return NS_ERROR_DOM_NOT_SUPPORTED_ERR;
}
NS_IMETHODIMP
nsComputedDOMStyle::GetSpeakPunctuation(nsAWritableString& aSpeakPunctuation)
nsComputedDOMStyle::GetSpeakPunctuation(nsAString& aSpeakPunctuation)
{
return NS_ERROR_DOM_NOT_SUPPORTED_ERR;
}
NS_IMETHODIMP
nsComputedDOMStyle::GetSpeechRate(nsAWritableString& aSpeechRate)
nsComputedDOMStyle::GetSpeechRate(nsAString& aSpeechRate)
{
return NS_ERROR_DOM_NOT_SUPPORTED_ERR;
}
NS_IMETHODIMP
nsComputedDOMStyle::GetStress(nsAWritableString& aStress)
nsComputedDOMStyle::GetStress(nsAString& aStress)
{
return NS_ERROR_DOM_NOT_SUPPORTED_ERR;
}
NS_IMETHODIMP
nsComputedDOMStyle::GetTableLayout(nsAWritableString& aTableLayout)
nsComputedDOMStyle::GetTableLayout(nsAString& aTableLayout)
{
return NS_ERROR_DOM_NOT_SUPPORTED_ERR;
}
NS_IMETHODIMP
nsComputedDOMStyle::GetTextAlign(nsAWritableString& aTextAlign)
nsComputedDOMStyle::GetTextAlign(nsAString& aTextAlign)
{
return NS_ERROR_DOM_NOT_SUPPORTED_ERR;
}
NS_IMETHODIMP
nsComputedDOMStyle::GetTextDecoration(nsAWritableString& aTextDecoration)
nsComputedDOMStyle::GetTextDecoration(nsAString& aTextDecoration)
{
return NS_ERROR_DOM_NOT_SUPPORTED_ERR;
}
NS_IMETHODIMP
nsComputedDOMStyle::GetTextIndent(nsAWritableString& aTextIndent)
nsComputedDOMStyle::GetTextIndent(nsAString& aTextIndent)
{
return NS_ERROR_DOM_NOT_SUPPORTED_ERR;
}
NS_IMETHODIMP
nsComputedDOMStyle::GetTextShadow(nsAWritableString& aTextShadow)
nsComputedDOMStyle::GetTextShadow(nsAString& aTextShadow)
{
return NS_ERROR_DOM_NOT_SUPPORTED_ERR;
}
NS_IMETHODIMP
nsComputedDOMStyle::GetTextTransform(nsAWritableString& aTextTransform)
nsComputedDOMStyle::GetTextTransform(nsAString& aTextTransform)
{
return NS_ERROR_DOM_NOT_SUPPORTED_ERR;
}
@ -3104,43 +3104,43 @@ nsComputedDOMStyle::GetTop(nsIFrame *aFrame,
#if 0
NS_IMETHODIMP
nsComputedDOMStyle::GetUnicodeBidi(nsAWritableString& aUnicodeBidi)
nsComputedDOMStyle::GetUnicodeBidi(nsAString& aUnicodeBidi)
{
return NS_ERROR_DOM_NOT_SUPPORTED_ERR;
}
NS_IMETHODIMP
nsComputedDOMStyle::GetVerticalAlign(nsAWritableString& aVerticalAlign)
nsComputedDOMStyle::GetVerticalAlign(nsAString& aVerticalAlign)
{
return NS_ERROR_DOM_NOT_SUPPORTED_ERR;
}
NS_IMETHODIMP
nsComputedDOMStyle::GetVisibility(nsAWritableString& aVisibility)
nsComputedDOMStyle::GetVisibility(nsAString& aVisibility)
{
return NS_ERROR_DOM_NOT_SUPPORTED_ERR;
}
NS_IMETHODIMP
nsComputedDOMStyle::GetVoiceFamily(nsAWritableString& aVoiceFamily)
nsComputedDOMStyle::GetVoiceFamily(nsAString& aVoiceFamily)
{
return NS_ERROR_DOM_NOT_SUPPORTED_ERR;
}
NS_IMETHODIMP
nsComputedDOMStyle::GetVolume(nsAWritableString& aVolume)
nsComputedDOMStyle::GetVolume(nsAString& aVolume)
{
return NS_ERROR_DOM_NOT_SUPPORTED_ERR;
}
NS_IMETHODIMP
nsComputedDOMStyle::GetWhiteSpace(nsAWritableString& aWhiteSpace)
nsComputedDOMStyle::GetWhiteSpace(nsAString& aWhiteSpace)
{
return NS_ERROR_DOM_NOT_SUPPORTED_ERR;
}
NS_IMETHODIMP
nsComputedDOMStyle::GetWidows(nsAWritableString& aWidows)
nsComputedDOMStyle::GetWidows(nsAString& aWidows)
{
return NS_ERROR_DOM_NOT_SUPPORTED_ERR;
}
@ -3769,19 +3769,19 @@ nsComputedDOMStyle::GetBorderStyleFor(PRUint8 aSide,
#if 0
NS_IMETHODIMP
nsComputedDOMStyle::GetWordSpacing(nsAWritableString& aWordSpacing)
nsComputedDOMStyle::GetWordSpacing(nsAString& aWordSpacing)
{
return NS_ERROR_DOM_NOT_SUPPORTED_ERR;
}
NS_IMETHODIMP
nsComputedDOMStyle::GetZIndex(nsAWritableString& aZIndex)
nsComputedDOMStyle::GetZIndex(nsAString& aZIndex)
{
return NS_ERROR_DOM_NOT_SUPPORTED_ERR;
}
NS_IMETHODIMP
nsComputedDOMStyle::GetOpacity(nsAWritableString& aOpacity)
nsComputedDOMStyle::GetOpacity(nsAString& aOpacity)
{
return NS_ERROR_DOM_NOT_SUPPORTED_ERR;
}

10
content/html/style/src/nsDOMCSSAttrDeclaration.cpp
Просмотреть файл

@ -69,8 +69,8 @@ nsDOMCSSAttributeDeclaration::~nsDOMCSSAttributeDeclaration()
}
NS_IMETHODIMP
nsDOMCSSAttributeDeclaration::RemoveProperty(const nsAReadableString& aPropertyName,
nsAWritableString& aReturn)
nsDOMCSSAttributeDeclaration::RemoveProperty(const nsAString& aPropertyName,
nsAString& aReturn)
{
nsCSSDeclaration* decl;
nsresult rv = GetCSSDeclaration(&decl, PR_TRUE);
@ -243,8 +243,8 @@ nsDOMCSSAttributeDeclaration::GetCSSParsingEnvironment(nsIContent* aContent,
}
nsresult
nsDOMCSSAttributeDeclaration::ParsePropertyValue(const nsAReadableString& aPropName,
const nsAReadableString& aPropValue)
nsDOMCSSAttributeDeclaration::ParsePropertyValue(const nsAString& aPropName,
const nsAString& aPropValue)
{
nsCSSDeclaration* decl;
nsresult result = GetCSSDeclaration(&decl, PR_TRUE);
@ -292,7 +292,7 @@ nsDOMCSSAttributeDeclaration::ParsePropertyValue(const nsAReadableString& aPropN
}
nsresult
nsDOMCSSAttributeDeclaration::ParseDeclaration(const nsAReadableString& aDecl,
nsDOMCSSAttributeDeclaration::ParseDeclaration(const nsAString& aDecl,
PRBool aParseOnlyOneDecl,
PRBool aClearOldDecl)
{

10
content/html/style/src/nsDOMCSSAttrDeclaration.h
Просмотреть файл

@ -55,8 +55,8 @@ public:
nsDOMCSSAttributeDeclaration(nsIHTMLContent *aContent);
~nsDOMCSSAttributeDeclaration();
NS_IMETHOD RemoveProperty(const nsAReadableString& aPropertyName,
nsAWritableString& aReturn);
NS_IMETHOD RemoveProperty(const nsAString& aPropertyName,
nsAString& aReturn);
virtual void DropReference();
virtual nsresult GetCSSDeclaration(nsCSSDeclaration **aDecl,
@ -66,9 +66,9 @@ public:
nsIURI** aBaseURI,
nsICSSLoader** aCSSLoader,
nsICSSParser** aCSSParser);
virtual nsresult ParsePropertyValue(const nsAReadableString& aPropName,
const nsAReadableString& aPropValue);
virtual nsresult ParseDeclaration(const nsAReadableString& aDecl,
virtual nsresult ParsePropertyValue(const nsAString& aPropName,
const nsAString& aPropValue);
virtual nsresult ParseDeclaration(const nsAString& aDecl,
PRBool aParseOnlyOneDecl,
PRBool aClearOldDecl);
virtual nsresult GetParent(nsISupports **aParent);

30
content/html/style/src/nsDOMCSSDeclaration.cpp
Просмотреть файл

@ -73,7 +73,7 @@ NS_IMPL_RELEASE(nsDOMCSSDeclaration);
NS_IMETHODIMP
nsDOMCSSDeclaration::GetCssText(nsAWritableString& aCssText)
nsDOMCSSDeclaration::GetCssText(nsAString& aCssText)
{
nsCSSDeclaration* decl;
aCssText.Truncate();
@ -88,7 +88,7 @@ nsDOMCSSDeclaration::GetCssText(nsAWritableString& aCssText)
}
NS_IMETHODIMP
nsDOMCSSDeclaration::SetCssText(const nsAReadableString& aCssText)
nsDOMCSSDeclaration::SetCssText(const nsAString& aCssText)
{
return ParseDeclaration(aCssText, PR_FALSE, PR_TRUE);
}
@ -125,7 +125,7 @@ nsDOMCSSDeclaration::GetParentRule(nsIDOMCSSRule** aParentRule)
}
NS_IMETHODIMP
nsDOMCSSDeclaration::GetPropertyCSSValue(const nsAReadableString& aPropertyName,
nsDOMCSSDeclaration::GetPropertyCSSValue(const nsAString& aPropertyName,
nsIDOMCSSValue** aReturn)
{
NS_ENSURE_ARG_POINTER(aReturn);
@ -137,7 +137,7 @@ nsDOMCSSDeclaration::GetPropertyCSSValue(const nsAReadableString& aPropertyName,
}
NS_IMETHODIMP
nsDOMCSSDeclaration::Item(PRUint32 aIndex, nsAWritableString& aReturn)
nsDOMCSSDeclaration::Item(PRUint32 aIndex, nsAString& aReturn)
{
nsCSSDeclaration *decl;
nsresult result = GetCSSDeclaration(&decl, PR_FALSE);
@ -151,8 +151,8 @@ nsDOMCSSDeclaration::Item(PRUint32 aIndex, nsAWritableString& aReturn)
}
NS_IMETHODIMP
nsDOMCSSDeclaration::GetPropertyValue(const nsAReadableString& aPropertyName,
nsAWritableString& aReturn)
nsDOMCSSDeclaration::GetPropertyValue(const nsAString& aPropertyName,
nsAString& aReturn)
{
nsCSSValue val;
nsCSSDeclaration *decl;
@ -167,8 +167,8 @@ nsDOMCSSDeclaration::GetPropertyValue(const nsAReadableString& aPropertyName,
}
NS_IMETHODIMP
nsDOMCSSDeclaration::GetPropertyPriority(const nsAReadableString& aPropertyName,
nsAWritableString& aReturn)
nsDOMCSSDeclaration::GetPropertyPriority(const nsAString& aPropertyName,
nsAString& aReturn)
{
nsCSSDeclaration *decl;
nsresult result = GetCSSDeclaration(&decl, PR_FALSE);
@ -189,9 +189,9 @@ nsDOMCSSDeclaration::GetPropertyPriority(const nsAReadableString& aPropertyName,
}
NS_IMETHODIMP
nsDOMCSSDeclaration::SetProperty(const nsAReadableString& aPropertyName,
const nsAReadableString& aValue,
const nsAReadableString& aPriority)
nsDOMCSSDeclaration::SetProperty(const nsAString& aPropertyName,
const nsAString& aValue,
const nsAString& aPriority)
{
if (aValue.IsEmpty()) {
// If the new value of the property is an empty string we remove the
@ -210,8 +210,8 @@ nsDOMCSSDeclaration::SetProperty(const nsAReadableString& aPropertyName,
*/
static nsresult
CallSetProperty(nsDOMCSSDeclaration* aDecl,
const nsAReadableString& aPropName,
const nsAReadableString& aValue)
const nsAString& aPropName,
const nsAString& aValue)
{
if (aValue.IsEmpty()) {
// If the new value of the property is an empty string we remove the
@ -225,13 +225,13 @@ CallSetProperty(nsDOMCSSDeclaration* aDecl,
#define IMPL_CSSPROP(attname_, propname_) \
NS_IMETHODIMP \
nsDOMCSSDeclaration::Get##attname_(nsAWritableString& aValue) \
nsDOMCSSDeclaration::Get##attname_(nsAString& aValue) \
{ \
return GetPropertyValue(propname_, aValue); \
} \
\
NS_IMETHODIMP \
nsDOMCSSDeclaration::Set##attname_(const nsAReadableString& aValue) \
nsDOMCSSDeclaration::Set##attname_(const nsAString& aValue) \
{ \
return CallSetProperty(this, propname_, aValue); \
}

32
content/html/style/src/nsDOMCSSDeclaration.h
Просмотреть файл

@ -55,22 +55,22 @@ public:
NS_DECL_ISUPPORTS
// NS_DECL_IDOMCSSSTYLEDECLARATION
NS_IMETHOD GetCssText(nsAWritableString& aCssText);
NS_IMETHOD SetCssText(const nsAReadableString& aCssText);
NS_IMETHOD GetCssText(nsAString& aCssText);
NS_IMETHOD SetCssText(const nsAString& aCssText);
NS_IMETHOD GetLength(PRUint32* aLength);
NS_IMETHOD GetParentRule(nsIDOMCSSRule** aParentRule);
NS_IMETHOD GetPropertyValue(const nsAReadableString& aPropertyName,
nsAWritableString& aReturn);
NS_IMETHOD GetPropertyCSSValue(const nsAReadableString& aPropertyName,
NS_IMETHOD GetPropertyValue(const nsAString& aPropertyName,
nsAString& aReturn);
NS_IMETHOD GetPropertyCSSValue(const nsAString& aPropertyName,
nsIDOMCSSValue** aReturn);
NS_IMETHOD RemoveProperty(const nsAReadableString& aPropertyName,
nsAWritableString& aReturn) = 0;
NS_IMETHOD GetPropertyPriority(const nsAReadableString& aPropertyName,
nsAWritableString& aReturn);
NS_IMETHOD SetProperty(const nsAReadableString& aPropertyName,
const nsAReadableString& aValue,
const nsAReadableString& aPriority);
NS_IMETHOD Item(PRUint32 aIndex, nsAWritableString& aReturn);
NS_IMETHOD RemoveProperty(const nsAString& aPropertyName,
nsAString& aReturn) = 0;
NS_IMETHOD GetPropertyPriority(const nsAString& aPropertyName,
nsAString& aReturn);
NS_IMETHOD SetProperty(const nsAString& aPropertyName,
const nsAString& aValue,
const nsAString& aPriority);
NS_IMETHOD Item(PRUint32 aIndex, nsAString& aReturn);
NS_DECL_NSIDOMCSS2PROPERTIES
@ -82,9 +82,9 @@ public:
// Note! This will only set the declaration if a style rule already exists
virtual nsresult SetCSSDeclaration(nsCSSDeclaration *aDecl) = 0;
virtual nsresult ParsePropertyValue(const nsAReadableString& aPropName,
const nsAReadableString& aPropValue) = 0;
virtual nsresult ParseDeclaration(const nsAReadableString& aDecl,
virtual nsresult ParsePropertyValue(const nsAString& aPropName,
const nsAString& aPropValue) = 0;
virtual nsresult ParseDeclaration(const nsAString& aDecl,
PRBool aParseOnlyOneDecl,
PRBool aClearOldDecl) = 0;
virtual nsresult GetParent(nsISupports **aParent) = 0;

14
content/html/style/src/nsHTMLAttributes.cpp
Просмотреть файл

@ -70,7 +70,7 @@ struct HTMLAttribute {
MOZ_COUNT_CTOR(HTMLAttribute);
}
HTMLAttribute(nsIAtom* aAttribute, const nsAReadableString& aValue)
HTMLAttribute(nsIAtom* aAttribute, const nsAString& aValue)
: mAttribute(aAttribute),
mValue(aValue),
mNext(nsnull)
@ -137,7 +137,7 @@ struct HTMLAttribute {
mValue = aValue;
}
void Set(nsIAtom* aAttribute, const nsAReadableString& aValue)
void Set(nsIAtom* aAttribute, const nsAString& aValue)
{
NS_IF_RELEASE(mAttribute);
mAttribute = aAttribute;
@ -312,7 +312,7 @@ public:
NS_IMETHOD Reset(void);
NS_IMETHOD SetMappingFunction(nsMapRuleToAttributesFunc aMapRuleFunc);
NS_IMETHOD SetAttribute(nsIAtom* aAttrName, const nsAReadableString& aValue);
NS_IMETHOD SetAttribute(nsIAtom* aAttrName, const nsAString& aValue);
NS_IMETHOD SetAttribute(nsIAtom* aAttrName, const nsHTMLValue& aValue);
NS_IMETHOD UnsetAttribute(nsIAtom* aAttrName, PRInt32& aAttrCount);
@ -462,7 +462,7 @@ nsHTMLMappedAttributes::SetMappingFunction(nsMapRuleToAttributesFunc aMapRuleFun
}
NS_IMETHODIMP
nsHTMLMappedAttributes::SetAttribute(nsIAtom* aAttrName, const nsAReadableString& aValue)
nsHTMLMappedAttributes::SetAttribute(nsIAtom* aAttrName, const nsAString& aValue)
{
if (! aAttrName) {
return NS_ERROR_NULL_POINTER;
@ -843,7 +843,7 @@ public:
nsIHTMLContent* aContent,
nsIHTMLStyleSheet* aSheet,
PRInt32& aAttrCount);
NS_IMETHOD SetAttributeFor(nsIAtom* aAttrName, const nsAReadableString& aValue,
NS_IMETHOD SetAttributeFor(nsIAtom* aAttrName, const nsAString& aValue,
PRBool aMappedToStyle,
nsIHTMLContent* aContent,
nsIHTMLStyleSheet* aSheet);
@ -1008,7 +1008,7 @@ NS_IMPL_ISUPPORTS1(HTMLAttributesImpl, nsIHTMLAttributes)
const PRUnichar kNullCh = PRUnichar('\0');
static void ParseClasses(const nsAReadableString& aClassString, nsClassList& aClassList)
static void ParseClasses(const nsAString& aClassString, nsClassList& aClassList)
{
nsAutoString classStr(aClassString); // copy to work buffer
classStr.Append(kNullCh); // put an extra null at the end
@ -1165,7 +1165,7 @@ HTMLAttributesImpl::UniqueMapped(nsIHTMLStyleSheet* aSheet)
}
NS_IMETHODIMP
HTMLAttributesImpl::SetAttributeFor(nsIAtom* aAttrName, const nsAReadableString& aValue,
HTMLAttributesImpl::SetAttributeFor(nsIAtom* aAttrName, const nsAString& aValue,
PRBool aMappedToStyle, nsIHTMLContent* aContent,
nsIHTMLStyleSheet* aSheet)
{

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

@ -856,7 +856,7 @@ public:
NS_IMETHOD SetAttributesFor(nsIHTMLContent* aContent,
nsIHTMLAttributes*& aAttributes);
NS_IMETHOD SetAttributeFor(nsIAtom* aAttribute,
const nsAReadableString& aValue,
const nsAString& aValue,
PRBool aMappedToStyle,
nsIHTMLContent* aContent,
nsIHTMLAttributes*& aAttributes);
@ -1418,7 +1418,7 @@ HTMLStyleSheetImpl::SetAttributesFor(nsIHTMLContent* aContent,
NS_IMETHODIMP
HTMLStyleSheetImpl::SetAttributeFor(nsIAtom* aAttribute,
const nsAReadableString& aValue,
const nsAString& aValue,
PRBool aMappedToStyle,
nsIHTMLContent* aContent,
nsIHTMLAttributes*& aAttributes)

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

@ -124,12 +124,12 @@ public:
#ifdef DEBUG
void SizeOf(nsISizeOfHandler *aSizeOfHandler, PRUint32 &aSize);
#endif
nsresult ToString( nsAWritableString& aString, nsICSSStyleSheet* aSheet,
nsresult ToString( nsAString& aString, nsICSSStyleSheet* aSheet,
PRBool aIsPseudoElem, PRInt8 aNegatedIndex ) const;
private:
void AppendNegationToString(nsAWritableString& aString);
void AppendNegationToString(nsAString& aString);
public:
PRInt32 mNameSpace;

146
content/html/style/src/nsIHTMLAttributes.h
Просмотреть файл

@ -1,146 +0,0 @@
/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
/* ***** BEGIN LICENSE BLOCK *****
* Version: NPL 1.1/GPL 2.0/LGPL 2.1
*
* The contents of this file are subject to the Netscape Public License
* Version 1.1 (the "License"); you may not use this file except in
* compliance with the License. You may obtain a copy of the License at
* http://www.mozilla.org/NPL/
*
* Software distributed under the License is distributed on an "AS IS" basis,
* WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
* for the specific language governing rights and limitations under the
* License.
*
* The Original Code is mozilla.org code.
*
* The Initial Developer of the Original Code is
* Netscape Communications Corporation.
* Portions created by the Initial Developer are Copyright (C) 1998
* the Initial Developer. All Rights Reserved.
*
* Contributor(s):
*
*
* Alternatively, the contents of this file may be used under the terms of
* either the GNU General Public License Version 2 or later (the "GPL"), or
* the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
* in which case the provisions of the GPL or the LGPL are applicable instead
* of those above. If you wish to allow use of your version of this file only
* under the terms of either the GPL or the LGPL, and not to allow others to
* use your version of this file under the terms of the NPL, indicate your
* decision by deleting the provisions above and replace them with the notice
* and other provisions required by the GPL or the LGPL. If you do not delete
* the provisions above, a recipient may use your version of this file under
* the terms of any one of the NPL, the GPL or the LGPL.
*
* ***** END LICENSE BLOCK ***** */
#ifndef nsIHTMLAttributes_h___
#define nsIHTMLAttributes_h___
#include "nsISupports.h"
#include "nsHTMLValue.h"
#include "nsIHTMLContent.h"
class nsIAtom;
class nsISupportsArray;
class nsIHTMLStyleSheet;
class nsRuleWalker;
// IID for the nsIHTMLAttributes interface {a18f85f0-c058-11d1-8031-006008159b5a}
#define NS_IHTML_ATTRIBUTES_IID \
{0xa18f85f0, 0xc058, 0x11d1, \
{0x80, 0x31, 0x00, 0x60, 0x08, 0x15, 0x9b, 0x5a}}
// IID for the nsIHTMLMappedAttributes interface {0fdd27a0-2e7b-11d3-8060-006008159b5a}
#define NS_IHTML_MAPPED_ATTRIBUTES_IID \
{0x0fdd27a0, 0x2e7b, 0x11d3, \
{0x80, 0x60, 0x00, 0x60, 0x08, 0x15, 0x9b, 0x5a}}
class nsIHTMLAttributes : public nsISupports
{
public:
NS_DEFINE_STATIC_IID_ACCESSOR(NS_IHTML_ATTRIBUTES_IID);
NS_IMETHOD SetAttributeFor(nsIAtom* aAttribute, const nsHTMLValue& aValue,
PRBool aMappedToStyle,
nsIHTMLContent* aContent,
nsIHTMLStyleSheet* aSheet,
PRInt32& aAttrCount) = 0;
// this string value version lets you avoid an extra string copy,
// the value is still stored in a nsHTMLValue
NS_IMETHOD SetAttributeFor(nsIAtom* aAttribute, const nsAReadableString& aValue,
PRBool aMappedToStyle,
nsIHTMLContent* aContent,
nsIHTMLStyleSheet* aSheet) = 0;
NS_IMETHOD UnsetAttributeFor(nsIAtom* aAttribute,
nsIHTMLContent* aContent,
nsIHTMLStyleSheet* aSheet,
PRInt32& aAttrCount) = 0;
NS_IMETHOD GetAttribute(nsIAtom* aAttribute,
nsHTMLValue& aValue) const = 0;
NS_IMETHOD GetAttribute(nsIAtom* aAttribute,
const nsHTMLValue** aValue) const = 0;
NS_IMETHOD_(PRBool) HasAttribute(nsIAtom* aAttrName) const = 0;
NS_IMETHOD GetAttributeNameAt(PRInt32 aIndex,
nsIAtom*& aName) const = 0;
NS_IMETHOD GetAttributeCount(PRInt32& aAttrCount) const = 0;
NS_IMETHOD GetID(nsIAtom*& aResult) const = 0;
NS_IMETHOD GetClasses(nsVoidArray& aArray) const = 0;
NS_IMETHOD HasClass(nsIAtom* aClass, PRBool aCaseSensitive) const = 0;
NS_IMETHOD Clone(nsIHTMLAttributes** aInstancePtrResult) const = 0;
NS_IMETHOD SetStyleSheet(nsIHTMLStyleSheet* aSheet) = 0;
NS_IMETHOD WalkMappedAttributeStyleRules(nsRuleWalker* aRuleWalker) const = 0;
#ifdef UNIQUE_ATTR_SUPPORT
NS_IMETHOD Equals(const nsIHTMLAttributes* aAttributes, PRBool& aResult) const = 0;
NS_IMETHOD HashValue(PRUint32& aValue) const = 0;
NS_IMETHOD AddContentRef(void) = 0;
NS_IMETHOD ReleaseContentRef(void) = 0;
NS_IMETHOD GetContentRefCount(PRInt32& aCount) const = 0;
NS_IMETHOD Reset(void) = 0;
#endif
#ifdef DEBUG
NS_IMETHOD List(FILE* out = stdout, PRInt32 aIndent = 0) const = 0;
virtual void SizeOf(nsISizeOfHandler* aSizer, PRUint32 &aResult) = 0;
#endif
};
class nsIHTMLMappedAttributes : public nsISupports
{
public:
NS_DEFINE_STATIC_IID_ACCESSOR(NS_IHTML_MAPPED_ATTRIBUTES_IID);
NS_IMETHOD GetAttribute(nsIAtom* aAttrName, nsHTMLValue& aValue) const = 0;
NS_IMETHOD GetAttribute(nsIAtom* aAttrName, const nsHTMLValue** aValue) const = 0;
NS_IMETHOD GetAttributeCount(PRInt32& aCount) const = 0;
NS_IMETHOD Equals(const nsIHTMLMappedAttributes* aAttributes, PRBool& aResult) const = 0;
NS_IMETHOD HashValue(PRUint32& aValue) const = 0;
// Sheet accessors for unique table management
NS_IMETHOD SetUniqued(PRBool aUniqued) = 0;
NS_IMETHOD GetUniqued(PRBool& aUniqued) = 0;
NS_IMETHOD DropStyleSheetReference(void) = 0;
#ifdef DEBUG
virtual void SizeOf(nsISizeOfHandler* aSizer, PRUint32 &aResult) = 0;
#endif
};
nsresult
NS_NewHTMLAttributes(nsIHTMLAttributes** aInstancePtrResult);
#endif /* nsIHTMLAttributes_h___ */

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

@ -74,7 +74,7 @@ NS_INTERFACE_MAP_END
NS_IMETHODIMP
nsROCSSPrimitiveValue::GetCssText(nsAWritableString& aCssText)
nsROCSSPrimitiveValue::GetCssText(nsAString& aCssText)
{
nsAutoString tmpStr;
aCssText.Truncate();
@ -245,7 +245,7 @@ nsROCSSPrimitiveValue::GetCssText(nsAWritableString& aCssText)
NS_IMETHODIMP
nsROCSSPrimitiveValue::SetCssText(const nsAReadableString& aCssText)
nsROCSSPrimitiveValue::SetCssText(const nsAString& aCssText)
{
return NS_ERROR_DOM_NO_MODIFICATION_ALLOWED_ERR;
}
@ -353,14 +353,14 @@ nsROCSSPrimitiveValue::GetFloatValue(PRUint16 aUnitType, float* aReturn)
NS_IMETHODIMP
nsROCSSPrimitiveValue::SetStringValue(PRUint16 aStringType,
const nsAReadableString& aStringValue)
const nsAString& aStringValue)
{
return NS_ERROR_DOM_NO_MODIFICATION_ALLOWED_ERR;
}
NS_IMETHODIMP
nsROCSSPrimitiveValue::GetStringValue(nsAWritableString& aReturn)
nsROCSSPrimitiveValue::GetStringValue(nsAString& aReturn)
{
switch (mType) {
case CSS_IDENT:

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

@ -62,7 +62,7 @@ public:
static void ReleaseTable(void);
// Given a property string, return the enum value
static nsCSSProperty LookupProperty(const nsAReadableString& aProperty);
static nsCSSProperty LookupProperty(const nsAString& aProperty);
static nsCSSProperty LookupProperty(const nsACString& aProperty);
// Given a property enum, get the string value

10
content/shared/public/nsHTMLValue.h
Просмотреть файл

@ -64,7 +64,7 @@ public:
nsHTMLValue(nsHTMLUnit aUnit = eHTMLUnit_Null);
nsHTMLValue(PRInt32 aValue, nsHTMLUnit aUnit);
nsHTMLValue(float aValue);
nsHTMLValue(const nsAReadableString& aValue, nsHTMLUnit aUnit = eHTMLUnit_String);
nsHTMLValue(const nsAString& aValue, nsHTMLUnit aUnit = eHTMLUnit_String);
nsHTMLValue(nsISupports* aValue);
nsHTMLValue(nscolor aValue);
nsHTMLValue(const nsHTMLValue& aCopy);
@ -79,7 +79,7 @@ public:
PRInt32 GetIntValue(void) const;
PRInt32 GetPixelValue(void) const;
float GetPercentValue(void) const;
nsAWritableString& GetStringValue(nsAWritableString& aBuffer) const;
nsAString& GetStringValue(nsAString& aBuffer) const;
nsISupports* GetISupportsValue(void) const;
nscolor GetColorValue(void) const;
@ -87,13 +87,13 @@ public:
void SetIntValue(PRInt32 aValue, nsHTMLUnit aUnit);
void SetPixelValue(PRInt32 aValue);
void SetPercentValue(float aValue);
void SetStringValue(const nsAReadableString& aValue, nsHTMLUnit aUnit = eHTMLUnit_String);
void SetStringValue(const nsAString& aValue, nsHTMLUnit aUnit = eHTMLUnit_String);
void SetISupportsValue(nsISupports* aValue);
void SetColorValue(nscolor aValue);
void SetEmptyValue(void);
#ifdef DEBUG
void AppendToString(nsAWritableString& aBuffer) const;
void AppendToString(nsAString& aBuffer) const;
#endif
protected:
@ -146,7 +146,7 @@ inline float nsHTMLValue::GetPercentValue(void) const
return 0.0f;
}
inline nsAWritableString& nsHTMLValue::GetStringValue(nsAWritableString& aBuffer) const
inline nsAString& nsHTMLValue::GetStringValue(nsAString& aBuffer) const
{
NS_ASSERTION((mUnit == eHTMLUnit_String) || (mUnit == eHTMLUnit_ColorName) ||
(mUnit == eHTMLUnit_Null), "not a string value");

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

@ -64,7 +64,7 @@ public:
* @return XPCOM return values.
*/
static nsresult FindImageMap(nsIDocument *aDocument,
const nsAReadableString &aUsemap,
const nsAString &aUsemap,
nsIDOMHTMLMapElement **aMap);
};

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

@ -38,7 +38,7 @@
#ifndef nsTextFragment_h___
#define nsTextFragment_h___
#include "nsAWritableString.h"
#include "nsAString.h"
class nsString;
// XXX should this normalize the code to keep a \u0000 at the end?
@ -128,7 +128,7 @@ public:
* Change the contents of this fragment to be a copy of the
* the argument string.
*/
nsTextFragment& operator=(const nsAReadableString& aString);
nsTextFragment& operator=(const nsAString& aString);
/**
* Return PR_TRUE if this fragment is represented by PRUnichar data

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

@ -104,7 +104,7 @@ nsCSSProps::LookupProperty(const nsACString& aProperty)
}
nsCSSProperty
nsCSSProps::LookupProperty(const nsAReadableString& aProperty) {
nsCSSProps::LookupProperty(const nsAString& aProperty) {
nsCAutoString theProp; theProp.AssignWithConversion(aProperty);
return LookupProperty(theProp);
}

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

@ -78,7 +78,7 @@ nsHTMLValue::nsHTMLValue(float aValue)
mValue.mFloat = aValue;
}
nsHTMLValue::nsHTMLValue(const nsAReadableString& aValue, nsHTMLUnit aUnit)
nsHTMLValue::nsHTMLValue(const nsAString& aValue, nsHTMLUnit aUnit)
: mUnit(aUnit)
{
NS_ASSERTION((eHTMLUnit_String == aUnit) ||
@ -245,7 +245,7 @@ void nsHTMLValue::SetPercentValue(float aValue)
mValue.mFloat = aValue;
}
void nsHTMLValue::SetStringValue(const nsAReadableString& aValue,
void nsHTMLValue::SetStringValue(const nsAString& aValue,
nsHTMLUnit aUnit)
{
Reset();
@ -277,7 +277,7 @@ void nsHTMLValue::SetEmptyValue(void)
}
#ifdef DEBUG
void nsHTMLValue::AppendToString(nsAWritableString& aBuffer) const
void nsHTMLValue::AppendToString(nsAString& aBuffer) const
{
if (eHTMLUnit_Null == mUnit) {
return;

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

@ -48,7 +48,7 @@
/*static*/
nsresult nsImageMapUtils::FindImageMap(nsIDocument *aDocument,
const nsAReadableString &aUsemap,
const nsAString &aUsemap,
nsIDOMHTMLMapElement **aMap)
{
NS_ENSURE_ARG_POINTER(aDocument);

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

@ -130,7 +130,7 @@ nsTextFragment::operator=(const PRUnichar *aString)
}
nsTextFragment&
nsTextFragment::operator=(const nsAReadableString& aString)
nsTextFragment::operator=(const nsAString& aString)
{
ReleaseText();

30
layout/style/nsCSSDeclaration.cpp
Просмотреть файл

@ -4013,7 +4013,7 @@ nsCSSDeclaration::RemoveProperty(nsCSSProperty aProperty, nsCSSValue& aValue)
}
nsresult
nsCSSDeclaration::AppendComment(const nsAReadableString& aComment)
nsCSSDeclaration::AppendComment(const nsAString& aComment)
{
return /* NS_ERROR_NOT_IMPLEMENTED, or not any longer that is */ NS_OK;
}
@ -4747,21 +4747,21 @@ nsCSSDeclaration::GetValue(nsCSSProperty aProperty, nsCSSValue& aValue)
nsresult
nsCSSDeclaration::GetValue(const nsAReadableString& aProperty,
nsAWritableString& aValue)
nsCSSDeclaration::GetValue(const nsAString& aProperty,
nsAString& aValue)
{
nsCSSProperty propID = nsCSSProps::LookupProperty(aProperty);
return GetValue(propID, aValue);
}
PRBool nsCSSDeclaration::AppendValueToString(nsCSSProperty aProperty, nsAWritableString& aResult)
PRBool nsCSSDeclaration::AppendValueToString(nsCSSProperty aProperty, nsAString& aResult)
{
nsCSSValue value;
GetValue(aProperty, value);
return AppendValueToString(aProperty, value, aResult);
}
PRBool nsCSSDeclaration::AppendValueToString(nsCSSProperty aProperty, const nsCSSValue& aValue, nsAWritableString& aResult)
PRBool nsCSSDeclaration::AppendValueToString(nsCSSProperty aProperty, const nsCSSValue& aValue, nsAString& aResult)
{
nsCSSUnit unit = aValue.GetUnit();
@ -4968,7 +4968,7 @@ PRBool nsCSSDeclaration::AppendValueToString(nsCSSProperty aProperty, const nsCS
nsresult
nsCSSDeclaration::GetValue(nsCSSProperty aProperty,
nsAWritableString& aValue)
nsAString& aValue)
{
PRBool isImportant = GetValueIsImportant(aProperty);
if (PR_TRUE == isImportant) {
@ -5323,7 +5323,7 @@ nsCSSDeclaration::GetImportantValues()
}
PRBool
nsCSSDeclaration::GetValueIsImportant(const nsAReadableString& aProperty)
nsCSSDeclaration::GetValueIsImportant(const nsAString& aProperty)
{
nsCSSProperty propID = nsCSSProps::LookupProperty(aProperty);
return GetValueIsImportant(propID);
@ -5376,7 +5376,7 @@ nsCSSDeclaration::AllPropertiesSameValue(PRInt32 aFirst, PRInt32 aSecond,
void
nsCSSDeclaration::AppendPropertyAndValueToString(nsCSSProperty aProperty,
nsAWritableString& aString)
nsAString& aString)
{
NS_ASSERTION(aProperty, "null CSS property passed to AppendPropertyAndValueToString.");
aString.Append(NS_ConvertASCIItoUCS2(nsCSSProps::GetStringValue(aProperty))
@ -5386,7 +5386,7 @@ nsCSSDeclaration::AppendPropertyAndValueToString(nsCSSProperty aProperty,
}
void
nsCSSDeclaration::TryBorderShorthand(nsAWritableString & aString,
nsCSSDeclaration::TryBorderShorthand(nsAString & aString,
PRInt32 & aBorderTopWidth,
PRInt32 & aBorderTopStyle,
PRInt32 & aBorderTopColor,
@ -5461,7 +5461,7 @@ nsCSSDeclaration::TryBorderShorthand(nsAWritableString & aString,
}
void
nsCSSDeclaration::TryBorderSideShorthand(nsAWritableString & aString,
nsCSSDeclaration::TryBorderSideShorthand(nsAString & aString,
nsCSSProperty aShorthand,
PRInt32 & aBorderWidth,
PRInt32 & aBorderStyle,
@ -5497,7 +5497,7 @@ nsCSSDeclaration::TryBorderSideShorthand(nsAWritableString & aString,
}
void
nsCSSDeclaration::TryMarginOrPaddingShorthand(nsAWritableString & aString,
nsCSSDeclaration::TryMarginOrPaddingShorthand(nsAString & aString,
nsCSSProperty aShorthand,
PRInt32 & aTop,
PRInt32 & aBottom,
@ -5537,7 +5537,7 @@ nsCSSDeclaration::TryMarginOrPaddingShorthand(nsAWritableString & aString,
}
void
nsCSSDeclaration::TryBackgroundShorthand(nsAWritableString & aString,
nsCSSDeclaration::TryBackgroundShorthand(nsAString & aString,
PRInt32 & aBgColor,
PRInt32 & aBgImage,
PRInt32 & aBgRepeat,
@ -5583,7 +5583,7 @@ nsCSSDeclaration::TryBackgroundShorthand(nsAWritableString & aString,
}
void
nsCSSDeclaration::TryBackgroundPosition(nsAWritableString & aString,
nsCSSDeclaration::TryBackgroundPosition(nsAString & aString,
PRInt32 & aBgPositionX,
PRInt32 & aBgPositionY)
{
@ -5612,7 +5612,7 @@ case _prop: \
break;
nsresult
nsCSSDeclaration::ToString(nsAWritableString& aString)
nsCSSDeclaration::ToString(nsAString& aString)
{
if (nsnull != mOrder) {
PRInt32 count = mOrder->Count();
@ -5930,7 +5930,7 @@ nsCSSDeclaration::Count()
}
nsresult
nsCSSDeclaration::GetNthProperty(PRUint32 aIndex, nsAWritableString& aReturn)
nsCSSDeclaration::GetNthProperty(PRUint32 aIndex, nsAString& aReturn)
{
aReturn.Truncate();
if (nsnull != mOrder && aIndex < (PRUint32)mOrder->Count()) {

28
layout/style/nsCSSDeclaration.h
Просмотреть файл

@ -575,23 +575,23 @@ public:
nsresult AppendValue(nsCSSProperty aProperty, const nsCSSValue& aValue);
nsresult AppendStructValue(nsCSSProperty aProperty, void* aStruct);
nsresult SetValueImportant(nsCSSProperty aProperty);
nsresult AppendComment(const nsAReadableString& aComment);
nsresult AppendComment(const nsAString& aComment);
nsresult RemoveProperty(nsCSSProperty aProperty, nsCSSValue& aValue);
nsresult GetValue(nsCSSProperty aProperty, nsCSSValue& aValue);
nsresult GetValue(nsCSSProperty aProperty, nsAWritableString& aValue);
nsresult GetValue(const nsAReadableString& aProperty, nsAWritableString& aValue);
nsresult GetValue(nsCSSProperty aProperty, nsAString& aValue);
nsresult GetValue(const nsAString& aProperty, nsAString& aValue);
nsCSSDeclaration* GetImportantValues();
PRBool GetValueIsImportant(nsCSSProperty aProperty);
PRBool GetValueIsImportant(const nsAReadableString& aProperty);
PRBool GetValueIsImportant(const nsAString& aProperty);
PRUint32 Count();
nsresult GetNthProperty(PRUint32 aIndex, nsAWritableString& aReturn);
nsresult GetNthProperty(PRUint32 aIndex, nsAString& aReturn);
PRInt32 GetStyleImpact() const;
nsresult ToString(nsAWritableString& aString);
nsresult ToString(nsAString& aString);
nsCSSDeclaration* Clone() const;
@ -605,12 +605,12 @@ protected:
nsresult RemoveProperty(nsCSSProperty aProperty);
private:
PRBool AppendValueToString(nsCSSProperty aProperty, nsAWritableString& aResult);
PRBool AppendValueToString(nsCSSProperty aProperty, const nsCSSValue& aValue, nsAWritableString& aResult);
PRBool AppendValueToString(nsCSSProperty aProperty, nsAString& aResult);
PRBool AppendValueToString(nsCSSProperty aProperty, const nsCSSValue& aValue, nsAString& aResult);
nsCSSDeclaration& operator=(const nsCSSDeclaration& aCopy);
PRBool operator==(const nsCSSDeclaration& aCopy) const;
void TryBorderShorthand(nsAWritableString & aString,
void TryBorderShorthand(nsAString & aString,
PRInt32 & aBorderTopWidth,
PRInt32 & aBorderTopStyle,
PRInt32 & aBorderTopColor,
@ -623,28 +623,28 @@ private:
PRInt32 & aBorderRightWidth,
PRInt32 & aBorderRightStyle,
PRInt32 & aBorderRightColor);
void TryBorderSideShorthand(nsAWritableString & aString,
void TryBorderSideShorthand(nsAString & aString,
nsCSSProperty aShorthand,
PRInt32 & aBorderWidth,
PRInt32 & aBorderStyle,
PRInt32 & aBorderColor);
void TryMarginOrPaddingShorthand(nsAWritableString & aString,
void TryMarginOrPaddingShorthand(nsAString & aString,
nsCSSProperty aShorthand,
PRInt32 & aTop, PRInt32 & aBottom,
PRInt32 & aLeft, PRInt32 & aRight);
void TryBackgroundShorthand(nsAWritableString & aString,
void TryBackgroundShorthand(nsAString & aString,
PRInt32 & aBgColor, PRInt32 & aBgImage,
PRInt32 & aBgRepeat, PRInt32 & aBgAttachment,
PRInt32 & aBgPositionX,
PRInt32 & aBgPositionY);
void TryBackgroundPosition(nsAWritableString & aString,
void TryBackgroundPosition(nsAString & aString,
PRInt32 & aBgPositionX,
PRInt32 & aBgPositionY);
PRBool AllPropertiesSameValue(PRInt32 aFirst, PRInt32 aSecond,
PRInt32 aThird, PRInt32 aFourth);
void AppendPropertyAndValueToString(nsCSSProperty aProperty,
nsAWritableString& aResult);
nsAString& aResult);
protected:
//

4
layout/style/nsCSSLoader.cpp
Просмотреть файл

@ -217,7 +217,7 @@ public:
NS_IMETHOD SetCaseSensitive(PRBool aCaseSensitive);
NS_IMETHOD SetQuirkMode(PRBool aQuirkMode);
NS_IMETHOD SetPreferredSheet(const nsAReadableString& aTitle);
NS_IMETHOD SetPreferredSheet(const nsAString& aTitle);
NS_IMETHOD GetParserFor(nsICSSStyleSheet* aSheet,
nsICSSParser** aParser);
@ -533,7 +533,7 @@ CSSLoaderImpl::SetQuirkMode(PRBool aQuirkMode)
}
NS_IMETHODIMP
CSSLoaderImpl::SetPreferredSheet(const nsAReadableString& aTitle)
CSSLoaderImpl::SetPreferredSheet(const nsAString& aTitle)
{
mPreferredSheet = aTitle;

42
layout/style/nsCSSParser.cpp
Просмотреть файл

@ -162,29 +162,29 @@ public:
nsIURI* aInputURL,
nsICSSStyleSheet*& aResult);
NS_IMETHOD ParseStyleAttribute(const nsAReadableString& aAttributeValue,
nsIURI* aBaseURL,
nsIStyleRule** aResult);
NS_IMETHOD ParseStyleAttribute(const nsAString& aAttributeValue,
nsIURI* aBaseURL,
nsIStyleRule** aResult);
NS_IMETHOD ParseAndAppendDeclaration(const nsAReadableString& aBuffer,
nsIURI* aBaseURL,
nsCSSDeclaration* aDeclaration,
PRBool aParseOnlyOneDecl,
PRInt32* aHint);
NS_IMETHOD ParseAndAppendDeclaration(const nsAString& aBuffer,
nsIURI* aBaseURL,
nsCSSDeclaration* aDeclaration,
PRBool aParseOnlyOneDecl,
PRInt32* aHint);
NS_IMETHOD ParseRule(nsAReadableString& aRule,
NS_IMETHOD ParseRule(const nsAString& aRule,
nsIURI* aBaseURL,
nsISupportsArray** aResult);
NS_IMETHOD ParseProperty(const nsAReadableString& aPropName,
const nsAReadableString& aPropValue,
NS_IMETHOD ParseProperty(const nsAString& aPropName,
const nsAString& aPropValue,
nsIURI* aBaseURL,
nsCSSDeclaration* aDeclaration,
PRInt32* aHint);
NS_IMETHOD GetCharset(/*out*/nsAWritableString &aCharsetDest) const;
NS_IMETHOD GetCharset(/*out*/nsAString &aCharsetDest) const;
// sets the out-param to the current charset, as set by SetCharset
NS_IMETHOD SetCharset(/*in*/ const nsAReadableString &aCharsetSrc);
NS_IMETHOD SetCharset(/*in*/ const nsAString &aCharsetSrc);
// NOTE: SetCharset expects the charset to be the preferred charset
// and it just records the string exactly as passed in (no alias resolution)
void AppendRule(nsICSSRule* aRule);
@ -403,7 +403,7 @@ NS_NewCSSParser(nsICSSParser** aInstancePtrResult)
static void ReportUnexpectedToken(nsCSSScanner *sc,
nsCSSToken& tok,
const nsAReadableString& err)
const nsAString& err)
{
nsAutoString error(err + NS_LITERAL_STRING(" '"));
tok.AppendToString(error);
@ -624,7 +624,7 @@ CSSParserImpl::Parse(nsIUnicharInputStream* aInput,
}
NS_IMETHODIMP
CSSParserImpl::ParseStyleAttribute(const nsAReadableString& aAttributeValue,
CSSParserImpl::ParseStyleAttribute(const nsAString& aAttributeValue,
nsIURI* aBaseURL,
nsIStyleRule** aResult)
{
@ -684,7 +684,7 @@ CSSParserImpl::ParseStyleAttribute(const nsAReadableString& aAttributeValue,
}
NS_IMETHODIMP
CSSParserImpl::ParseAndAppendDeclaration(const nsAReadableString& aBuffer,
CSSParserImpl::ParseAndAppendDeclaration(const nsAString& aBuffer,
nsIURI* aBaseURL,
nsCSSDeclaration* aDeclaration,
PRBool aParseOnlyOneDecl,
@ -745,7 +745,7 @@ CSSParserImpl::ParseAndAppendDeclaration(const nsAReadableString& aBuffer,
}
NS_IMETHODIMP
CSSParserImpl::ParseRule(nsAReadableString& aRule,
CSSParserImpl::ParseRule(const nsAString& aRule,
nsIURI* aBaseURL,
nsISupportsArray** aResult)
{
@ -795,8 +795,8 @@ CSSParserImpl::ParseRule(nsAReadableString& aRule,
}
NS_IMETHODIMP
CSSParserImpl::ParseProperty(const nsAReadableString& aPropName,
const nsAReadableString& aPropValue,
CSSParserImpl::ParseProperty(const nsAString& aPropName,
const nsAString& aPropValue,
nsIURI* aBaseURL,
nsCSSDeclaration* aDeclaration,
PRInt32* aHint)
@ -5298,13 +5298,13 @@ PRBool CSSParserImpl::ParseTextShadow(PRInt32& aErrorCode,
return PR_FALSE;
}
NS_IMETHODIMP CSSParserImpl::GetCharset(/*out*/nsAWritableString &aCharsetDest) const
NS_IMETHODIMP CSSParserImpl::GetCharset(/*out*/nsAString &aCharsetDest) const
{
aCharsetDest = mCharset;
return NS_OK;
}
NS_IMETHODIMP CSSParserImpl::SetCharset(/*in*/ const nsAReadableString &aCharsetSrc)
NS_IMETHODIMP CSSParserImpl::SetCharset(/*in*/ const nsAString &aCharsetSrc)
{
mCharset = aCharsetSrc;
return NS_OK;

2
layout/style/nsCSSProps.cpp
Просмотреть файл

@ -104,7 +104,7 @@ nsCSSProps::LookupProperty(const nsACString& aProperty)
}
nsCSSProperty
nsCSSProps::LookupProperty(const nsAReadableString& aProperty) {
nsCSSProps::LookupProperty(const nsAString& aProperty) {
nsCAutoString theProp; theProp.AssignWithConversion(aProperty);
return LookupProperty(theProp);
}

2
layout/style/nsCSSProps.h
Просмотреть файл

@ -62,7 +62,7 @@ public:
static void ReleaseTable(void);
// Given a property string, return the enum value
static nsCSSProperty LookupProperty(const nsAReadableString& aProperty);
static nsCSSProperty LookupProperty(const nsAString& aProperty);
static nsCSSProperty LookupProperty(const nsACString& aProperty);
// Given a property enum, get the string value

20
layout/style/nsCSSRules.cpp
Просмотреть файл

@ -345,7 +345,7 @@ CSSCharsetRuleImpl::GetType(PRUint16* aType)
}
NS_IMETHODIMP
CSSCharsetRuleImpl::GetCssText(nsAWritableString& aCssText)
CSSCharsetRuleImpl::GetCssText(nsAString& aCssText)
{
aCssText.Assign(NS_LITERAL_STRING("@charset \""));
aCssText.Append(mEncoding);
@ -354,7 +354,7 @@ CSSCharsetRuleImpl::GetCssText(nsAWritableString& aCssText)
}
NS_IMETHODIMP
CSSCharsetRuleImpl::SetCssText(const nsAReadableString& aCssText)
CSSCharsetRuleImpl::SetCssText(const nsAString& aCssText)
{
return NS_ERROR_NOT_IMPLEMENTED;
}
@ -633,7 +633,7 @@ CSSImportRuleImpl::GetType(PRUint16* aType)
}
NS_IMETHODIMP
CSSImportRuleImpl::GetCssText(nsAWritableString& aCssText)
CSSImportRuleImpl::GetCssText(nsAString& aCssText)
{
aCssText.Assign(NS_LITERAL_STRING("@import url("));
aCssText.Append(mURLSpec);
@ -651,7 +651,7 @@ CSSImportRuleImpl::GetCssText(nsAWritableString& aCssText)
}
NS_IMETHODIMP
CSSImportRuleImpl::SetCssText(const nsAReadableString& aCssText)
CSSImportRuleImpl::SetCssText(const nsAString& aCssText)
{
return NS_ERROR_NOT_IMPLEMENTED;
}
@ -678,7 +678,7 @@ CSSImportRuleImpl::GetParentRule(nsIDOMCSSRule** aParentRule)
}
NS_IMETHODIMP
CSSImportRuleImpl::GetHref(nsAWritableString & aHref)
CSSImportRuleImpl::GetHref(nsAString & aHref)
{
aHref = mURLSpec;
return NS_OK;
@ -1119,7 +1119,7 @@ CSSMediaRuleImpl::GetType(PRUint16* aType)
}
NS_IMETHODIMP
CSSMediaRuleImpl::GetCssText(nsAWritableString& aCssText)
CSSMediaRuleImpl::GetCssText(nsAString& aCssText)
{
PRUint32 index;
PRUint32 count;
@ -1163,7 +1163,7 @@ CSSMediaRuleImpl::GetCssText(nsAWritableString& aCssText)
}
NS_IMETHODIMP
CSSMediaRuleImpl::SetCssText(const nsAReadableString& aCssText)
CSSMediaRuleImpl::SetCssText(const nsAString& aCssText)
{
return NS_ERROR_NOT_IMPLEMENTED;
}
@ -1216,7 +1216,7 @@ CSSMediaRuleImpl::GetCssRules(nsIDOMCSSRuleList* *aRuleList)
}
NS_IMETHODIMP
CSSMediaRuleImpl::InsertRule(nsAReadableString & aRule, PRUint32 aIndex, PRUint32* _retval)
CSSMediaRuleImpl::InsertRule(const nsAString & aRule, PRUint32 aIndex, PRUint32* _retval)
{
NS_ENSURE_TRUE(mSheet, NS_ERROR_FAILURE);
@ -1470,7 +1470,7 @@ CSSNameSpaceRuleImpl::GetType(PRUint16* aType)
}
NS_IMETHODIMP
CSSNameSpaceRuleImpl::GetCssText(nsAWritableString& aCssText)
CSSNameSpaceRuleImpl::GetCssText(nsAString& aCssText)
{
aCssText.Assign(NS_LITERAL_STRING("@namespace "));
if (mPrefix) {
@ -1486,7 +1486,7 @@ CSSNameSpaceRuleImpl::GetCssText(nsAWritableString& aCssText)
}
NS_IMETHODIMP
CSSNameSpaceRuleImpl::SetCssText(const nsAReadableString& aCssText)
CSSNameSpaceRuleImpl::SetCssText(const nsAString& aCssText)
{
return NS_ERROR_NOT_IMPLEMENTED;
}

2
layout/style/nsCSSScanner.cpp
Просмотреть файл

@ -227,7 +227,7 @@ void nsCSSScanner::Init(nsIUnicharInputStream* aInput, nsIURI* aURI)
#ifdef CSS_REPORT_PARSE_ERRORS
void nsCSSScanner::AddToError(const nsAReadableString& aErrorText)
void nsCSSScanner::AddToError(const nsAString& aErrorText)
{
if (mError.IsEmpty()) {
mErrorLineNumber = mLineNumber;

2
layout/style/nsCSSScanner.h
Просмотреть файл

@ -128,7 +128,7 @@ class nsCSSScanner {
void Init(nsIUnicharInputStream* aInput, nsIURI* aURI);
#ifdef CSS_REPORT_PARSE_ERRORS
void AddToError(const nsAReadableString& aErrorText);
void AddToError(const nsAString& aErrorText);
void OutputError();
void ClearError();
#endif

30
layout/style/nsCSSStruct.cpp
Просмотреть файл

@ -4013,7 +4013,7 @@ nsCSSDeclaration::RemoveProperty(nsCSSProperty aProperty, nsCSSValue& aValue)
}
nsresult
nsCSSDeclaration::AppendComment(const nsAReadableString& aComment)
nsCSSDeclaration::AppendComment(const nsAString& aComment)
{
return /* NS_ERROR_NOT_IMPLEMENTED, or not any longer that is */ NS_OK;
}
@ -4747,21 +4747,21 @@ nsCSSDeclaration::GetValue(nsCSSProperty aProperty, nsCSSValue& aValue)
nsresult
nsCSSDeclaration::GetValue(const nsAReadableString& aProperty,
nsAWritableString& aValue)
nsCSSDeclaration::GetValue(const nsAString& aProperty,
nsAString& aValue)
{
nsCSSProperty propID = nsCSSProps::LookupProperty(aProperty);
return GetValue(propID, aValue);
}
PRBool nsCSSDeclaration::AppendValueToString(nsCSSProperty aProperty, nsAWritableString& aResult)
PRBool nsCSSDeclaration::AppendValueToString(nsCSSProperty aProperty, nsAString& aResult)
{
nsCSSValue value;
GetValue(aProperty, value);
return AppendValueToString(aProperty, value, aResult);
}
PRBool nsCSSDeclaration::AppendValueToString(nsCSSProperty aProperty, const nsCSSValue& aValue, nsAWritableString& aResult)
PRBool nsCSSDeclaration::AppendValueToString(nsCSSProperty aProperty, const nsCSSValue& aValue, nsAString& aResult)
{
nsCSSUnit unit = aValue.GetUnit();
@ -4968,7 +4968,7 @@ PRBool nsCSSDeclaration::AppendValueToString(nsCSSProperty aProperty, const nsCS
nsresult
nsCSSDeclaration::GetValue(nsCSSProperty aProperty,
nsAWritableString& aValue)
nsAString& aValue)
{
PRBool isImportant = GetValueIsImportant(aProperty);
if (PR_TRUE == isImportant) {
@ -5323,7 +5323,7 @@ nsCSSDeclaration::GetImportantValues()
}
PRBool
nsCSSDeclaration::GetValueIsImportant(const nsAReadableString& aProperty)
nsCSSDeclaration::GetValueIsImportant(const nsAString& aProperty)
{
nsCSSProperty propID = nsCSSProps::LookupProperty(aProperty);
return GetValueIsImportant(propID);
@ -5376,7 +5376,7 @@ nsCSSDeclaration::AllPropertiesSameValue(PRInt32 aFirst, PRInt32 aSecond,
void
nsCSSDeclaration::AppendPropertyAndValueToString(nsCSSProperty aProperty,
nsAWritableString& aString)
nsAString& aString)
{
NS_ASSERTION(aProperty, "null CSS property passed to AppendPropertyAndValueToString.");
aString.Append(NS_ConvertASCIItoUCS2(nsCSSProps::GetStringValue(aProperty))
@ -5386,7 +5386,7 @@ nsCSSDeclaration::AppendPropertyAndValueToString(nsCSSProperty aProperty,
}
void
nsCSSDeclaration::TryBorderShorthand(nsAWritableString & aString,
nsCSSDeclaration::TryBorderShorthand(nsAString & aString,
PRInt32 & aBorderTopWidth,
PRInt32 & aBorderTopStyle,
PRInt32 & aBorderTopColor,
@ -5461,7 +5461,7 @@ nsCSSDeclaration::TryBorderShorthand(nsAWritableString & aString,
}
void
nsCSSDeclaration::TryBorderSideShorthand(nsAWritableString & aString,
nsCSSDeclaration::TryBorderSideShorthand(nsAString & aString,
nsCSSProperty aShorthand,
PRInt32 & aBorderWidth,
PRInt32 & aBorderStyle,
@ -5497,7 +5497,7 @@ nsCSSDeclaration::TryBorderSideShorthand(nsAWritableString & aString,
}
void
nsCSSDeclaration::TryMarginOrPaddingShorthand(nsAWritableString & aString,
nsCSSDeclaration::TryMarginOrPaddingShorthand(nsAString & aString,
nsCSSProperty aShorthand,
PRInt32 & aTop,
PRInt32 & aBottom,
@ -5537,7 +5537,7 @@ nsCSSDeclaration::TryMarginOrPaddingShorthand(nsAWritableString & aString,
}
void
nsCSSDeclaration::TryBackgroundShorthand(nsAWritableString & aString,
nsCSSDeclaration::TryBackgroundShorthand(nsAString & aString,
PRInt32 & aBgColor,
PRInt32 & aBgImage,
PRInt32 & aBgRepeat,
@ -5583,7 +5583,7 @@ nsCSSDeclaration::TryBackgroundShorthand(nsAWritableString & aString,
}
void
nsCSSDeclaration::TryBackgroundPosition(nsAWritableString & aString,
nsCSSDeclaration::TryBackgroundPosition(nsAString & aString,
PRInt32 & aBgPositionX,
PRInt32 & aBgPositionY)
{
@ -5612,7 +5612,7 @@ case _prop: \
break;
nsresult
nsCSSDeclaration::ToString(nsAWritableString& aString)
nsCSSDeclaration::ToString(nsAString& aString)
{
if (nsnull != mOrder) {
PRInt32 count = mOrder->Count();
@ -5930,7 +5930,7 @@ nsCSSDeclaration::Count()
}
nsresult
nsCSSDeclaration::GetNthProperty(PRUint32 aIndex, nsAWritableString& aReturn)
nsCSSDeclaration::GetNthProperty(PRUint32 aIndex, nsAString& aReturn)
{
aReturn.Truncate();
if (nsnull != mOrder && aIndex < (PRUint32)mOrder->Count()) {

28
layout/style/nsCSSStruct.h
Просмотреть файл

@ -575,23 +575,23 @@ public:
nsresult AppendValue(nsCSSProperty aProperty, const nsCSSValue& aValue);
nsresult AppendStructValue(nsCSSProperty aProperty, void* aStruct);
nsresult SetValueImportant(nsCSSProperty aProperty);
nsresult AppendComment(const nsAReadableString& aComment);
nsresult AppendComment(const nsAString& aComment);
nsresult RemoveProperty(nsCSSProperty aProperty, nsCSSValue& aValue);
nsresult GetValue(nsCSSProperty aProperty, nsCSSValue& aValue);
nsresult GetValue(nsCSSProperty aProperty, nsAWritableString& aValue);
nsresult GetValue(const nsAReadableString& aProperty, nsAWritableString& aValue);
nsresult GetValue(nsCSSProperty aProperty, nsAString& aValue);
nsresult GetValue(const nsAString& aProperty, nsAString& aValue);
nsCSSDeclaration* GetImportantValues();
PRBool GetValueIsImportant(nsCSSProperty aProperty);
PRBool GetValueIsImportant(const nsAReadableString& aProperty);
PRBool GetValueIsImportant(const nsAString& aProperty);
PRUint32 Count();
nsresult GetNthProperty(PRUint32 aIndex, nsAWritableString& aReturn);
nsresult GetNthProperty(PRUint32 aIndex, nsAString& aReturn);
PRInt32 GetStyleImpact() const;
nsresult ToString(nsAWritableString& aString);
nsresult ToString(nsAString& aString);
nsCSSDeclaration* Clone() const;
@ -605,12 +605,12 @@ protected:
nsresult RemoveProperty(nsCSSProperty aProperty);
private:
PRBool AppendValueToString(nsCSSProperty aProperty, nsAWritableString& aResult);
PRBool AppendValueToString(nsCSSProperty aProperty, const nsCSSValue& aValue, nsAWritableString& aResult);
PRBool AppendValueToString(nsCSSProperty aProperty, nsAString& aResult);
PRBool AppendValueToString(nsCSSProperty aProperty, const nsCSSValue& aValue, nsAString& aResult);
nsCSSDeclaration& operator=(const nsCSSDeclaration& aCopy);
PRBool operator==(const nsCSSDeclaration& aCopy) const;
void TryBorderShorthand(nsAWritableString & aString,
void TryBorderShorthand(nsAString & aString,
PRInt32 & aBorderTopWidth,
PRInt32 & aBorderTopStyle,
PRInt32 & aBorderTopColor,
@ -623,28 +623,28 @@ private:
PRInt32 & aBorderRightWidth,
PRInt32 & aBorderRightStyle,
PRInt32 & aBorderRightColor);
void TryBorderSideShorthand(nsAWritableString & aString,
void TryBorderSideShorthand(nsAString & aString,
nsCSSProperty aShorthand,
PRInt32 & aBorderWidth,
PRInt32 & aBorderStyle,
PRInt32 & aBorderColor);
void TryMarginOrPaddingShorthand(nsAWritableString & aString,
void TryMarginOrPaddingShorthand(nsAString & aString,
nsCSSProperty aShorthand,
PRInt32 & aTop, PRInt32 & aBottom,
PRInt32 & aLeft, PRInt32 & aRight);
void TryBackgroundShorthand(nsAWritableString & aString,
void TryBackgroundShorthand(nsAString & aString,
PRInt32 & aBgColor, PRInt32 & aBgImage,
PRInt32 & aBgRepeat, PRInt32 & aBgAttachment,
PRInt32 & aBgPositionX,
PRInt32 & aBgPositionY);
void TryBackgroundPosition(nsAWritableString & aString,
void TryBackgroundPosition(nsAString & aString,
PRInt32 & aBgPositionX,
PRInt32 & aBgPositionY);
PRBool AllPropertiesSameValue(PRInt32 aFirst, PRInt32 aSecond,
PRInt32 aThird, PRInt32 aFourth);
void AppendPropertyAndValueToString(nsCSSProperty aProperty,
nsAWritableString& aResult);
nsAString& aResult);
protected:
//

32
layout/style/nsCSSStyleRule.cpp
Просмотреть файл

@ -695,7 +695,7 @@ static PRBool IsPseudoElement(nsIAtom* aAtom)
return PR_FALSE;
}
void nsCSSSelector::AppendNegationToString(nsAWritableString& aString)
void nsCSSSelector::AppendNegationToString(nsAString& aString)
{
aString.Append(NS_LITERAL_STRING(":not("));
}
@ -704,7 +704,7 @@ void nsCSSSelector::AppendNegationToString(nsAWritableString& aString)
// Builds the textual representation of a selector. Called by DOM 2 CSS
// StyleRule:selectorText
//
nsresult nsCSSSelector::ToString( nsAWritableString& aString, nsICSSStyleSheet* aSheet, PRBool aIsPseudoElem,
nsresult nsCSSSelector::ToString( nsAString& aString, nsICSSStyleSheet* aSheet, PRBool aIsPseudoElem,
PRInt8 aNegatedIndex) const
{
const PRUnichar* temp;
@ -1068,8 +1068,8 @@ public:
DOMCSSDeclarationImpl(nsICSSStyleRule *aRule);
~DOMCSSDeclarationImpl(void);
NS_IMETHOD RemoveProperty(const nsAReadableString& aPropertyName,
nsAWritableString& aReturn);
NS_IMETHOD RemoveProperty(const nsAString& aPropertyName,
nsAString& aReturn);
virtual void DropReference(void);
virtual nsresult GetCSSDeclaration(nsCSSDeclaration **aDecl,
@ -1081,9 +1081,9 @@ public:
nsIURI** aURI,
nsICSSLoader** aCSSLoader,
nsICSSParser** aCSSParser);
virtual nsresult ParsePropertyValue(const nsAReadableString& aPropName,
const nsAReadableString& aPropValue);
virtual nsresult ParseDeclaration(const nsAReadableString& aDecl,
virtual nsresult ParsePropertyValue(const nsAString& aPropName,
const nsAString& aPropValue);
virtual nsresult ParseDeclaration(const nsAString& aDecl,
PRBool aParseOnlyOneDecl,
PRBool aClearOldDecl);
virtual nsresult GetParent(nsISupports **aParent);
@ -1109,8 +1109,8 @@ DOMCSSDeclarationImpl::~DOMCSSDeclarationImpl(void)
}
NS_IMETHODIMP
DOMCSSDeclarationImpl::RemoveProperty(const nsAReadableString& aPropertyName,
nsAWritableString& aReturn)
DOMCSSDeclarationImpl::RemoveProperty(const nsAString& aPropertyName,
nsAString& aReturn)
{
aReturn.Truncate();
@ -1233,8 +1233,8 @@ DOMCSSDeclarationImpl::GetCSSParsingEnvironment(nsICSSStyleRule* aRule,
}
nsresult
DOMCSSDeclarationImpl::ParsePropertyValue(const nsAReadableString& aPropName,
const nsAReadableString& aPropValue)
DOMCSSDeclarationImpl::ParsePropertyValue(const nsAString& aPropName,
const nsAString& aPropValue)
{
nsCSSDeclaration* decl;
nsresult result = GetCSSDeclaration(&decl, PR_TRUE);
@ -1279,7 +1279,7 @@ DOMCSSDeclarationImpl::ParsePropertyValue(const nsAReadableString& aPropName,
}
nsresult
DOMCSSDeclarationImpl::ParseDeclaration(const nsAReadableString& aDecl,
DOMCSSDeclarationImpl::ParseDeclaration(const nsAString& aDecl,
PRBool aParseOnlyOneDecl,
PRBool aClearOldDecl)
{
@ -2500,7 +2500,7 @@ CSSStyleRuleImpl::GetType(PRUint16* aType)
}
NS_IMETHODIMP
CSSStyleRuleImpl::GetCssText(nsAWritableString& aCssText)
CSSStyleRuleImpl::GetCssText(nsAString& aCssText)
{
mSelector.ToString( aCssText, mSheet, IsPseudoElement(mSelector.mTag),
0 );
@ -2519,7 +2519,7 @@ CSSStyleRuleImpl::GetCssText(nsAWritableString& aCssText)
}
NS_IMETHODIMP
CSSStyleRuleImpl::SetCssText(const nsAReadableString& aCssText)
CSSStyleRuleImpl::SetCssText(const nsAString& aCssText)
{
// XXX TBI - need to re-parse rule & declaration
return NS_OK;
@ -2546,14 +2546,14 @@ CSSStyleRuleImpl::GetParentRule(nsIDOMCSSRule** aParentRule)
}
NS_IMETHODIMP
CSSStyleRuleImpl::GetSelectorText(nsAWritableString& aSelectorText)
CSSStyleRuleImpl::GetSelectorText(nsAString& aSelectorText)
{
mSelector.ToString( aSelectorText, mSheet, IsPseudoElement(mSelector.mTag), 0 );
return NS_OK;
}
NS_IMETHODIMP
CSSStyleRuleImpl::SetSelectorText(const nsAReadableString& aSelectorText)
CSSStyleRuleImpl::SetSelectorText(const nsAString& aSelectorText)
{
// XXX TBI - get a parser and re-parse the selectors,
// XXX then need to re-compute the cascade

36
layout/style/nsCSSStyleSheet.cpp
Просмотреть файл

@ -820,7 +820,7 @@ public:
NS_IMETHOD AppendMedium(nsIAtom* aMedium);
NS_IMETHOD ClearMedia(void);
NS_IMETHOD DeleteRuleFromGroup(nsICSSGroupRule* aGroup, PRUint32 aIndex);
NS_IMETHOD InsertRuleIntoGroup(nsAReadableString& aRule, nsICSSGroupRule* aGroup, PRUint32 aIndex, PRUint32* _retval);
NS_IMETHOD InsertRuleIntoGroup(const nsAString& aRule, nsICSSGroupRule* aGroup, PRUint32 aIndex, PRUint32* _retval);
NS_IMETHOD GetEnabled(PRBool& aEnabled) const;
NS_IMETHOD SetEnabled(PRBool aEnabled);
@ -1038,8 +1038,8 @@ class DOMMediaListImpl : public nsIDOMMediaList,
private:
nsresult BeginMediaChange(void);
nsresult EndMediaChange(void);
nsresult Delete(nsAReadableString & aOldMedium);
nsresult Append(nsAReadableString & aOldMedium);
nsresult Delete(const nsAString & aOldMedium);
nsresult Append(const nsAString & aOldMedium);
nsCOMPtr<nsISupportsArray> mArray;
// not refcounted; sheet will let us know when it goes away
@ -1082,7 +1082,7 @@ NS_NewMediaList(nsIMediaList** aInstancePtrResult) {
}
nsresult
NS_NewMediaList(const nsAReadableString& aMediaText, nsIMediaList** aInstancePtrResult) {
NS_NewMediaList(const nsAString& aMediaText, nsIMediaList** aInstancePtrResult) {
nsresult rv;
NS_ASSERTION(aInstancePtrResult, "Null out param.");
@ -1114,7 +1114,7 @@ nsresult NS_NewMediaList(nsISupportsArray* aArray, nsICSSStyleSheet* aSheet, nsI
}
NS_IMETHODIMP
DOMMediaListImpl::GetText(nsAWritableString& aMediaText)
DOMMediaListImpl::GetText(nsAString& aMediaText)
{
aMediaText.Truncate();
@ -1141,7 +1141,7 @@ DOMMediaListImpl::GetText(nsAWritableString& aMediaText)
}
NS_IMETHODIMP
DOMMediaListImpl::SetText(const nsAReadableString& aMediaText)
DOMMediaListImpl::SetText(const nsAString& aMediaText)
{
nsresult rv = Clear();
NS_ENSURE_SUCCESS(rv, rv);
@ -1202,13 +1202,13 @@ DOMMediaListImpl::DropReference(void)
}
NS_IMETHODIMP
DOMMediaListImpl::GetMediaText(nsAWritableString& aMediaText)
DOMMediaListImpl::GetMediaText(nsAString& aMediaText)
{
return GetText(aMediaText);
}
NS_IMETHODIMP
DOMMediaListImpl::SetMediaText(nsAReadableString& aMediaText)
DOMMediaListImpl::SetMediaText(const nsAString& aMediaText)
{
nsresult rv;
rv = BeginMediaChange();
@ -1239,7 +1239,7 @@ DOMMediaListImpl::GetLength(PRUint32* aLength)
}
NS_IMETHODIMP
DOMMediaListImpl::Item(PRUint32 aIndex, nsAWritableString& aReturn)
DOMMediaListImpl::Item(PRUint32 aIndex, nsAString& aReturn)
{
nsCOMPtr<nsISupports> tmp(dont_AddRef(ElementAt(aIndex)));
@ -1258,7 +1258,7 @@ DOMMediaListImpl::Item(PRUint32 aIndex, nsAWritableString& aReturn)
}
NS_IMETHODIMP
DOMMediaListImpl::DeleteMedium(const nsAReadableString& aOldMedium)
DOMMediaListImpl::DeleteMedium(const nsAString& aOldMedium)
{
nsresult rv;
rv = BeginMediaChange();
@ -1274,7 +1274,7 @@ DOMMediaListImpl::DeleteMedium(const nsAReadableString& aOldMedium)
}
NS_IMETHODIMP
DOMMediaListImpl::AppendMedium(const nsAReadableString& aNewMedium)
DOMMediaListImpl::AppendMedium(const nsAString& aNewMedium)
{
nsresult rv;
rv = BeginMediaChange();
@ -1290,7 +1290,7 @@ DOMMediaListImpl::AppendMedium(const nsAReadableString& aNewMedium)
}
nsresult
DOMMediaListImpl::Delete(const nsAReadableString& aOldMedium)
DOMMediaListImpl::Delete(const nsAString& aOldMedium)
{
if (aOldMedium.IsEmpty())
return NS_ERROR_DOM_NOT_FOUND_ERR;
@ -1310,7 +1310,7 @@ DOMMediaListImpl::Delete(const nsAReadableString& aOldMedium)
}
nsresult
DOMMediaListImpl::Append(const nsAReadableString& aNewMedium)
DOMMediaListImpl::Append(const nsAString& aNewMedium)
{
if (aNewMedium.IsEmpty())
return NS_ERROR_DOM_NOT_FOUND_ERR;
@ -2641,7 +2641,7 @@ CSSStyleSheetImpl::SetModified(PRBool aModified)
// nsIDOMStyleSheet interface
NS_IMETHODIMP
CSSStyleSheetImpl::GetType(nsAWritableString& aType)
CSSStyleSheetImpl::GetType(nsAString& aType)
{
aType.Assign(NS_LITERAL_STRING("text/css"));
return NS_OK;
@ -2693,7 +2693,7 @@ CSSStyleSheetImpl::GetParentStyleSheet(nsIDOMStyleSheet** aParentStyleSheet)
}
NS_IMETHODIMP
CSSStyleSheetImpl::GetHref(nsAWritableString& aHref)
CSSStyleSheetImpl::GetHref(nsAString& aHref)
{
if (mInner && mInner->mURL) {
nsCAutoString str;
@ -2715,7 +2715,7 @@ CSSStyleSheetImpl::GetTitle(nsString& aTitle) const
}
NS_IMETHODIMP
CSSStyleSheetImpl::GetTitle(nsAWritableString& aTitle)
CSSStyleSheetImpl::GetTitle(nsAString& aTitle)
{
aTitle.Assign(mTitle);
return NS_OK;
@ -2772,7 +2772,7 @@ CSSStyleSheetImpl::GetCssRules(nsIDOMCSSRuleList** aCssRules)
}
NS_IMETHODIMP
CSSStyleSheetImpl::InsertRule(const nsAReadableString& aRule,
CSSStyleSheetImpl::InsertRule(const nsAString& aRule,
PRUint32 aIndex,
PRUint32* aReturn)
{
@ -3032,7 +3032,7 @@ CSSStyleSheetImpl::DeleteRuleFromGroup(nsICSSGroupRule* aGroup, PRUint32 aIndex)
}
NS_IMETHODIMP
CSSStyleSheetImpl::InsertRuleIntoGroup(nsAReadableString & aRule, nsICSSGroupRule* aGroup, PRUint32 aIndex, PRUint32* _retval)
CSSStyleSheetImpl::InsertRuleIntoGroup(const nsAString & aRule, nsICSSGroupRule* aGroup, PRUint32 aIndex, PRUint32* _retval)
{
nsresult result;
// check that the group actually belongs to this sheet!

8
layout/style/nsCSSValue.cpp
Просмотреть файл

@ -71,7 +71,7 @@ nsCSSValue::nsCSSValue(float aValue, nsCSSUnit aUnit)
}
}
nsCSSValue::nsCSSValue(const nsAReadableString& aValue, nsCSSUnit aUnit)
nsCSSValue::nsCSSValue(const nsAString& aValue, nsCSSUnit aUnit)
: mUnit(aUnit)
{
NS_ASSERTION((eCSSUnit_String <= aUnit) && (aUnit <= eCSSUnit_Counters), "not a string value");
@ -171,7 +171,7 @@ void nsCSSValue::SetIntValue(PRInt32 aValue, nsCSSUnit aUnit)
}
}
void nsCSSValue::SetStringValue(const nsAReadableString& aValue,
void nsCSSValue::SetStringValue(const nsAString& aValue,
nsCSSUnit aUnit)
{
NS_ASSERTION((eCSSUnit_String <= aUnit) && (aUnit <= eCSSUnit_Counters), "not a string unit");
@ -219,7 +219,7 @@ void nsCSSValue::SetNormalValue(void)
mUnit = eCSSUnit_Normal;
}
void nsCSSValue::AppendToString(nsAWritableString& aBuffer,
void nsCSSValue::AppendToString(nsAString& aBuffer,
nsCSSProperty aPropID) const
{
if (eCSSUnit_Null == mUnit) {
@ -345,7 +345,7 @@ void nsCSSValue::AppendToString(nsAWritableString& aBuffer,
aBuffer.Append(NS_LITERAL_STRING(" "));
}
void nsCSSValue::ToString(nsAWritableString& aBuffer,
void nsCSSValue::ToString(nsAString& aBuffer,
nsCSSProperty aPropID) const
{
aBuffer.Truncate();

12
layout/style/nsCSSValue.h
Просмотреть файл

@ -126,7 +126,7 @@ public:
nsCSSValue(PRInt32 aValue, nsCSSUnit aUnit);
nsCSSValue(float aValue, nsCSSUnit aUnit);
nsCSSValue(const nsAReadableString& aValue, nsCSSUnit aUnit);
nsCSSValue(const nsAString& aValue, nsCSSUnit aUnit);
nsCSSValue(nscolor aValue);
nsCSSValue(const nsCSSValue& aCopy);
~nsCSSValue(void)
@ -156,7 +156,7 @@ public:
PRInt32 GetIntValue(void) const;
float GetPercentValue(void) const;
float GetFloatValue(void) const;
nsAWritableString& GetStringValue(nsAWritableString& aBuffer) const;
nsAString& GetStringValue(nsAString& aBuffer) const;
nscolor GetColorValue(void) const;
nscoord GetLengthTwips(void) const
{
@ -224,7 +224,7 @@ public:
}
}
void SetStringValue(const nsAReadableString& aValue, nsCSSUnit aUnit);
void SetStringValue(const nsAString& aValue, nsCSSUnit aUnit);
void SetColorValue(nscolor aValue);
void SetAutoValue(void);
void SetInheritValue(void);
@ -233,8 +233,8 @@ public:
void SetNormalValue(void);
// debugging methods only
void AppendToString(nsAWritableString& aBuffer, nsCSSProperty aPropID = eCSSProperty_UNKNOWN) const;
void ToString(nsAWritableString& aBuffer, nsCSSProperty aPropID = eCSSProperty_UNKNOWN) const;
void AppendToString(nsAString& aBuffer, nsCSSProperty aPropID = eCSSProperty_UNKNOWN) const;
void ToString(nsAString& aBuffer, nsCSSProperty aPropID = eCSSProperty_UNKNOWN) const;
protected:
nsCSSUnit mUnit;
@ -275,7 +275,7 @@ inline float nsCSSValue::GetFloatValue(void) const
return 0.0f;
}
inline nsAWritableString& nsCSSValue::GetStringValue(nsAWritableString& aBuffer) const
inline nsAString& nsCSSValue::GetStringValue(nsAString& aBuffer) const
{
NS_ASSERTION((eCSSUnit_String <= mUnit) && (mUnit <= eCSSUnit_Counters), "not a string value");
aBuffer.Truncate();

252
layout/style/nsComputedDOMStyle.cpp
Просмотреть файл

@ -210,7 +210,7 @@ NS_IMPL_RELEASE(nsComputedDOMStyle);
NS_IMETHODIMP
nsComputedDOMStyle::Init(nsIDOMElement *aElement,
const nsAReadableString& aPseudoElt,
const nsAString& aPseudoElt,
nsIPresShell *aPresShell)
{
NS_ENSURE_ARG_POINTER(aElement);
@ -241,7 +241,7 @@ nsComputedDOMStyle::Init(nsIDOMElement *aElement,
}
NS_IMETHODIMP
nsComputedDOMStyle::GetCssText(nsAWritableString& aCssText)
nsComputedDOMStyle::GetCssText(nsAString& aCssText)
{
aCssText.Truncate();
return NS_OK;
@ -249,7 +249,7 @@ nsComputedDOMStyle::GetCssText(nsAWritableString& aCssText)
NS_IMETHODIMP
nsComputedDOMStyle::SetCssText(const nsAReadableString& aCssText)
nsComputedDOMStyle::SetCssText(const nsAString& aCssText)
{
return NS_ERROR_DOM_NO_MODIFICATION_ALLOWED_ERR;
}
@ -275,8 +275,8 @@ nsComputedDOMStyle::GetParentRule(nsIDOMCSSRule** aParentRule)
NS_IMETHODIMP
nsComputedDOMStyle::GetPropertyValue(const nsAReadableString& aPropertyName,
nsAWritableString& aReturn)
nsComputedDOMStyle::GetPropertyValue(const nsAString& aPropertyName,
nsAString& aReturn)
{
nsCOMPtr<nsIDOMCSSValue> val;
@ -294,7 +294,7 @@ nsComputedDOMStyle::GetPropertyValue(const nsAReadableString& aPropertyName,
NS_IMETHODIMP
nsComputedDOMStyle::GetPropertyCSSValue(const nsAReadableString& aPropertyName,
nsComputedDOMStyle::GetPropertyCSSValue(const nsAString& aPropertyName,
nsIDOMCSSValue** aReturn)
{
NS_ENSURE_ARG_POINTER(aReturn);
@ -512,16 +512,16 @@ nsComputedDOMStyle::GetPropertyCSSValue(const nsAReadableString& aPropertyName,
NS_IMETHODIMP
nsComputedDOMStyle::RemoveProperty(const nsAReadableString& aPropertyName,
nsAWritableString& aReturn)
nsComputedDOMStyle::RemoveProperty(const nsAString& aPropertyName,
nsAString& aReturn)
{
return NS_ERROR_DOM_NO_MODIFICATION_ALLOWED_ERR;
}
NS_IMETHODIMP
nsComputedDOMStyle::GetPropertyPriority(const nsAReadableString& aPropertyName,
nsAWritableString& aReturn)
nsComputedDOMStyle::GetPropertyPriority(const nsAString& aPropertyName,
nsAString& aReturn)
{
aReturn.Truncate();
return NS_OK;
@ -529,16 +529,16 @@ nsComputedDOMStyle::GetPropertyPriority(const nsAReadableString& aPropertyName,
NS_IMETHODIMP
nsComputedDOMStyle::SetProperty(const nsAReadableString& aPropertyName,
const nsAReadableString& aValue,
const nsAReadableString& aPriority)
nsComputedDOMStyle::SetProperty(const nsAString& aPropertyName,
const nsAString& aValue,
const nsAString& aPriority)
{
return NS_ERROR_DOM_NO_MODIFICATION_ALLOWED_ERR;
}
NS_IMETHODIMP
nsComputedDOMStyle::Item(PRUint32 aIndex, nsAWritableString& aReturn)
nsComputedDOMStyle::Item(PRUint32 aIndex, nsAString& aReturn)
{
PRUint32 length;
GetLength(&length);
@ -555,43 +555,43 @@ nsComputedDOMStyle::Item(PRUint32 aIndex, nsAWritableString& aReturn)
#if 0
NS_IMETHODIMP
nsComputedDOMStyle::GetAzimuth(nsAWritableString& aAzimuth)
nsComputedDOMStyle::GetAzimuth(nsAString& aAzimuth)
{
return NS_ERROR_DOM_NOT_SUPPORTED_ERR;
}
NS_IMETHODIMP
nsComputedDOMStyle::GetBackground(nsAWritableString& aBackground)
nsComputedDOMStyle::GetBackground(nsAString& aBackground)
{
return NS_ERROR_DOM_NOT_SUPPORTED_ERR;
}
NS_IMETHODIMP
nsComputedDOMStyle::GetBackgroundAttachment(nsAWritableString& aBackgroundAttachment)
nsComputedDOMStyle::GetBackgroundAttachment(nsAString& aBackgroundAttachment)
{
return NS_ERROR_DOM_NOT_SUPPORTED_ERR;
}
NS_IMETHODIMP
nsComputedDOMStyle::GetBackgroundColor(nsAWritableString& aBackgroundColor)
nsComputedDOMStyle::GetBackgroundColor(nsAString& aBackgroundColor)
{
return NS_ERROR_DOM_NOT_SUPPORTED_ERR;
}
NS_IMETHODIMP
nsComputedDOMStyle::GetBackgroundImage(nsAWritableString& aBackgroundImage)
nsComputedDOMStyle::GetBackgroundImage(nsAString& aBackgroundImage)
{
return NS_ERROR_DOM_NOT_SUPPORTED_ERR;
}
NS_IMETHODIMP
nsComputedDOMStyle::GetBackgroundPosition(nsAWritableString& aBackgroundPosition)
nsComputedDOMStyle::GetBackgroundPosition(nsAString& aBackgroundPosition)
{
return NS_ERROR_DOM_NOT_SUPPORTED_ERR;
}
NS_IMETHODIMP
nsComputedDOMStyle::GetBackgroundRepeat(nsAWritableString& aBackgroundRepeat)
nsComputedDOMStyle::GetBackgroundRepeat(nsAString& aBackgroundRepeat)
{
return NS_ERROR_DOM_NOT_SUPPORTED_ERR;
}
@ -670,133 +670,133 @@ nsComputedDOMStyle::GetCssFloat(nsIFrame *aFrame,
#if 0
NS_IMETHODIMP
nsComputedDOMStyle::GetBorder(nsAWritableString& aBorder)
nsComputedDOMStyle::GetBorder(nsAString& aBorder)
{
return NS_ERROR_DOM_NOT_SUPPORTED_ERR;
}
NS_IMETHODIMP
nsComputedDOMStyle::GetBorderCollapse(nsAWritableString& aBorderCollapse)
nsComputedDOMStyle::GetBorderCollapse(nsAString& aBorderCollapse)
{
return NS_ERROR_DOM_NOT_SUPPORTED_ERR;
}
NS_IMETHODIMP
nsComputedDOMStyle::GetBorderColor(nsAWritableString& aBorderColor)
nsComputedDOMStyle::GetBorderColor(nsAString& aBorderColor)
{
return NS_ERROR_DOM_NOT_SUPPORTED_ERR;
}
NS_IMETHODIMP
nsComputedDOMStyle::GetBorderSpacing(nsAWritableString& aBorderSpacing)
nsComputedDOMStyle::GetBorderSpacing(nsAString& aBorderSpacing)
{
return NS_ERROR_DOM_NOT_SUPPORTED_ERR;
}
NS_IMETHODIMP
nsComputedDOMStyle::GetBorderStyle(nsAWritableString& aBorderStyle)
nsComputedDOMStyle::GetBorderStyle(nsAString& aBorderStyle)
{
return NS_ERROR_DOM_NOT_SUPPORTED_ERR;
}
NS_IMETHODIMP
nsComputedDOMStyle::GetBorderTop(nsAWritableString& aBorderTop)
nsComputedDOMStyle::GetBorderTop(nsAString& aBorderTop)
{
return NS_ERROR_DOM_NOT_SUPPORTED_ERR;
}
NS_IMETHODIMP
nsComputedDOMStyle::GetBorderRight(nsAWritableString& aBorderRight)
nsComputedDOMStyle::GetBorderRight(nsAString& aBorderRight)
{
return NS_ERROR_DOM_NOT_SUPPORTED_ERR;
}
NS_IMETHODIMP
nsComputedDOMStyle::GetBorderBottom(nsAWritableString& aBorderBottom)
nsComputedDOMStyle::GetBorderBottom(nsAString& aBorderBottom)
{
return NS_ERROR_DOM_NOT_SUPPORTED_ERR;
}
NS_IMETHODIMP
nsComputedDOMStyle::GetBorderLeft(nsAWritableString& aBorderLeft)
nsComputedDOMStyle::GetBorderLeft(nsAString& aBorderLeft)
{
return NS_ERROR_DOM_NOT_SUPPORTED_ERR;
}
NS_IMETHODIMP
nsComputedDOMStyle::GetBorderTopColor(nsAWritableString& aBorderTopColor)
nsComputedDOMStyle::GetBorderTopColor(nsAString& aBorderTopColor)
{
return NS_ERROR_DOM_NOT_SUPPORTED_ERR;
}
NS_IMETHODIMP
nsComputedDOMStyle::GetBorderRightColor(nsAWritableString& aBorderRightColor)
nsComputedDOMStyle::GetBorderRightColor(nsAString& aBorderRightColor)
{
return NS_ERROR_DOM_NOT_SUPPORTED_ERR;
}
NS_IMETHODIMP
nsComputedDOMStyle::GetBorderBottomColor(nsAWritableString& aBorderBottomColor)
nsComputedDOMStyle::GetBorderBottomColor(nsAString& aBorderBottomColor)
{
return NS_ERROR_DOM_NOT_SUPPORTED_ERR;
}
NS_IMETHODIMP
nsComputedDOMStyle::GetBorderLeftColor(nsAWritableString& aBorderLeftColor)
nsComputedDOMStyle::GetBorderLeftColor(nsAString& aBorderLeftColor)
{
return NS_ERROR_DOM_NOT_SUPPORTED_ERR;
}
NS_IMETHODIMP
nsComputedDOMStyle::GetBorderTopStyle(nsAWritableString& aBorderTopStyle)
nsComputedDOMStyle::GetBorderTopStyle(nsAString& aBorderTopStyle)
{
return NS_ERROR_DOM_NOT_SUPPORTED_ERR;
}
NS_IMETHODIMP
nsComputedDOMStyle::GetBorderRightStyle(nsAWritableString& aBorderRightStyle)
nsComputedDOMStyle::GetBorderRightStyle(nsAString& aBorderRightStyle)
{
return NS_ERROR_DOM_NOT_SUPPORTED_ERR;
}
NS_IMETHODIMP
nsComputedDOMStyle::GetBorderBottomStyle(nsAWritableString& aBorderBottomStyle)
nsComputedDOMStyle::GetBorderBottomStyle(nsAString& aBorderBottomStyle)
{
return NS_ERROR_DOM_NOT_SUPPORTED_ERR;
}
NS_IMETHODIMP
nsComputedDOMStyle::GetBorderLeftStyle(nsAWritableString& aBorderLeftStyle)
nsComputedDOMStyle::GetBorderLeftStyle(nsAString& aBorderLeftStyle)
{
return NS_ERROR_DOM_NOT_SUPPORTED_ERR;
}
NS_IMETHODIMP
nsComputedDOMStyle::GetBorderTopWidth(nsAWritableString& aBorderTopWidth)
nsComputedDOMStyle::GetBorderTopWidth(nsAString& aBorderTopWidth)
{
return NS_ERROR_DOM_NOT_SUPPORTED_ERR;
}
NS_IMETHODIMP
nsComputedDOMStyle::GetBorderRightWidth(nsAWritableString& aBorderRightWidth)
nsComputedDOMStyle::GetBorderRightWidth(nsAString& aBorderRightWidth)
{
return NS_ERROR_DOM_NOT_SUPPORTED_ERR;
}
NS_IMETHODIMP
nsComputedDOMStyle::GetBorderBottomWidth(nsAWritableString& aBorderBottomWidth)
nsComputedDOMStyle::GetBorderBottomWidth(nsAString& aBorderBottomWidth)
{
return NS_ERROR_DOM_NOT_SUPPORTED_ERR;
}
NS_IMETHODIMP
nsComputedDOMStyle::GetBorderLeftWidth(nsAWritableString& aBorderLeftWidth)
nsComputedDOMStyle::GetBorderLeftWidth(nsAString& aBorderLeftWidth)
{
return NS_ERROR_DOM_NOT_SUPPORTED_ERR;
}
NS_IMETHODIMP
nsComputedDOMStyle::GetBorderWidth(nsAWritableString& aBorderWidth)
nsComputedDOMStyle::GetBorderWidth(nsAString& aBorderWidth)
{
return NS_ERROR_DOM_NOT_SUPPORTED_ERR;
}
@ -2060,79 +2060,79 @@ nsComputedDOMStyle::GetCursor(nsIFrame *aFrame,
#if 0
NS_IMETHODIMP
nsComputedDOMStyle::GetCaptionSide(nsAWritableString& aCaptionSide)
nsComputedDOMStyle::GetCaptionSide(nsAString& aCaptionSide)
{
return NS_ERROR_DOM_NOT_SUPPORTED_ERR;
}
NS_IMETHODIMP
nsComputedDOMStyle::GetClear(nsAWritableString& aClear)
nsComputedDOMStyle::GetClear(nsAString& aClear)
{
return NS_ERROR_DOM_NOT_SUPPORTED_ERR;
}
NS_IMETHODIMP
nsComputedDOMStyle::GetClip(nsAWritableString& aClip)
nsComputedDOMStyle::GetClip(nsAString& aClip)
{
return NS_ERROR_DOM_NOT_SUPPORTED_ERR;
}
NS_IMETHODIMP
nsComputedDOMStyle::GetColor(nsAWritableString& aColor)
nsComputedDOMStyle::GetColor(nsAString& aColor)
{
return NS_ERROR_DOM_NOT_SUPPORTED_ERR;
}
NS_IMETHODIMP
nsComputedDOMStyle::GetContent(nsAWritableString& aContent)
nsComputedDOMStyle::GetContent(nsAString& aContent)
{
return NS_ERROR_DOM_NOT_SUPPORTED_ERR;
}
NS_IMETHODIMP
nsComputedDOMStyle::GetCounterIncrement(nsAWritableString& aCounterIncrement)
nsComputedDOMStyle::GetCounterIncrement(nsAString& aCounterIncrement)
{
return NS_ERROR_DOM_NOT_SUPPORTED_ERR;
}
NS_IMETHODIMP
nsComputedDOMStyle::GetCounterReset(nsAWritableString& aCounterReset)
nsComputedDOMStyle::GetCounterReset(nsAString& aCounterReset)
{
return NS_ERROR_DOM_NOT_SUPPORTED_ERR;
}
NS_IMETHODIMP
nsComputedDOMStyle::GetCssFloat(nsAWritableString& aFloat)
nsComputedDOMStyle::GetCssFloat(nsAString& aFloat)
{
return NS_ERROR_DOM_NOT_SUPPORTED_ERR;
}
NS_IMETHODIMP
nsComputedDOMStyle::GetCue(nsAWritableString& aCue)
nsComputedDOMStyle::GetCue(nsAString& aCue)
{
return NS_ERROR_DOM_NOT_SUPPORTED_ERR;
}
NS_IMETHODIMP
nsComputedDOMStyle::GetCueAfter(nsAWritableString& aCueAfter)
nsComputedDOMStyle::GetCueAfter(nsAString& aCueAfter)
{
return NS_ERROR_DOM_NOT_SUPPORTED_ERR;
}
NS_IMETHODIMP
nsComputedDOMStyle::GetCueBefore(nsAWritableString& aCueBefore)
nsComputedDOMStyle::GetCueBefore(nsAString& aCueBefore)
{
return NS_ERROR_DOM_NOT_SUPPORTED_ERR;
}
NS_IMETHODIMP
nsComputedDOMStyle::GetCursor(nsAWritableString& aCursor)
nsComputedDOMStyle::GetCursor(nsAString& aCursor)
{
return NS_ERROR_DOM_NOT_SUPPORTED_ERR;
}
NS_IMETHODIMP
nsComputedDOMStyle::GetDirection(nsAWritableString& aDirection)
nsComputedDOMStyle::GetDirection(nsAString& aDirection)
{
return NS_ERROR_DOM_NOT_SUPPORTED_ERR;
}
@ -2307,61 +2307,61 @@ nsComputedDOMStyle::GetOverflow(nsIFrame *aFrame,
#if 0
NS_IMETHODIMP
nsComputedDOMStyle::GetElevation(nsAWritableString& aElevation)
nsComputedDOMStyle::GetElevation(nsAString& aElevation)
{
return NS_ERROR_DOM_NOT_SUPPORTED_ERR;
}
NS_IMETHODIMP
nsComputedDOMStyle::GetEmptyCells(nsAWritableString& aEmptyCells)
nsComputedDOMStyle::GetEmptyCells(nsAString& aEmptyCells)
{
return NS_ERROR_DOM_NOT_SUPPORTED_ERR;
}
NS_IMETHODIMP
nsComputedDOMStyle::GetFont(nsAWritableString& aFont)
nsComputedDOMStyle::GetFont(nsAString& aFont)
{
return NS_ERROR_DOM_NOT_SUPPORTED_ERR;
}
NS_IMETHODIMP
nsComputedDOMStyle::GetFontFamily(nsAWritableString& aFontFamily)
nsComputedDOMStyle::GetFontFamily(nsAString& aFontFamily)
{
return NS_ERROR_DOM_NOT_SUPPORTED_ERR;
}
NS_IMETHODIMP
nsComputedDOMStyle::GetFontSize(nsAWritableString& aFontSize)
nsComputedDOMStyle::GetFontSize(nsAString& aFontSize)
{
return NS_ERROR_DOM_NOT_SUPPORTED_ERR;
}
NS_IMETHODIMP
nsComputedDOMStyle::GetFontSizeAdjust(nsAWritableString& aFontSizeAdjust)
nsComputedDOMStyle::GetFontSizeAdjust(nsAString& aFontSizeAdjust)
{
return NS_ERROR_DOM_NOT_SUPPORTED_ERR;
}
NS_IMETHODIMP
nsComputedDOMStyle::GetFontStretch(nsAWritableString& aFontStretch)
nsComputedDOMStyle::GetFontStretch(nsAString& aFontStretch)
{
return NS_ERROR_DOM_NOT_SUPPORTED_ERR;
}
NS_IMETHODIMP
nsComputedDOMStyle::GetFontStyle(nsAWritableString& aFontStyle)
nsComputedDOMStyle::GetFontStyle(nsAString& aFontStyle)
{
return NS_ERROR_DOM_NOT_SUPPORTED_ERR;
}
NS_IMETHODIMP
nsComputedDOMStyle::GetFontVariant(nsAWritableString& aFontVariant)
nsComputedDOMStyle::GetFontVariant(nsAString& aFontVariant)
{
return NS_ERROR_DOM_NOT_SUPPORTED_ERR;
}
NS_IMETHODIMP
nsComputedDOMStyle::GetFontWeight(nsAWritableString& aFontWeight)
nsComputedDOMStyle::GetFontWeight(nsAString& aFontWeight)
{
return NS_ERROR_DOM_NOT_SUPPORTED_ERR;
}
@ -2758,43 +2758,43 @@ nsComputedDOMStyle::GetLeft(nsIFrame *aFrame,
#if 0
NS_IMETHODIMP
nsComputedDOMStyle::GetLetterSpacing(nsAWritableString& aLetterSpacing)
nsComputedDOMStyle::GetLetterSpacing(nsAString& aLetterSpacing)
{
return NS_ERROR_DOM_NOT_SUPPORTED_ERR;
}
NS_IMETHODIMP
nsComputedDOMStyle::GetLineHeight(nsAWritableString& aLineHeight)
nsComputedDOMStyle::GetLineHeight(nsAString& aLineHeight)
{
return NS_ERROR_DOM_NOT_SUPPORTED_ERR;
}
NS_IMETHODIMP
nsComputedDOMStyle::GetListStyle(nsAWritableString& aListStyle)
nsComputedDOMStyle::GetListStyle(nsAString& aListStyle)
{
return NS_ERROR_DOM_NOT_SUPPORTED_ERR;
}
NS_IMETHODIMP
nsComputedDOMStyle::GetListStyleImage(nsAWritableString& aListStyleImage)
nsComputedDOMStyle::GetListStyleImage(nsAString& aListStyleImage)
{
return NS_ERROR_DOM_NOT_SUPPORTED_ERR;
}
NS_IMETHODIMP
nsComputedDOMStyle::GetListStylePosition(nsAWritableString& aListStylePosition)
nsComputedDOMStyle::GetListStylePosition(nsAString& aListStylePosition)
{
return NS_ERROR_DOM_NOT_SUPPORTED_ERR;
}
NS_IMETHODIMP
nsComputedDOMStyle::GetListStyleType(nsAWritableString& aListStyleType)
nsComputedDOMStyle::GetListStyleType(nsAString& aListStyleType)
{
return NS_ERROR_DOM_NOT_SUPPORTED_ERR;
}
NS_IMETHODIMP
nsComputedDOMStyle::GetMargin(nsAWritableString& aMargin)
nsComputedDOMStyle::GetMargin(nsAString& aMargin)
{
return NS_ERROR_DOM_NOT_SUPPORTED_ERR;
}
@ -2828,181 +2828,181 @@ nsComputedDOMStyle::GetMarginLeft(nsIFrame *aFrame,
}
NS_IMETHODIMP
nsComputedDOMStyle::GetMarkerOffset(nsAWritableString& aMarkerOffset)
nsComputedDOMStyle::GetMarkerOffset(nsAString& aMarkerOffset)
{
return NS_ERROR_DOM_NOT_SUPPORTED_ERR;
}
NS_IMETHODIMP
nsComputedDOMStyle::GetMarks(nsAWritableString& aMarks)
nsComputedDOMStyle::GetMarks(nsAString& aMarks)
{
return NS_ERROR_DOM_NOT_SUPPORTED_ERR;
}
NS_IMETHODIMP
nsComputedDOMStyle::GetMaxHeight(nsAWritableString& aMaxHeight)
nsComputedDOMStyle::GetMaxHeight(nsAString& aMaxHeight)
{
return NS_ERROR_DOM_NOT_SUPPORTED_ERR;
}
NS_IMETHODIMP
nsComputedDOMStyle::GetMaxWidth(nsAWritableString& aMaxWidth)
nsComputedDOMStyle::GetMaxWidth(nsAString& aMaxWidth)
{
return NS_ERROR_DOM_NOT_SUPPORTED_ERR;
}
NS_IMETHODIMP
nsComputedDOMStyle::GetMinHeight(nsAWritableString& aMinHeight)
nsComputedDOMStyle::GetMinHeight(nsAString& aMinHeight)
{
return NS_ERROR_DOM_NOT_SUPPORTED_ERR;
}
NS_IMETHODIMP
nsComputedDOMStyle::GetMinWidth(nsAWritableString& aMinWidth)
nsComputedDOMStyle::GetMinWidth(nsAString& aMinWidth)
{
return NS_ERROR_DOM_NOT_SUPPORTED_ERR;
}
NS_IMETHODIMP
nsComputedDOMStyle::GetOrphans(nsAWritableString& aOrphans)
nsComputedDOMStyle::GetOrphans(nsAString& aOrphans)
{
return NS_ERROR_DOM_NOT_SUPPORTED_ERR;
}
NS_IMETHODIMP
nsComputedDOMStyle::GetOutline(nsAWritableString& aOutline)
nsComputedDOMStyle::GetOutline(nsAString& aOutline)
{
return NS_ERROR_DOM_NOT_SUPPORTED_ERR;
}
NS_IMETHODIMP
nsComputedDOMStyle::GetOutlineColor(nsAWritableString& aOutlineColor)
nsComputedDOMStyle::GetOutlineColor(nsAString& aOutlineColor)
{
return NS_ERROR_DOM_NOT_SUPPORTED_ERR;
}
NS_IMETHODIMP
nsComputedDOMStyle::GetOutlineStyle(nsAWritableString& aOutlineStyle)
nsComputedDOMStyle::GetOutlineStyle(nsAString& aOutlineStyle)
{
return NS_ERROR_DOM_NOT_SUPPORTED_ERR;
}
NS_IMETHODIMP
nsComputedDOMStyle::GetOutlineWidth(nsAWritableString& aOutlineWidth)
nsComputedDOMStyle::GetOutlineWidth(nsAString& aOutlineWidth)
{
return NS_ERROR_DOM_NOT_SUPPORTED_ERR;
}
NS_IMETHODIMP
nsComputedDOMStyle::GetOverflow(nsAWritableString& aOverflow)
nsComputedDOMStyle::GetOverflow(nsAString& aOverflow)
{
return NS_ERROR_DOM_NOT_SUPPORTED_ERR;
}
NS_IMETHODIMP
nsComputedDOMStyle::GetPadding(nsAWritableString& aPadding)
nsComputedDOMStyle::GetPadding(nsAString& aPadding)
{
return NS_ERROR_DOM_NOT_SUPPORTED_ERR;
}
NS_IMETHODIMP
nsComputedDOMStyle::GetPaddingTop(nsAWritableString& aPaddingTop)
nsComputedDOMStyle::GetPaddingTop(nsAString& aPaddingTop)
{
return NS_ERROR_DOM_NOT_SUPPORTED_ERR;
}
NS_IMETHODIMP
nsComputedDOMStyle::GetPaddingRight(nsAWritableString& aPaddingRight)
nsComputedDOMStyle::GetPaddingRight(nsAString& aPaddingRight)
{
return NS_ERROR_DOM_NOT_SUPPORTED_ERR;
}
NS_IMETHODIMP
nsComputedDOMStyle::GetPaddingBottom(nsAWritableString& aPaddingBottom)
nsComputedDOMStyle::GetPaddingBottom(nsAString& aPaddingBottom)
{
return NS_ERROR_DOM_NOT_SUPPORTED_ERR;
}
NS_IMETHODIMP
nsComputedDOMStyle::GetPaddingLeft(nsAWritableString& aPaddingLeft)
nsComputedDOMStyle::GetPaddingLeft(nsAString& aPaddingLeft)
{
return NS_ERROR_DOM_NOT_SUPPORTED_ERR;
}
NS_IMETHODIMP
nsComputedDOMStyle::GetPage(nsAWritableString& aPage)
nsComputedDOMStyle::GetPage(nsAString& aPage)
{
return NS_ERROR_DOM_NOT_SUPPORTED_ERR;
}
NS_IMETHODIMP
nsComputedDOMStyle::GetPageBreakAfter(nsAWritableString& aPageBreakAfter)
nsComputedDOMStyle::GetPageBreakAfter(nsAString& aPageBreakAfter)
{
return NS_ERROR_DOM_NOT_SUPPORTED_ERR;
}
NS_IMETHODIMP
nsComputedDOMStyle::GetPageBreakBefore(nsAWritableString& aPageBreakBefore)
nsComputedDOMStyle::GetPageBreakBefore(nsAString& aPageBreakBefore)
{
return NS_ERROR_DOM_NOT_SUPPORTED_ERR;
}
NS_IMETHODIMP
nsComputedDOMStyle::GetPageBreakInside(nsAWritableString& aPageBreakInside)
nsComputedDOMStyle::GetPageBreakInside(nsAString& aPageBreakInside)
{
return NS_ERROR_DOM_NOT_SUPPORTED_ERR;
}
NS_IMETHODIMP
nsComputedDOMStyle::GetPause(nsAWritableString& aPause)
nsComputedDOMStyle::GetPause(nsAString& aPause)
{
return NS_ERROR_DOM_NOT_SUPPORTED_ERR;
}
NS_IMETHODIMP
nsComputedDOMStyle::GetPauseAfter(nsAWritableString& aPauseAfter)
nsComputedDOMStyle::GetPauseAfter(nsAString& aPauseAfter)
{
return NS_ERROR_DOM_NOT_SUPPORTED_ERR;
}
NS_IMETHODIMP
nsComputedDOMStyle::GetPauseBefore(nsAWritableString& aPauseBefore)
nsComputedDOMStyle::GetPauseBefore(nsAString& aPauseBefore)
{
return NS_ERROR_DOM_NOT_SUPPORTED_ERR;
}
NS_IMETHODIMP
nsComputedDOMStyle::GetPitch(nsAWritableString& aPitch)
nsComputedDOMStyle::GetPitch(nsAString& aPitch)
{
return NS_ERROR_DOM_NOT_SUPPORTED_ERR;
}
NS_IMETHODIMP
nsComputedDOMStyle::GetPitchRange(nsAWritableString& aPitchRange)
nsComputedDOMStyle::GetPitchRange(nsAString& aPitchRange)
{
return NS_ERROR_DOM_NOT_SUPPORTED_ERR;
}
NS_IMETHODIMP
nsComputedDOMStyle::GetPlayDuring(nsAWritableString& aPlayDuring)
nsComputedDOMStyle::GetPlayDuring(nsAString& aPlayDuring)
{
return NS_ERROR_DOM_NOT_SUPPORTED_ERR;
}
NS_IMETHODIMP
nsComputedDOMStyle::GetPosition(nsAWritableString& aPosition)
nsComputedDOMStyle::GetPosition(nsAString& aPosition)
{
return NS_ERROR_DOM_NOT_SUPPORTED_ERR;
}
NS_IMETHODIMP
nsComputedDOMStyle::GetQuotes(nsAWritableString& aQuotes)
nsComputedDOMStyle::GetQuotes(nsAString& aQuotes)
{
return NS_ERROR_DOM_NOT_SUPPORTED_ERR;
}
NS_IMETHODIMP
nsComputedDOMStyle::GetRichness(nsAWritableString& aRichness)
nsComputedDOMStyle::GetRichness(nsAString& aRichness)
{
return NS_ERROR_DOM_NOT_SUPPORTED_ERR;
}
@ -3017,79 +3017,79 @@ nsComputedDOMStyle::GetRight(nsIFrame *aFrame,
#if 0
NS_IMETHODIMP
nsComputedDOMStyle::GetSize(nsAWritableString& aSize)
nsComputedDOMStyle::GetSize(nsAString& aSize)
{
return NS_ERROR_DOM_NOT_SUPPORTED_ERR;
}
NS_IMETHODIMP
nsComputedDOMStyle::GetSpeak(nsAWritableString& aSpeak)
nsComputedDOMStyle::GetSpeak(nsAString& aSpeak)
{
return NS_ERROR_DOM_NOT_SUPPORTED_ERR;
}
NS_IMETHODIMP
nsComputedDOMStyle::GetSpeakHeader(nsAWritableString& aSpeakHeader)
nsComputedDOMStyle::GetSpeakHeader(nsAString& aSpeakHeader)
{
return NS_ERROR_DOM_NOT_SUPPORTED_ERR;
}
NS_IMETHODIMP
nsComputedDOMStyle::GetSpeakNumeral(nsAWritableString& aSpeakNumeral)
nsComputedDOMStyle::GetSpeakNumeral(nsAString& aSpeakNumeral)
{
return NS_ERROR_DOM_NOT_SUPPORTED_ERR;
}
NS_IMETHODIMP
nsComputedDOMStyle::GetSpeakPunctuation(nsAWritableString& aSpeakPunctuation)
nsComputedDOMStyle::GetSpeakPunctuation(nsAString& aSpeakPunctuation)
{
return NS_ERROR_DOM_NOT_SUPPORTED_ERR;
}
NS_IMETHODIMP
nsComputedDOMStyle::GetSpeechRate(nsAWritableString& aSpeechRate)
nsComputedDOMStyle::GetSpeechRate(nsAString& aSpeechRate)
{
return NS_ERROR_DOM_NOT_SUPPORTED_ERR;
}
NS_IMETHODIMP
nsComputedDOMStyle::GetStress(nsAWritableString& aStress)
nsComputedDOMStyle::GetStress(nsAString& aStress)
{
return NS_ERROR_DOM_NOT_SUPPORTED_ERR;
}
NS_IMETHODIMP
nsComputedDOMStyle::GetTableLayout(nsAWritableString& aTableLayout)
nsComputedDOMStyle::GetTableLayout(nsAString& aTableLayout)
{
return NS_ERROR_DOM_NOT_SUPPORTED_ERR;
}
NS_IMETHODIMP
nsComputedDOMStyle::GetTextAlign(nsAWritableString& aTextAlign)
nsComputedDOMStyle::GetTextAlign(nsAString& aTextAlign)
{
return NS_ERROR_DOM_NOT_SUPPORTED_ERR;
}
NS_IMETHODIMP
nsComputedDOMStyle::GetTextDecoration(nsAWritableString& aTextDecoration)
nsComputedDOMStyle::GetTextDecoration(nsAString& aTextDecoration)
{
return NS_ERROR_DOM_NOT_SUPPORTED_ERR;
}
NS_IMETHODIMP
nsComputedDOMStyle::GetTextIndent(nsAWritableString& aTextIndent)
nsComputedDOMStyle::GetTextIndent(nsAString& aTextIndent)
{
return NS_ERROR_DOM_NOT_SUPPORTED_ERR;
}
NS_IMETHODIMP
nsComputedDOMStyle::GetTextShadow(nsAWritableString& aTextShadow)
nsComputedDOMStyle::GetTextShadow(nsAString& aTextShadow)
{
return NS_ERROR_DOM_NOT_SUPPORTED_ERR;
}
NS_IMETHODIMP
nsComputedDOMStyle::GetTextTransform(nsAWritableString& aTextTransform)
nsComputedDOMStyle::GetTextTransform(nsAString& aTextTransform)
{
return NS_ERROR_DOM_NOT_SUPPORTED_ERR;
}
@ -3104,43 +3104,43 @@ nsComputedDOMStyle::GetTop(nsIFrame *aFrame,
#if 0
NS_IMETHODIMP
nsComputedDOMStyle::GetUnicodeBidi(nsAWritableString& aUnicodeBidi)
nsComputedDOMStyle::GetUnicodeBidi(nsAString& aUnicodeBidi)
{
return NS_ERROR_DOM_NOT_SUPPORTED_ERR;
}
NS_IMETHODIMP
nsComputedDOMStyle::GetVerticalAlign(nsAWritableString& aVerticalAlign)
nsComputedDOMStyle::GetVerticalAlign(nsAString& aVerticalAlign)
{
return NS_ERROR_DOM_NOT_SUPPORTED_ERR;
}
NS_IMETHODIMP
nsComputedDOMStyle::GetVisibility(nsAWritableString& aVisibility)
nsComputedDOMStyle::GetVisibility(nsAString& aVisibility)
{
return NS_ERROR_DOM_NOT_SUPPORTED_ERR;
}
NS_IMETHODIMP
nsComputedDOMStyle::GetVoiceFamily(nsAWritableString& aVoiceFamily)
nsComputedDOMStyle::GetVoiceFamily(nsAString& aVoiceFamily)
{
return NS_ERROR_DOM_NOT_SUPPORTED_ERR;
}
NS_IMETHODIMP
nsComputedDOMStyle::GetVolume(nsAWritableString& aVolume)
nsComputedDOMStyle::GetVolume(nsAString& aVolume)
{
return NS_ERROR_DOM_NOT_SUPPORTED_ERR;
}
NS_IMETHODIMP
nsComputedDOMStyle::GetWhiteSpace(nsAWritableString& aWhiteSpace)
nsComputedDOMStyle::GetWhiteSpace(nsAString& aWhiteSpace)
{
return NS_ERROR_DOM_NOT_SUPPORTED_ERR;
}
NS_IMETHODIMP
nsComputedDOMStyle::GetWidows(nsAWritableString& aWidows)
nsComputedDOMStyle::GetWidows(nsAString& aWidows)
{
return NS_ERROR_DOM_NOT_SUPPORTED_ERR;
}
@ -3769,19 +3769,19 @@ nsComputedDOMStyle::GetBorderStyleFor(PRUint8 aSide,
#if 0
NS_IMETHODIMP
nsComputedDOMStyle::GetWordSpacing(nsAWritableString& aWordSpacing)
nsComputedDOMStyle::GetWordSpacing(nsAString& aWordSpacing)
{
return NS_ERROR_DOM_NOT_SUPPORTED_ERR;
}
NS_IMETHODIMP
nsComputedDOMStyle::GetZIndex(nsAWritableString& aZIndex)
nsComputedDOMStyle::GetZIndex(nsAString& aZIndex)
{
return NS_ERROR_DOM_NOT_SUPPORTED_ERR;
}
NS_IMETHODIMP
nsComputedDOMStyle::GetOpacity(nsAWritableString& aOpacity)
nsComputedDOMStyle::GetOpacity(nsAString& aOpacity)
{
return NS_ERROR_DOM_NOT_SUPPORTED_ERR;
}

10
layout/style/nsDOMCSSAttrDeclaration.cpp
Просмотреть файл

@ -69,8 +69,8 @@ nsDOMCSSAttributeDeclaration::~nsDOMCSSAttributeDeclaration()
}
NS_IMETHODIMP
nsDOMCSSAttributeDeclaration::RemoveProperty(const nsAReadableString& aPropertyName,
nsAWritableString& aReturn)
nsDOMCSSAttributeDeclaration::RemoveProperty(const nsAString& aPropertyName,
nsAString& aReturn)
{
nsCSSDeclaration* decl;
nsresult rv = GetCSSDeclaration(&decl, PR_TRUE);
@ -243,8 +243,8 @@ nsDOMCSSAttributeDeclaration::GetCSSParsingEnvironment(nsIContent* aContent,
}
nsresult
nsDOMCSSAttributeDeclaration::ParsePropertyValue(const nsAReadableString& aPropName,
const nsAReadableString& aPropValue)
nsDOMCSSAttributeDeclaration::ParsePropertyValue(const nsAString& aPropName,
const nsAString& aPropValue)
{
nsCSSDeclaration* decl;
nsresult result = GetCSSDeclaration(&decl, PR_TRUE);
@ -292,7 +292,7 @@ nsDOMCSSAttributeDeclaration::ParsePropertyValue(const nsAReadableString& aPropN
}
nsresult
nsDOMCSSAttributeDeclaration::ParseDeclaration(const nsAReadableString& aDecl,
nsDOMCSSAttributeDeclaration::ParseDeclaration(const nsAString& aDecl,
PRBool aParseOnlyOneDecl,
PRBool aClearOldDecl)
{

10
layout/style/nsDOMCSSAttrDeclaration.h
Просмотреть файл

@ -55,8 +55,8 @@ public:
nsDOMCSSAttributeDeclaration(nsIHTMLContent *aContent);
~nsDOMCSSAttributeDeclaration();
NS_IMETHOD RemoveProperty(const nsAReadableString& aPropertyName,
nsAWritableString& aReturn);
NS_IMETHOD RemoveProperty(const nsAString& aPropertyName,
nsAString& aReturn);
virtual void DropReference();
virtual nsresult GetCSSDeclaration(nsCSSDeclaration **aDecl,
@ -66,9 +66,9 @@ public:
nsIURI** aBaseURI,
nsICSSLoader** aCSSLoader,
nsICSSParser** aCSSParser);
virtual nsresult ParsePropertyValue(const nsAReadableString& aPropName,
const nsAReadableString& aPropValue);
virtual nsresult ParseDeclaration(const nsAReadableString& aDecl,
virtual nsresult ParsePropertyValue(const nsAString& aPropName,
const nsAString& aPropValue);
virtual nsresult ParseDeclaration(const nsAString& aDecl,
PRBool aParseOnlyOneDecl,
PRBool aClearOldDecl);
virtual nsresult GetParent(nsISupports **aParent);

30
layout/style/nsDOMCSSDeclaration.cpp
Просмотреть файл

@ -73,7 +73,7 @@ NS_IMPL_RELEASE(nsDOMCSSDeclaration);
NS_IMETHODIMP
nsDOMCSSDeclaration::GetCssText(nsAWritableString& aCssText)
nsDOMCSSDeclaration::GetCssText(nsAString& aCssText)
{
nsCSSDeclaration* decl;
aCssText.Truncate();
@ -88,7 +88,7 @@ nsDOMCSSDeclaration::GetCssText(nsAWritableString& aCssText)
}
NS_IMETHODIMP
nsDOMCSSDeclaration::SetCssText(const nsAReadableString& aCssText)
nsDOMCSSDeclaration::SetCssText(const nsAString& aCssText)
{
return ParseDeclaration(aCssText, PR_FALSE, PR_TRUE);
}
@ -125,7 +125,7 @@ nsDOMCSSDeclaration::GetParentRule(nsIDOMCSSRule** aParentRule)
}
NS_IMETHODIMP
nsDOMCSSDeclaration::GetPropertyCSSValue(const nsAReadableString& aPropertyName,
nsDOMCSSDeclaration::GetPropertyCSSValue(const nsAString& aPropertyName,
nsIDOMCSSValue** aReturn)
{
NS_ENSURE_ARG_POINTER(aReturn);
@ -137,7 +137,7 @@ nsDOMCSSDeclaration::GetPropertyCSSValue(const nsAReadableString& aPropertyName,
}
NS_IMETHODIMP
nsDOMCSSDeclaration::Item(PRUint32 aIndex, nsAWritableString& aReturn)
nsDOMCSSDeclaration::Item(PRUint32 aIndex, nsAString& aReturn)
{
nsCSSDeclaration *decl;
nsresult result = GetCSSDeclaration(&decl, PR_FALSE);
@ -151,8 +151,8 @@ nsDOMCSSDeclaration::Item(PRUint32 aIndex, nsAWritableString& aReturn)
}
NS_IMETHODIMP
nsDOMCSSDeclaration::GetPropertyValue(const nsAReadableString& aPropertyName,
nsAWritableString& aReturn)
nsDOMCSSDeclaration::GetPropertyValue(const nsAString& aPropertyName,
nsAString& aReturn)
{
nsCSSValue val;
nsCSSDeclaration *decl;
@ -167,8 +167,8 @@ nsDOMCSSDeclaration::GetPropertyValue(const nsAReadableString& aPropertyName,
}
NS_IMETHODIMP
nsDOMCSSDeclaration::GetPropertyPriority(const nsAReadableString& aPropertyName,
nsAWritableString& aReturn)
nsDOMCSSDeclaration::GetPropertyPriority(const nsAString& aPropertyName,
nsAString& aReturn)
{
nsCSSDeclaration *decl;
nsresult result = GetCSSDeclaration(&decl, PR_FALSE);
@ -189,9 +189,9 @@ nsDOMCSSDeclaration::GetPropertyPriority(const nsAReadableString& aPropertyName,
}
NS_IMETHODIMP
nsDOMCSSDeclaration::SetProperty(const nsAReadableString& aPropertyName,
const nsAReadableString& aValue,
const nsAReadableString& aPriority)
nsDOMCSSDeclaration::SetProperty(const nsAString& aPropertyName,
const nsAString& aValue,
const nsAString& aPriority)
{
if (aValue.IsEmpty()) {
// If the new value of the property is an empty string we remove the
@ -210,8 +210,8 @@ nsDOMCSSDeclaration::SetProperty(const nsAReadableString& aPropertyName,
*/
static nsresult
CallSetProperty(nsDOMCSSDeclaration* aDecl,
const nsAReadableString& aPropName,
const nsAReadableString& aValue)
const nsAString& aPropName,
const nsAString& aValue)
{
if (aValue.IsEmpty()) {
// If the new value of the property is an empty string we remove the
@ -225,13 +225,13 @@ CallSetProperty(nsDOMCSSDeclaration* aDecl,
#define IMPL_CSSPROP(attname_, propname_) \
NS_IMETHODIMP \
nsDOMCSSDeclaration::Get##attname_(nsAWritableString& aValue) \
nsDOMCSSDeclaration::Get##attname_(nsAString& aValue) \
{ \
return GetPropertyValue(propname_, aValue); \
} \
\
NS_IMETHODIMP \
nsDOMCSSDeclaration::Set##attname_(const nsAReadableString& aValue) \
nsDOMCSSDeclaration::Set##attname_(const nsAString& aValue) \
{ \
return CallSetProperty(this, propname_, aValue); \
}

32
layout/style/nsDOMCSSDeclaration.h
Просмотреть файл

@ -55,22 +55,22 @@ public:
NS_DECL_ISUPPORTS
// NS_DECL_IDOMCSSSTYLEDECLARATION
NS_IMETHOD GetCssText(nsAWritableString& aCssText);
NS_IMETHOD SetCssText(const nsAReadableString& aCssText);
NS_IMETHOD GetCssText(nsAString& aCssText);
NS_IMETHOD SetCssText(const nsAString& aCssText);
NS_IMETHOD GetLength(PRUint32* aLength);
NS_IMETHOD GetParentRule(nsIDOMCSSRule** aParentRule);
NS_IMETHOD GetPropertyValue(const nsAReadableString& aPropertyName,
nsAWritableString& aReturn);
NS_IMETHOD GetPropertyCSSValue(const nsAReadableString& aPropertyName,
NS_IMETHOD GetPropertyValue(const nsAString& aPropertyName,
nsAString& aReturn);
NS_IMETHOD GetPropertyCSSValue(const nsAString& aPropertyName,
nsIDOMCSSValue** aReturn);
NS_IMETHOD RemoveProperty(const nsAReadableString& aPropertyName,
nsAWritableString& aReturn) = 0;
NS_IMETHOD GetPropertyPriority(const nsAReadableString& aPropertyName,
nsAWritableString& aReturn);
NS_IMETHOD SetProperty(const nsAReadableString& aPropertyName,
const nsAReadableString& aValue,
const nsAReadableString& aPriority);
NS_IMETHOD Item(PRUint32 aIndex, nsAWritableString& aReturn);
NS_IMETHOD RemoveProperty(const nsAString& aPropertyName,
nsAString& aReturn) = 0;
NS_IMETHOD GetPropertyPriority(const nsAString& aPropertyName,
nsAString& aReturn);
NS_IMETHOD SetProperty(const nsAString& aPropertyName,
const nsAString& aValue,
const nsAString& aPriority);
NS_IMETHOD Item(PRUint32 aIndex, nsAString& aReturn);
NS_DECL_NSIDOMCSS2PROPERTIES
@ -82,9 +82,9 @@ public:
// Note! This will only set the declaration if a style rule already exists
virtual nsresult SetCSSDeclaration(nsCSSDeclaration *aDecl) = 0;
virtual nsresult ParsePropertyValue(const nsAReadableString& aPropName,
const nsAReadableString& aPropValue) = 0;
virtual nsresult ParseDeclaration(const nsAReadableString& aDecl,
virtual nsresult ParsePropertyValue(const nsAString& aPropName,
const nsAString& aPropValue) = 0;
virtual nsresult ParseDeclaration(const nsAString& aDecl,
PRBool aParseOnlyOneDecl,
PRBool aClearOldDecl) = 0;
virtual nsresult GetParent(nsISupports **aParent) = 0;

4
layout/style/nsHTMLStyleSheet.cpp
Просмотреть файл

@ -856,7 +856,7 @@ public:
NS_IMETHOD SetAttributesFor(nsIHTMLContent* aContent,
nsIHTMLAttributes*& aAttributes);
NS_IMETHOD SetAttributeFor(nsIAtom* aAttribute,
const nsAReadableString& aValue,
const nsAString& aValue,
PRBool aMappedToStyle,
nsIHTMLContent* aContent,
nsIHTMLAttributes*& aAttributes);
@ -1418,7 +1418,7 @@ HTMLStyleSheetImpl::SetAttributesFor(nsIHTMLContent* aContent,
NS_IMETHODIMP
HTMLStyleSheetImpl::SetAttributeFor(nsIAtom* aAttribute,
const nsAReadableString& aValue,
const nsAString& aValue,
PRBool aMappedToStyle,
nsIHTMLContent* aContent,
nsIHTMLAttributes*& aAttributes)

4
layout/style/nsICSSLoader.h
Просмотреть файл

@ -39,7 +39,7 @@
#define nsICSSLoader_h___
#include "nsISupports.h"
#include "nsAReadableString.h"
#include "nsAString.h"
#include "nsICSSImportRule.h"
class nsIAtom;
@ -69,7 +69,7 @@ public:
NS_IMETHOD SetCaseSensitive(PRBool aCaseSensitive) = 0;
NS_IMETHOD SetQuirkMode(PRBool aQuirkMode) = 0;
NS_IMETHOD SetPreferredSheet(const nsAReadableString& aTitle) = 0;
NS_IMETHOD SetPreferredSheet(const nsAString& aTitle) = 0;
// Get/Recycle a CSS parser for general use
NS_IMETHOD GetParserFor(nsICSSStyleSheet* aSheet,

16
layout/style/nsICSSParser.h
Просмотреть файл

@ -39,7 +39,7 @@
#define nsCSS1Parser_h___
#include "nsISupports.h"
#include "nsAWritableString.h"
#include "nsAString.h"
class nsIStyleRule;
class nsICSSStyleSheet;
class nsIUnicharInputStream;
@ -85,22 +85,22 @@ public:
// Parse HTML style attribute or its equivalent in other markup
// languages. aBaseURL is the base url to use for relative links in
// the declaration.
NS_IMETHOD ParseStyleAttribute(const nsAReadableString& aAttributeValue,
NS_IMETHOD ParseStyleAttribute(const nsAString& aAttributeValue,
nsIURI* aBaseURL,
nsIStyleRule** aResult) = 0;
NS_IMETHOD ParseAndAppendDeclaration(const nsAReadableString& aBuffer,
NS_IMETHOD ParseAndAppendDeclaration(const nsAString& aBuffer,
nsIURI* aBaseURL,
nsCSSDeclaration* aDeclaration,
PRBool aParseOnlyOneDecl,
PRInt32* aHint) = 0;
NS_IMETHOD ParseRule(nsAReadableString& aRule,
NS_IMETHOD ParseRule(const nsAString& aRule,
nsIURI* aBaseURL,
nsISupportsArray** aResult) = 0;
NS_IMETHOD ParseProperty(const nsAReadableString& aPropName,
const nsAReadableString& aPropValue,
NS_IMETHOD ParseProperty(const nsAString& aPropName,
const nsAString& aPropValue,
nsIURI* aBaseURL,
nsCSSDeclaration* aDeclaration,
PRInt32* aHint) = 0;
@ -110,11 +110,11 @@ public:
// charset to be anything other than the default
// sets the out-param to the current charset, as set by SetCharset
NS_IMETHOD GetCharset(/*out*/nsAWritableString &aCharsetDest) const = 0;
NS_IMETHOD GetCharset(/*out*/nsAString &aCharsetDest) const = 0;
// SetCharset expects the charset to be the preferred charset
// and it just records the string exactly as passed in (no alias resolution)
NS_IMETHOD SetCharset(/*in*/ const nsAReadableString &aCharsetSrc) = 0;
NS_IMETHOD SetCharset(/*in*/ const nsAString &aCharsetSrc) = 0;
};
// Values or'd in the GetInfoMask; other bits are reserved

4
layout/style/nsICSSStyleRule.h
Просмотреть файл

@ -124,12 +124,12 @@ public:
#ifdef DEBUG
void SizeOf(nsISizeOfHandler *aSizeOfHandler, PRUint32 &aSize);
#endif
nsresult ToString( nsAWritableString& aString, nsICSSStyleSheet* aSheet,
nsresult ToString( nsAString& aString, nsICSSStyleSheet* aSheet,
PRBool aIsPseudoElem, PRInt8 aNegatedIndex ) const;
private:
void AppendNegationToString(nsAWritableString& aString);
void AppendNegationToString(nsAString& aString);
public:
PRInt32 mNameSpace;

2
layout/style/nsICSSStyleSheet.h
Просмотреть файл

@ -68,7 +68,7 @@ public:
NS_IMETHOD GetStyleRuleAt(PRInt32 aIndex, nsICSSRule*& aRule) const = 0;
NS_IMETHOD DeleteRuleFromGroup(nsICSSGroupRule* aGroup, PRUint32 aIndex) = 0;
NS_IMETHOD InsertRuleIntoGroup(nsAReadableString & aRule, nsICSSGroupRule* aGroup, PRUint32 aIndex, PRUint32* _retval) = 0;
NS_IMETHOD InsertRuleIntoGroup(const nsAString & aRule, nsICSSGroupRule* aGroup, PRUint32 aIndex, PRUint32* _retval) = 0;
NS_IMETHOD StyleSheetCount(PRInt32& aCount) const = 0;
NS_IMETHOD GetStyleSheetAt(PRInt32 aIndex, nsICSSStyleSheet*& aSheet) const = 0;

2
layout/style/nsIComputedDOMStyle.h
Просмотреть файл

@ -52,7 +52,7 @@ class nsIComputedDOMStyle : public nsIDOMCSSStyleDeclaration
public:
NS_DEFINE_STATIC_IID_ACCESSOR(NS_ICOMPUTEDDOMSTYLE_IID)
NS_IMETHOD Init(nsIDOMElement *aElement, const nsAReadableString& aPseudoElt,
NS_IMETHOD Init(nsIDOMElement *aElement, const nsAString& aPseudoElt,
nsIPresShell *aPresShell) = 0;
};

10
layout/style/nsIMediaList.h
Просмотреть файл

@ -31,21 +31,21 @@ class nsIMediaList : public nsISupportsArray {
public:
static const nsIID& GetIID() { static nsIID iid = NS_IMEDIA_LIST_IID; return iid; }
NS_IMETHOD GetText(nsAWritableString& aMediaText) = 0;
NS_IMETHOD SetText(nsAReadableString& aMediaText) = 0;
NS_IMETHOD GetText(nsAString& aMediaText) = 0;
NS_IMETHOD SetText(const nsAString& aMediaText) = 0;
NS_IMETHOD MatchesMedium(nsIAtom* aMedium, PRBool* aMatch) = 0;
NS_IMETHOD DropReference(void) = 0;
};
/* Use this macro when declaring classes that implement this interface. */
#define NS_DECL_NSIMEDIALIST \
NS_IMETHOD GetText(nsAWritableString& aMediaText); \
NS_IMETHOD SetText(nsAReadableString& aMediaText); \
NS_IMETHOD GetText(nsAString& aMediaText); \
NS_IMETHOD SetText(const nsAString& aMediaText); \
NS_IMETHOD MatchesMedium(nsIAtom* aMedium, PRBool* aMatch); \
NS_IMETHOD DropReference(void);
extern NS_EXPORT nsresult
NS_NewMediaList(const nsAReadableString& aMediaText, nsIMediaList** aInstancePtrResult);
NS_NewMediaList(const nsAString& aMediaText, nsIMediaList** aInstancePtrResult);
extern NS_EXPORT nsresult
NS_NewMediaList(nsIMediaList** aInstancePtrResult);

8
layout/style/nsROCSSPrimitiveValue.cpp
Просмотреть файл

@ -74,7 +74,7 @@ NS_INTERFACE_MAP_END
NS_IMETHODIMP
nsROCSSPrimitiveValue::GetCssText(nsAWritableString& aCssText)
nsROCSSPrimitiveValue::GetCssText(nsAString& aCssText)
{
nsAutoString tmpStr;
aCssText.Truncate();
@ -245,7 +245,7 @@ nsROCSSPrimitiveValue::GetCssText(nsAWritableString& aCssText)
NS_IMETHODIMP
nsROCSSPrimitiveValue::SetCssText(const nsAReadableString& aCssText)
nsROCSSPrimitiveValue::SetCssText(const nsAString& aCssText)
{
return NS_ERROR_DOM_NO_MODIFICATION_ALLOWED_ERR;
}
@ -353,14 +353,14 @@ nsROCSSPrimitiveValue::GetFloatValue(PRUint16 aUnitType, float* aReturn)
NS_IMETHODIMP
nsROCSSPrimitiveValue::SetStringValue(PRUint16 aStringType,
const nsAReadableString& aStringValue)
const nsAString& aStringValue)
{
return NS_ERROR_DOM_NO_MODIFICATION_ALLOWED_ERR;
}
NS_IMETHODIMP
nsROCSSPrimitiveValue::GetStringValue(nsAWritableString& aReturn)
nsROCSSPrimitiveValue::GetStringValue(nsAString& aReturn)
{
switch (mType) {
case CSS_IDENT: