Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixing nsbeta3+ bug 52572. Renaming CSSValue::valueType to CSSValue::cssValueType to be up-to-date with the latest changes to the DOM Level 2 spec. r/a=vidur, r=pollmann

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@79517 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
jst%netscape.com
2000-09-19 05:37:23 +00:00
parent 75e09ddb65
commit a76efbcbf7
8 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mozilla/content/html/style/src/nsROCSSPrimitiveValue.cpp
View File

@@ -174,7 +174,7 @@ nsROCSSPrimitiveValue::SetCssText(const nsAReadableString& aCssText)
NS_IMETHODIMP
nsROCSSPrimitiveValue::GetValueType(PRUint16* aValueType)
nsROCSSPrimitiveValue::GetCssValueType(PRUint16* aValueType)
{
NS_ENSURE_ARG_POINTER(aValueType);
*aValueType = nsIDOMCSSValue::CSS_PRIMITIVE_VALUE;

6
mozilla/dom/public/css/nsIDOMCSSValue.h
View File

@@ -46,21 +46,21 @@ public:
NS_IMETHOD GetCssText(nsAWritableString& aCssText)=0;
NS_IMETHOD SetCssText(const nsAReadableString& aCssText)=0;
NS_IMETHOD GetValueType(PRUint16* aValueType)=0;
NS_IMETHOD GetCssValueType(PRUint16* aCssValueType)=0;
};
#define NS_DECL_IDOMCSSVALUE \
NS_IMETHOD GetCssText(nsAWritableString& aCssText); \
NS_IMETHOD SetCssText(const nsAReadableString& aCssText); \
NS_IMETHOD GetValueType(PRUint16* aValueType); \
NS_IMETHOD GetCssValueType(PRUint16* aCssValueType); \
#define NS_FORWARD_IDOMCSSVALUE(_to) \
NS_IMETHOD GetCssText(nsAWritableString& aCssText) { return _to GetCssText(aCssText); } \
NS_IMETHOD SetCssText(const nsAReadableString& aCssText) { return _to SetCssText(aCssText); } \
NS_IMETHOD GetValueType(PRUint16* aValueType) { return _to GetValueType(aValueType); } \
NS_IMETHOD GetCssValueType(PRUint16* aCssValueType) { return _to GetCssValueType(aCssValueType); } \
extern "C" NS_DOM nsresult NS_InitCSSValueClass(nsIScriptContext *aContext, void **aPrototype);

2
mozilla/dom/public/idl/css/CSSValue.idl
View File

@@ -10,6 +10,6 @@ interface CSSValue {
attribute DOMString cssText;
// raises(DOMException) on setting
readonly attribute unsigned short valueType;
readonly attribute unsigned short cssValueType;
};

2
mozilla/dom/public/nsDOMPropEnums.h
View File

@@ -230,7 +230,7 @@ enum nsDOMProp {
NS_DOM_PROP_CSSSTYLESHEET_INSERTRULE,
NS_DOM_PROP_CSSSTYLESHEET_OWNERRULE,
NS_DOM_PROP_CSSVALUE_CSSTEXT,
NS_DOM_PROP_CSSVALUE_VALUETYPE,
NS_DOM_PROP_CSSVALUE_CSSVALUETYPE,
NS_DOM_PROP_DOCUMENT_CREATEATTRIBUTE,
NS_DOM_PROP_DOCUMENT_CREATEATTRIBUTENS,
NS_DOM_PROP_DOCUMENT_CREATECDATASECTION,

6
mozilla/dom/public/nsDOMPropNames.h
View File

@@ -71,7 +71,6 @@
"css2properties.backgroundimage", \
"css2properties.backgroundposition", \
"css2properties.backgroundrepeat", \
"css2properties.behavior", \
"css2properties.border", \
"css2properties.borderbottom", \
"css2properties.borderbottomcolor", \
@@ -138,7 +137,8 @@
"css2properties.maxwidth", \
"css2properties.minheight", \
"css2properties.minwidth", \
"css2properties.opacity", \
"css2properties.mozbinding", \
"css2properties.mozopacity", \
"css2properties.orphans", \
"css2properties.outline", \
"css2properties.outlinecolor", \
@@ -228,7 +228,7 @@
"cssstylesheet.insertrule", \
"cssstylesheet.ownerrule", \
"cssvalue.csstext", \
"cssvalue.valuetype", \
"cssvalue.cssvaluetype", \
"document.createattribute", \
"document.createattributens", \
"document.createcdatasection", \

10
mozilla/dom/src/css/nsJSCSSValue.cpp
View File

@@ -47,7 +47,7 @@ static NS_DEFINE_IID(kICSSValueIID, NS_IDOMCSSVALUE_IID);
//
enum CSSValue_slots {
CSSVALUE_CSSTEXT = -1,
CSSVALUE_VALUETYPE = -2
CSSVALUE_CSSVALUETYPE = -2
};
/***********************************************************************/
@@ -82,12 +82,12 @@ GetCSSValueProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp)
}
break;
}
case CSSVALUE_VALUETYPE:
case CSSVALUE_CSSVALUETYPE:
{
rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSSVALUE_VALUETYPE, PR_FALSE);
rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSSVALUE_CSSVALUETYPE, PR_FALSE);
if (NS_SUCCEEDED(rv)) {
PRUint16 prop;
rv = a->GetValueType(&prop);
rv = a->GetCssValueType(&prop);
if (NS_SUCCEEDED(rv)) {
*vp = INT_TO_JSVAL(prop);
}
@@ -209,7 +209,7 @@ JSClass CSSValueClass = {
static JSPropertySpec CSSValueProperties[] =
{
{"cssText", CSSVALUE_CSSTEXT, JSPROP_ENUMERATE},
{"valueType", CSSVALUE_VALUETYPE, JSPROP_ENUMERATE | JSPROP_READONLY},
{"cssValueType", CSSVALUE_CSSVALUETYPE, JSPROP_ENUMERATE | JSPROP_READONLY},
{0}
};

2
mozilla/layout/html/style/src/nsROCSSPrimitiveValue.cpp
View File

@@ -174,7 +174,7 @@ nsROCSSPrimitiveValue::SetCssText(const nsAReadableString& aCssText)
NS_IMETHODIMP
nsROCSSPrimitiveValue::GetValueType(PRUint16* aValueType)
nsROCSSPrimitiveValue::GetCssValueType(PRUint16* aValueType)
{
NS_ENSURE_ARG_POINTER(aValueType);
*aValueType = nsIDOMCSSValue::CSS_PRIMITIVE_VALUE;

2
mozilla/layout/style/nsROCSSPrimitiveValue.cpp
View File

@@ -174,7 +174,7 @@ nsROCSSPrimitiveValue::SetCssText(const nsAReadableString& aCssText)
NS_IMETHODIMP
nsROCSSPrimitiveValue::GetValueType(PRUint16* aValueType)
nsROCSSPrimitiveValue::GetCssValueType(PRUint16* aValueType)
{
NS_ENSURE_ARG_POINTER(aValueType);
*aValueType = nsIDOMCSSValue::CSS_PRIMITIVE_VALUE;