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

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

Issue 2876353002: Generate diffing functions for generated subgroup BoxData in ComputedStyle (Closed)
Patch Set: Formatting 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
« 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 a437ead777715c2b063ca8178b92b7ad4781f464..528541c554f222e6dbc91881f77963c6eefb13d4 100644
--- a/third_party/WebKit/Source/core/style/ComputedStyle.cpp
+++ b/third_party/WebKit/Source/core/style/ComputedStyle.cpp
@@ -558,16 +558,6 @@ bool ComputedStyle::ScrollAnchorDisablingPropertyChanged(
if (GetPosition() != other.GetPosition())
return true;
- if (box_data_.Get() != other.box_data_.Get()) {
meade_UTC10 2017/05/15 04:07:45 This doesn't need to be replaced with anything? :o
nainar 2017/05/15 04:10:49 That's because we are already calling ComputedStyl
meade_UTC10 2017/05/15 04:25:45 It's not obvious to me that this is equivalent - i
nainar 2017/05/15 05:21:44 Sounds good. Added to the CL description. Thank yo
- if (box_data_->width_ != other.box_data_->width_ ||
- box_data_->min_width_ != other.box_data_->min_width_ ||
- box_data_->max_width_ != other.box_data_->max_width_ ||
- box_data_->height_ != other.box_data_->height_ ||
- box_data_->min_height_ != other.box_data_->min_height_ ||
- box_data_->max_height_ != other.box_data_->max_height_)
- return true;
- }
-
if (ComputedStyleBase::ScrollAnchorDisablingPropertyChanged(other))
return true;
@@ -817,21 +807,13 @@ bool ComputedStyle::DiffNeedsFullLayoutAndPaintInvalidation(
}
bool ComputedStyle::DiffNeedsFullLayout(const ComputedStyle& other) const {
- if (box_data_.Get() != other.box_data_.Get()) {
- if (box_data_->width_ != other.box_data_->width_ ||
- box_data_->min_width_ != other.box_data_->min_width_ ||
- box_data_->max_width_ != other.box_data_->max_width_ ||
- box_data_->height_ != other.box_data_->height_ ||
- box_data_->min_height_ != other.box_data_->min_height_ ||
- box_data_->max_height_ != other.box_data_->max_height_)
- return true;
+ if (ComputedStyleBase::DiffNeedsFullLayout(other))
+ return true;
+ if (box_data_.Get() != other.box_data_.Get()) {
if (box_data_->vertical_align_length_ !=
other.box_data_->vertical_align_length_)
return true;
-
- if (box_data_->box_sizing_ != other.box_data_->box_sizing_)
- return true;
}
if (VerticalAlign() != other.VerticalAlign() ||
« 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