corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 984760 part 2: Use GridTemplateAreasValue though nsRefPtr pointers. r=dholbert

Browse Source
This commit is contained in:
Simon Sapin
2014-03-21 23:06:16 +08:00
parent 4ca8d6c048
commit 1dd63c0ce5
8 changed files with 85 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
layout/style/Declaration.cpp
View File

@@ -1022,7 +1022,7 @@ Declaration::GetValue(nsCSSProperty aProperty, nsAString& aValue,
// which isn't a value that the shorthand can express. Bail.
return;
}
const GridTemplateAreasValue& areas = areasValue.GetGridTemplateAreas();
const GridTemplateAreasValue* areas = areasValue.GetGridTemplateAreas();
const nsCSSValueList* rowsItem = rowsValue.GetListValue();
uint32_t nRowItems = 0;
while (rowsItem) {
@@ -1030,7 +1030,7 @@ Declaration::GetValue(nsCSSProperty aProperty, nsAString& aValue,
rowsItem = rowsItem->mNext;
}
MOZ_ASSERT(nRowItems % 2 == 1, "expected an odd number of items");
if ((nRowItems - 1) / 2 != areas.NRows()) {
if ((nRowItems - 1) / 2 != areas->NRows()) {
// Not serializable, bail.
return;
}
@@ -1057,7 +1057,7 @@ Declaration::GetValue(nsCSSProperty aProperty, nsAString& aValue,
aValue.AppendLiteral(")");
} else {
nsStyleUtil::AppendEscapedCSSString(areas.mTemplates[row++], aValue);
nsStyleUtil::AppendEscapedCSSString(areas->mTemplates[row++], aValue);
aValue.Append(char16_t(' '));
// <track-size>