wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 1144607 part 1 - Remove CounterStyleManager::BuildCounterStyle for anonymous counter styles. r=dbaron

Browse Source
This commit is contained in:
Xidorn Quan 2015-03-27 09:48:10 +11:00
parent 57f44ef17b
commit cd6cb2863b
4 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
layout/base/nsCounterManager.cpp
View File

@ -55,7 +55,7 @@ nsCounterUseNode::GetCounterStyle()
style.GetStringValue(ident); style.GetStringValue(ident);
mCounterStyle = manager->BuildCounterStyle(ident); mCounterStyle = manager->BuildCounterStyle(ident);
} else if (style.GetUnit() == eCSSUnit_Symbols) { } else if (style.GetUnit() == eCSSUnit_Symbols) {
mCounterStyle = manager->BuildCounterStyle(style.GetArrayValue()); mCounterStyle = new AnonymousCounterStyle(style.GetArrayValue());
} else { } else {
NS_NOTREACHED("Unknown counter style"); NS_NOTREACHED("Unknown counter style");
mCounterStyle = CounterStyleManager::GetDecimalStyle(); mCounterStyle = CounterStyleManager::GetDecimalStyle();

6
layout/style/CounterStyleManager.cpp
View File

@ -2028,12 +2028,6 @@ CounterStyleManager::BuildCounterStyle(const nsSubstring& aName)
return data; return data;
} }
CounterStyle*
CounterStyleManager::BuildCounterStyle(const nsCSSValue::Array* aParams)
{
return new AnonymousCounterStyle(aParams);
}
/* static */ CounterStyle* /* static */ CounterStyle*
CounterStyleManager::GetBuiltinStyle(int32_t aStyle) CounterStyleManager::GetBuiltinStyle(int32_t aStyle)
{ {

1
layout/style/CounterStyleManager.h
View File

@ -157,7 +157,6 @@ public:
} }
CounterStyle* BuildCounterStyle(const nsSubstring& aName); CounterStyle* BuildCounterStyle(const nsSubstring& aName);
CounterStyle* BuildCounterStyle(const nsCSSValue::Array* aParams);
static CounterStyle* GetBuiltinStyle(int32_t aStyle); static CounterStyle* GetBuiltinStyle(int32_t aStyle);
static CounterStyle* GetNoneStyle() static CounterStyle* GetNoneStyle()

6
layout/style/nsRuleNode.cpp
View File

@ -7218,9 +7218,9 @@ nsRuleNode::ComputeListData(void* aStartStruct,
break; break;
} }
case eCSSUnit_Symbols: case eCSSUnit_Symbols:
list->SetListStyleType(NS_LITERAL_STRING(""), list->SetListStyleType(
mPresContext->CounterStyleManager()-> NS_LITERAL_STRING(""),
BuildCounterStyle(typeValue->GetArrayValue())); new AnonymousCounterStyle(typeValue->GetArrayValue()));
break; break;
case eCSSUnit_Null: case eCSSUnit_Null:
break; break;