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

Bug 1428610 part 6. Give nsICSSDeclaration::GetPropertyPriority a nicer signature. r=emilio

Browse Source 
MozReview-Commit-ID: 4H2zADwdo5L
This commit is contained in:
Boris Zbarsky 2018-01-30 14:48:27 -05:00
parent 4278814e5c
commit c49370b74a
5 changed files with 12 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
layout/style/nsCSSFontFaceRule.cpp
View File

@ -205,13 +205,12 @@ nsCSSFontFaceStyleDecl::RemoveProperty(const nsAString & propertyName,
return NS_OK;
}
NS_IMETHODIMP
void
nsCSSFontFaceStyleDecl::GetPropertyPriority(const nsAString & propertyName,
nsAString & aResult)
{
// font descriptors do not have priorities at present
aResult.Truncate();
return NS_OK;
}
NS_IMETHODIMP

4
layout/style/nsComputedDOMStyle.cpp
View File

@ -1189,13 +1189,11 @@ nsComputedDOMStyle::RemoveProperty(const nsAString& aPropertyName,
}
NS_IMETHODIMP
void
nsComputedDOMStyle::GetPropertyPriority(const nsAString& aPropertyName,
nsAString& aReturn)
{
aReturn.Truncate();
return NS_OK;
}
NS_IMETHODIMP

10
layout/style/nsDOMCSSDeclaration.cpp
View File

@ -201,18 +201,16 @@ nsDOMCSSDeclaration::GetPropertyValue(const nsAString& aPropertyName,
return NS_OK;
}
NS_IMETHODIMP
void
nsDOMCSSDeclaration::GetPropertyPriority(const nsAString& aPropertyName,
nsAString& aReturn)
nsAString& aPriority)
{
DeclarationBlock* decl = GetCSSDeclaration(eOperation_Read);
aReturn.Truncate();
aPriority.Truncate();
if (decl && decl->GetPropertyIsImportant(aPropertyName)) {
aReturn.AssignLiteral("important");
aPriority.AssignLiteral("important");
}
return NS_OK;
}
NS_IMETHODIMP

4
layout/style/nsDOMCSSDeclaration.h
View File

@ -75,8 +75,8 @@ public:
using nsICSSDeclaration::GetPropertyCSSValue;
NS_IMETHOD RemoveProperty(const nsAString & propertyName,
nsAString & _retval) override;
NS_IMETHOD GetPropertyPriority(const nsAString & propertyName,
nsAString & _retval) override;
void GetPropertyPriority(const nsAString & propertyName,
nsAString & aPriority) override;
NS_IMETHOD SetProperty(const nsAString& propertyName,
const nsAString& value,
const nsAString& priority,

10
layout/style/nsICSSDeclaration.h
View File

@ -58,8 +58,6 @@ public:
mozilla::ErrorResult& aRv) = 0;
NS_IMETHOD RemoveProperty(const nsAString& aPropertyName,
nsAString& aReturn) = 0;
NS_IMETHOD GetPropertyPriority(const nsAString& aPropertyName,
nsAString& aReturn) = 0;
NS_IMETHOD SetProperty(const nsAString& aPropertyName,
const nsAString& aValue,
const nsAString& aPriority,
@ -95,9 +93,8 @@ public:
mozilla::ErrorResult& rv) {
rv = GetPropertyValue(aPropName, aValue);
}
void GetPropertyPriority(const nsAString& aPropName, nsString& aPriority) {
GetPropertyPriority(aPropName, static_cast<nsAString&>(aPriority));
}
virtual void GetPropertyPriority(const nsAString& aPropName,
nsAString& aPriority) = 0;
void SetProperty(const nsAString& aPropName, const nsAString& aValue,
const nsAString& aPriority, nsIPrincipal* aSubjectPrincipal,
mozilla::ErrorResult& rv) {
@ -119,7 +116,8 @@ NS_DEFINE_STATIC_IID_ACCESSOR(nsICSSDeclaration, NS_ICSSDECLARATION_IID)
mozilla::ErrorResult& aRv) override; \
NS_IMETHOD GetPropertyValue(const nsAString & propertyName, nsAString & _retval) override; \
NS_IMETHOD RemoveProperty(const nsAString & propertyName, nsAString & _retval) override; \
NS_IMETHOD GetPropertyPriority(const nsAString & propertyName, nsAString & _retval) override; \
void GetPropertyPriority(const nsAString & propertyName, \
nsAString & aPriority) override; \
NS_IMETHOD SetProperty(const nsAString& propertyName, \
const nsAString& value, \
const nsAString& priority, \