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

Unified Diff: third_party/WebKit/Source/core/style/ComputedStyle.cpp

Issue 2871463002: Move StyleRareInheritedData accessors to be inline in ComputedStyle. (Closed)
Patch Set: Rebase Created 3 years, 7 months 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/style/ComputedStyle.cpp
diff --git a/third_party/WebKit/Source/core/style/ComputedStyle.cpp b/third_party/WebKit/Source/core/style/ComputedStyle.cpp
index fe7f6757639aeefc7286610dcb53bde9e30cd9e2..5d3e2b5dc634f9217a6c0433170639b8464742c1 100644
--- a/third_party/WebKit/Source/core/style/ComputedStyle.cpp
+++ b/third_party/WebKit/Source/core/style/ComputedStyle.cpp
@@ -1072,18 +1072,14 @@ void ComputedStyle::UpdatePropertySpecificDifferences(
diff.SetTextDecorationOrColorChanged();
} else {
if (rare_inherited_data_.Get() != other.rare_inherited_data_.Get() &&
- (rare_inherited_data_->TextFillColor() !=
- other.rare_inherited_data_->TextFillColor() ||
- rare_inherited_data_->TextStrokeColor() !=
- other.rare_inherited_data_->TextStrokeColor() ||
- rare_inherited_data_->TextEmphasisColor() !=
- other.rare_inherited_data_->TextEmphasisColor() ||
- rare_inherited_data_->VisitedLinkTextFillColor() !=
- other.rare_inherited_data_->VisitedLinkTextFillColor() ||
- rare_inherited_data_->VisitedLinkTextStrokeColor() !=
- other.rare_inherited_data_->VisitedLinkTextStrokeColor() ||
- rare_inherited_data_->VisitedLinkTextEmphasisColor() !=
- other.rare_inherited_data_->VisitedLinkTextEmphasisColor() ||
+ (TextFillColor() != other.TextFillColor() ||
+ TextStrokeColor() != other.TextStrokeColor() ||
+ TextEmphasisColor() != other.TextEmphasisColor() ||
+ VisitedLinkTextFillColor() != other.VisitedLinkTextFillColor() ||
+ VisitedLinkTextStrokeColor() !=
+ other.VisitedLinkTextStrokeColor() ||
+ VisitedLinkTextEmphasisColor() !=
+ other.VisitedLinkTextEmphasisColor() ||
rare_inherited_data_->text_emphasis_fill_ !=
other.rare_inherited_data_->text_emphasis_fill_ ||
rare_inherited_data_->text_underline_position_ !=
@@ -1092,10 +1088,8 @@ void ComputedStyle::UpdatePropertySpecificDifferences(
other.rare_inherited_data_->text_decoration_skip_ ||
rare_inherited_data_->applied_text_decorations_ !=
other.rare_inherited_data_->applied_text_decorations_ ||
- rare_inherited_data_->CaretColor() !=
- other.rare_inherited_data_->CaretColor() ||
- rare_inherited_data_->VisitedLinkCaretColor() !=
- other.rare_inherited_data_->VisitedLinkCaretColor())) {
+ CaretColor() != CaretColor() ||
+ VisitedLinkCaretColor() != other.VisitedLinkCaretColor())) {
diff.SetTextDecorationOrColorChanged();
}
}
« no previous file with comments | « third_party/WebKit/Source/core/style/ComputedStyle.h ('k') | third_party/WebKit/Source/core/style/StyleRareInheritedData.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698