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

13
layout/style/nsRuleNode.cpp
View File

@@ -7234,8 +7234,8 @@ SetGridTrackList(const nsCSSValue& aValue,
static void
SetGridTemplateAreas(const nsCSSValue& aValue,
css::GridTemplateAreasValue& aResult,
const css::GridTemplateAreasValue& aParentValue,
nsRefPtr<css::GridTemplateAreasValue>* aResult,
css::GridTemplateAreasValue* aParentValue,
bool& aCanStoreInRuleTree)
{
switch (aValue.GetUnit()) {
@@ -7244,17 +7244,17 @@ SetGridTemplateAreas(const nsCSSValue& aValue,
case eCSSUnit_Inherit:
aCanStoreInRuleTree = false;
aResult = aParentValue;
*aResult = aParentValue;
break;
case eCSSUnit_Initial:
case eCSSUnit_Unset:
case eCSSUnit_None:
aResult.Reset();
*aResult = nullptr;
break;
default:
aResult = aValue.GetGridTemplateAreas();
*aResult = aValue.GetGridTemplateAreas();
}
}
@@ -7521,7 +7521,8 @@ nsRuleNode::ComputePositionData(void* aStartStruct,
// grid-tempate-areas
SetGridTemplateAreas(*aRuleData->ValueForGridTemplateAreas(),
pos->mGridTemplateAreas, parentPos->mGridTemplateAreas,
&pos->mGridTemplateAreas,
parentPos->mGridTemplateAreas,
canStoreInRuleTree);
// grid-auto-position