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

Bug 1457920: Remove ServoStyleSheet usage. r=xidorn

Browse Source 
MozReview-Commit-ID: LIBkovuQ6MB
This commit is contained in:
Emilio Cobos Álvarez
2018-04-30 19:23:14 +02:00
parent d79c492759
commit be43ec910e
22 changed files with 126 additions and 127 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
layout/base/PresShell.cpp
View File

@@ -8576,7 +8576,7 @@ PresShell::IsVisible()
}
nsresult
PresShell::GetAgentStyleSheets(nsTArray<RefPtr<ServoStyleSheet>>& aSheets)
PresShell::GetAgentStyleSheets(nsTArray<RefPtr<StyleSheet>>& aSheets)
{
aSheets.Clear();
int32_t sheetCount = mStyleSet->SheetCount(SheetType::Agent);
@@ -8586,7 +8586,7 @@ PresShell::GetAgentStyleSheets(nsTArray<RefPtr<ServoStyleSheet>>& aSheets)
}
for (int32_t i = 0; i < sheetCount; ++i) {
ServoStyleSheet* sheet = mStyleSet->StyleSheetAt(SheetType::Agent, i);
StyleSheet* sheet = mStyleSet->StyleSheetAt(SheetType::Agent, i);
aSheets.AppendElement(sheet);
}
@@ -8594,7 +8594,7 @@ PresShell::GetAgentStyleSheets(nsTArray<RefPtr<ServoStyleSheet>>& aSheets)
}
nsresult
PresShell::SetAgentStyleSheets(const nsTArray<RefPtr<ServoStyleSheet>>& aSheets)
PresShell::SetAgentStyleSheets(const nsTArray<RefPtr<StyleSheet>>& aSheets)
{
return mStyleSet->ReplaceSheets(SheetType::Agent, aSheets);
}
@@ -9680,7 +9680,7 @@ CopySheetsIntoClone(ServoStyleSet* aSet, ServoStyleSet* aClone)
{
int32_t i, n = aSet->SheetCount(SheetType::Override);
for (i = 0; i < n; i++) {
ServoStyleSheet* ss = aSet->StyleSheetAt(SheetType::Override, i);
StyleSheet* ss = aSet->StyleSheetAt(SheetType::Override, i);
if (ss)
aClone->AppendStyleSheet(SheetType::Override, ss);
}
@@ -9697,14 +9697,14 @@ CopySheetsIntoClone(ServoStyleSet* aSet, ServoStyleSet* aClone)
n = aSet->SheetCount(SheetType::User);
for (i = 0; i < n; i++) {
ServoStyleSheet* ss = aSet->StyleSheetAt(SheetType::User, i);
StyleSheet* ss = aSet->StyleSheetAt(SheetType::User, i);
if (ss)
aClone->AppendStyleSheet(SheetType::User, ss);
}
n = aSet->SheetCount(SheetType::Agent);
for (i = 0; i < n; i++) {
ServoStyleSheet* ss = aSet->StyleSheetAt(SheetType::Agent, i);
StyleSheet* ss = aSet->StyleSheetAt(SheetType::Agent, i);
if (ss)
aClone->AppendStyleSheet(SheetType::Agent, ss);
}