Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(507)

Unified Diff: third_party/WebKit/Source/core/css/ActiveStyleSheetsTest.cpp

Issue 2487653002: Moved applyRuleSetChanges functions to StyleEngine. (Closed)
Patch Set: Added comment Created 4 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: third_party/WebKit/Source/core/css/ActiveStyleSheetsTest.cpp
diff --git a/third_party/WebKit/Source/core/css/ActiveStyleSheetsTest.cpp b/third_party/WebKit/Source/core/css/ActiveStyleSheetsTest.cpp
index 9bd366506938c98ac67e6bc41efc1fc25de0f4f5..7e2982859b9b884009f5cee845935ecc8370851a 100644
--- a/third_party/WebKit/Source/core/css/ActiveStyleSheetsTest.cpp
+++ b/third_party/WebKit/Source/core/css/ActiveStyleSheetsTest.cpp
@@ -310,8 +310,8 @@ TEST_F(ApplyRulesetsTest, AddUniversalRuleToDocument) {
ActiveStyleSheetVector newStyleSheets;
newStyleSheets.append(std::make_pair(sheet, &sheet->contents()->ruleSet()));
- applyRuleSetChanges(styleEngine(), document(), ActiveStyleSheetVector(),
- newStyleSheets);
+ styleEngine().applyRuleSetChanges(document(), ActiveStyleSheetVector(),
+ newStyleSheets);
EXPECT_EQ(SubtreeStyleChange, document().getStyleChangeType());
}
@@ -329,8 +329,8 @@ TEST_F(ApplyRulesetsTest, AddUniversalRuleToShadowTree) {
ActiveStyleSheetVector newStyleSheets;
newStyleSheets.append(std::make_pair(sheet, &sheet->contents()->ruleSet()));
- applyRuleSetChanges(styleEngine(), shadowRoot, ActiveStyleSheetVector(),
- newStyleSheets);
+ styleEngine().applyRuleSetChanges(shadowRoot, ActiveStyleSheetVector(),
+ newStyleSheets);
EXPECT_FALSE(document().needsStyleRecalc());
EXPECT_EQ(SubtreeStyleChange, host->getStyleChangeType());
@@ -344,8 +344,8 @@ TEST_F(ApplyRulesetsTest, AddShadowV0BoundaryCrossingRuleToDocument) {
ActiveStyleSheetVector newStyleSheets;
newStyleSheets.append(std::make_pair(sheet, &sheet->contents()->ruleSet()));
- applyRuleSetChanges(styleEngine(), document(), ActiveStyleSheetVector(),
- newStyleSheets);
+ styleEngine().applyRuleSetChanges(document(), ActiveStyleSheetVector(),
+ newStyleSheets);
EXPECT_EQ(SubtreeStyleChange, document().getStyleChangeType());
}
@@ -363,8 +363,8 @@ TEST_F(ApplyRulesetsTest, AddShadowV0BoundaryCrossingRuleToShadowTree) {
ActiveStyleSheetVector newStyleSheets;
newStyleSheets.append(std::make_pair(sheet, &sheet->contents()->ruleSet()));
- applyRuleSetChanges(styleEngine(), shadowRoot, ActiveStyleSheetVector(),
- newStyleSheets);
+ styleEngine().applyRuleSetChanges(shadowRoot, ActiveStyleSheetVector(),
+ newStyleSheets);
EXPECT_FALSE(document().needsStyleRecalc());
EXPECT_EQ(SubtreeStyleChange, host->getStyleChangeType());
@@ -379,8 +379,8 @@ TEST_F(ApplyRulesetsTest, AddFontFaceRuleToDocument) {
ActiveStyleSheetVector newStyleSheets;
newStyleSheets.append(std::make_pair(sheet, &sheet->contents()->ruleSet()));
- applyRuleSetChanges(styleEngine(), document(), ActiveStyleSheetVector(),
- newStyleSheets);
+ styleEngine().applyRuleSetChanges(document(), ActiveStyleSheetVector(),
+ newStyleSheets);
EXPECT_EQ(SubtreeStyleChange, document().getStyleChangeType());
}
@@ -399,8 +399,8 @@ TEST_F(ApplyRulesetsTest, AddFontFaceRuleToShadowTree) {
ActiveStyleSheetVector newStyleSheets;
newStyleSheets.append(std::make_pair(sheet, &sheet->contents()->ruleSet()));
- applyRuleSetChanges(styleEngine(), shadowRoot, ActiveStyleSheetVector(),
- newStyleSheets);
+ styleEngine().applyRuleSetChanges(shadowRoot, ActiveStyleSheetVector(),
+ newStyleSheets);
EXPECT_FALSE(document().needsLayoutTreeUpdate());
}
@@ -426,8 +426,8 @@ TEST_F(ApplyRulesetsTest, RemoveSheetFromShadowTree) {
ActiveStyleSheetVector oldStyleSheets;
oldStyleSheets.append(
std::make_pair(cssSheet, &cssSheet->contents()->ruleSet()));
- applyRuleSetChanges(styleEngine(), shadowRoot, oldStyleSheets,
- ActiveStyleSheetVector());
+ styleEngine().applyRuleSetChanges(shadowRoot, oldStyleSheets,
+ ActiveStyleSheetVector());
EXPECT_TRUE(styleEngine().treeBoundaryCrossingScopes().isEmpty());
}
« no previous file with comments | « third_party/WebKit/Source/core/css/ActiveStyleSheets.cpp ('k') | third_party/WebKit/Source/core/dom/StyleEngine.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698