зеркало из https://github.com/mozilla/gecko-dev.git
Bug 773296 - Part 28: Avoid some crashes in the inspector when variables are present. r=roc
This commit is contained in:
Родитель
9587a15ea9
Коммит
0fdf8ce2d7
|
@ -388,6 +388,11 @@ inDOMUtils::IsInheritedProperty(const nsAString &aPropertyName, bool *_retval)
|
||||||
return NS_OK;
|
return NS_OK;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (prop == eCSSPropertyExtra_variable) {
|
||||||
|
*_retval = true;
|
||||||
|
return NS_OK;
|
||||||
|
}
|
||||||
|
|
||||||
if (nsCSSProps::IsShorthand(prop)) {
|
if (nsCSSProps::IsShorthand(prop)) {
|
||||||
prop = nsCSSProps::SubpropertyEntryFor(prop)[0];
|
prop = nsCSSProps::SubpropertyEntryFor(prop)[0];
|
||||||
}
|
}
|
||||||
|
@ -565,7 +570,9 @@ inDOMUtils::GetCSSValuesForProperty(const nsAString& aProperty,
|
||||||
nsTArray<nsString> array;
|
nsTArray<nsString> array;
|
||||||
// We start collecting the values, BUT colors need to go in first, because array
|
// We start collecting the values, BUT colors need to go in first, because array
|
||||||
// needs to stay sorted, and the colors are sorted, so we just append them.
|
// needs to stay sorted, and the colors are sorted, so we just append them.
|
||||||
if (!nsCSSProps::IsShorthand(propertyID)) {
|
if (propertyID == eCSSPropertyExtra_variable) {
|
||||||
|
// No other values we can report.
|
||||||
|
} else if (!nsCSSProps::IsShorthand(propertyID)) {
|
||||||
// Property is longhand.
|
// Property is longhand.
|
||||||
uint32_t propertyParserVariant = nsCSSProps::ParserVariant(propertyID);
|
uint32_t propertyParserVariant = nsCSSProps::ParserVariant(propertyID);
|
||||||
// Get colors first.
|
// Get colors first.
|
||||||
|
|
Загрузка…
Ссылка в новой задаче