Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-01-07 11:56:51 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

bug 821593 - GetRGBColorValue() should return nsDOMCSSRGBColor* r=bz

Browse Source
This commit is contained in:
Trevor Saunders 2012-10-24 20:43:56 -04:00
parent 6316ea3cdf
commit f66d567a5c
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
dom/bindings/Bindings.conf
View File

@ -149,7 +149,8 @@ DOMInterfaces = {
},
"CSSPrimitiveValue": {
"nativeType": "nsROCSSPrimitiveValue"
"nativeType": "nsROCSSPrimitiveValue",
"resultNotAddRefed": ["GetRGBColorValue"]
},
'CSSStyleDeclaration': {

6
layout/style/nsROCSSPrimitiveValue.cpp
View File

@ -495,19 +495,19 @@ NS_IMETHODIMP
nsROCSSPrimitiveValue::GetRGBColorValue(nsIDOMRGBColor** aColor)
{
ErrorResult error;
*aColor = GetRGBColorValue(error).get();
NS_IF_ADDREF(*aColor = GetRGBColorValue(error));
return error.ErrorCode();
}
already_AddRefed<nsIDOMRGBColor>
nsDOMCSSRGBColor*
nsROCSSPrimitiveValue::GetRGBColorValue(ErrorResult& aRv)
{
if (mType != CSS_RGBCOLOR) {
aRv.Throw(NS_ERROR_DOM_INVALID_ACCESS_ERR);
return nullptr;
}
NS_ASSERTION(mValue.mColor, "mValue.mColor should never be null");
NS_ADDREF(mValue.mColor);
return mValue.mColor;
}

2
layout/style/nsROCSSPrimitiveValue.h
View File

@ -55,7 +55,7 @@ public:
mozilla::ErrorResult& aRv);
already_AddRefed<nsIDOMCounter> GetCounterValue(mozilla::ErrorResult& aRv);
already_AddRefed<nsIDOMRect> GetRectValue(mozilla::ErrorResult& aRv);
already_AddRefed<nsIDOMRGBColor> GetRGBColorValue(mozilla::ErrorResult& aRv);
nsDOMCSSRGBColor *GetRGBColorValue(mozilla::ErrorResult& aRv);
// nsROCSSPrimitiveValue
nsROCSSPrimitiveValue();