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

12
layout/style/nsComputedDOMStyle.cpp
View File

@@ -2274,18 +2274,20 @@ nsComputedDOMStyle::DoGetBackgroundSize()
CSSValue*
nsComputedDOMStyle::DoGetGridTemplateAreas()
{
const nsTArray<nsString>& templates =
StylePosition()->mGridTemplateAreas.mTemplates;
if (templates.IsEmpty()) {
const css::GridTemplateAreasValue* areas =
StylePosition()->mGridTemplateAreas;
if (!areas) {
nsROCSSPrimitiveValue *val = new nsROCSSPrimitiveValue;
val->SetIdent(eCSSKeyword_none);
return val;
}
MOZ_ASSERT(!areas->mTemplates.IsEmpty(),
"Unexpected empty array in GridTemplateAreasValue");
nsDOMCSSValueList *valueList = GetROCSSValueList(false);
for (uint32_t i = 0; i < templates.Length(); i++) {
for (uint32_t i = 0; i < areas->mTemplates.Length(); i++) {
nsAutoString str;
nsStyleUtil::AppendEscapedCSSString(templates[i], str);
nsStyleUtil::AppendEscapedCSSString(areas->mTemplates[i], str);
nsROCSSPrimitiveValue *val = new nsROCSSPrimitiveValue;
val->SetString(str);
valueList->AppendCSSValue(val);