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

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

Issue 2938543006: Remove references to groups directly stored on ComputedStyle in .cpp file (Closed)
Patch Set: Merge branch 'rareNonInheritedDataDiff' into otherGroups Created 3 years, 6 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
« no previous file with comments | « third_party/WebKit/Source/core/css/ComputedStyleDiffFunctions.json5 ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 bfb7efe5293c98400e4b136fd40f1c01062127ca..944699fa8ae51ba26847d3bc00a05ad08ca25887 100644
--- a/third_party/WebKit/Source/core/style/ComputedStyle.cpp
+++ b/third_party/WebKit/Source/core/style/ComputedStyle.cpp
@@ -647,7 +647,8 @@ bool ComputedStyle::DiffNeedsPaintInvalidationObject(
return true;
if (!BorderVisuallyEqual(other) || !RadiiEqual(other) ||
- *background_data_ != *other.background_data_)
+ (BackgroundInternal() != other.BackgroundInternal() ||
+ BackgroundColorInternal() != other.BackgroundColorInternal()))
return true;
if (rare_non_inherited_data_->paint_images_) {
@@ -735,25 +736,17 @@ void ComputedStyle::UpdatePropertySpecificDifferences(
other))
diff.SetBackdropFilterChanged();
- if (!diff.NeedsFullPaintInvalidation()) {
- if ((inherited_data_->color_ != other.inherited_data_->color_ ||
- inherited_data_->visited_link_color_ !=
- other.inherited_data_->visited_link_color_ ||
- HasSimpleUnderlineInternal() != other.HasSimpleUnderlineInternal() ||
- visual_data_->text_decoration_ !=
- other.visual_data_->text_decoration_) ||
- ComputedStyleBase::
- UpdatePropertySpecificDifferencesTextDecorationOrColor(*this,
- other)) {
- diff.SetTextDecorationOrColorChanged();
- }
+ if (!diff.NeedsFullPaintInvalidation() &&
+ ComputedStyleBase::UpdatePropertySpecificDifferencesTextDecorationOrColor(
+ *this, other)) {
+ diff.SetTextDecorationOrColorChanged();
}
- bool has_clip = HasOutOfFlowPosition() && !visual_data_->has_auto_clip_;
+ bool has_clip = HasOutOfFlowPosition() && !HasAutoClipInternal();
bool other_has_clip =
- other.HasOutOfFlowPosition() && !other.visual_data_->has_auto_clip_;
+ other.HasOutOfFlowPosition() && !other.HasAutoClipInternal();
if (has_clip != other_has_clip ||
- (has_clip && visual_data_->clip_ != other.visual_data_->clip_))
+ (has_clip && ClipInternal() != other.ClipInternal()))
diff.SetCSSClipChanged();
}
« no previous file with comments | « third_party/WebKit/Source/core/css/ComputedStyleDiffFunctions.json5 ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698