Index: third_party/WebKit/Source/core/style/StyleRareNonInheritedData.cpp |
diff --git a/third_party/WebKit/Source/core/style/StyleRareNonInheritedData.cpp b/third_party/WebKit/Source/core/style/StyleRareNonInheritedData.cpp |
index fb6615bcb9bf3e46bbe9df34f18ecd6d97b5d4ef..cf707a650f77c46821a584ed90123a3b4138a28b 100644 |
--- a/third_party/WebKit/Source/core/style/StyleRareNonInheritedData.cpp |
+++ b/third_party/WebKit/Source/core/style/StyleRareNonInheritedData.cpp |
@@ -23,9 +23,10 @@ |
#include "core/animation/css/CSSAnimationData.h" |
#include "core/animation/css/CSSTransitionData.h" |
+#include "core/style/ComputedStyle.h" |
#include "core/style/ContentData.h" |
#include "core/style/DataEquivalency.h" |
-#include "core/style/ComputedStyle.h" |
+#include "core/style/MemberCopy.h" |
#include "core/style/ShadowList.h" |
#include "core/style/StyleFilterData.h" |
#include "core/style/StyleNonInheritedVariables.h" |
@@ -143,25 +144,25 @@ StyleRareNonInheritedData::StyleRareNonInheritedData( |
object_position_(o.object_position_), |
line_clamp_(o.line_clamp_), |
draggable_region_mode_(o.draggable_region_mode_), |
- deprecated_flexible_box_data_(o.deprecated_flexible_box_data_), |
- flexible_box_data_(o.flexible_box_data_), |
- multi_col_data_(o.multi_col_data_), |
- transform_data_(o.transform_data_), |
- will_change_data_(o.will_change_data_), |
- filter_(o.filter_), |
- backdrop_filter_(o.backdrop_filter_), |
- grid_data_(o.grid_data_), |
- grid_item_data_(o.grid_item_data_), |
- scroll_snap_data_(o.scroll_snap_data_), |
- content_(o.content_ ? o.content_->Clone() : nullptr), |
- counter_directives_(o.counter_directives_ ? o.counter_directives_->Clone() |
- : nullptr), |
- animations_(o.animations_ ? o.animations_->Clone() : nullptr), |
- transitions_(o.transitions_ ? o.transitions_->Clone() : nullptr), |
- box_shadow_(o.box_shadow_), |
- box_reflect_(o.box_reflect_), |
+ deprecated_flexible_box_data_( |
+ MemberCopy(o.deprecated_flexible_box_data_)), |
+ flexible_box_data_(MemberCopy(o.flexible_box_data_)), |
+ multi_col_data_(MemberCopy(o.multi_col_data_)), |
+ transform_data_(MemberCopy(o.transform_data_)), |
+ will_change_data_(MemberCopy(o.will_change_data_)), |
+ filter_(MemberCopy(o.filter_)), |
+ backdrop_filter_(MemberCopy(o.backdrop_filter_)), |
+ grid_data_(MemberCopy(o.grid_data_)), |
+ grid_item_data_(MemberCopy(o.grid_item_data_)), |
+ scroll_snap_data_(MemberCopy(o.scroll_snap_data_)), |
+ content_(MemberCopy(o.content_)), |
+ counter_directives_(MemberCopy(o.counter_directives_)), |
+ animations_(MemberCopy(o.animations_)), |
+ transitions_(MemberCopy(o.transitions_)), |
+ box_shadow_(MemberCopy(o.box_shadow_)), |
+ box_reflect_(MemberCopy(o.box_reflect_)), |
shape_outside_(o.shape_outside_), |
- clip_path_(o.clip_path_), |
+ clip_path_(MemberCopy(o.clip_path_)), |
mask_(o.mask_), |
mask_box_image_(o.mask_box_image_), |
page_size_(o.page_size_), |
@@ -177,11 +178,8 @@ StyleRareNonInheritedData::StyleRareNonInheritedData( |
visited_link_border_top_color_(o.visited_link_border_top_color_), |
visited_link_border_bottom_color_(o.visited_link_border_bottom_color_), |
callback_selectors_(o.callback_selectors_), |
- paint_images_(o.paint_images_ ? new PaintImages(*o.paint_images_) |
- : nullptr), |
- non_inherited_variables_(o.non_inherited_variables_ |
- ? o.non_inherited_variables_->Clone() |
- : nullptr), |
+ paint_images_(MemberCopy(o.paint_images_)), |
+ non_inherited_variables_(MemberCopy(o.non_inherited_variables_)), |
align_content_(o.align_content_), |
align_items_(o.align_items_), |
align_self_(o.align_self_), |
@@ -236,14 +234,17 @@ bool StyleRareNonInheritedData::operator==( |
object_position_ == o.object_position_ && |
line_clamp_ == o.line_clamp_ && |
draggable_region_mode_ == o.draggable_region_mode_ && |
- deprecated_flexible_box_data_ == o.deprecated_flexible_box_data_ && |
- flexible_box_data_ == o.flexible_box_data_ && |
- multi_col_data_ == o.multi_col_data_ && |
- transform_data_ == o.transform_data_ && |
- will_change_data_ == o.will_change_data_ && filter_ == o.filter_ && |
- backdrop_filter_ == o.backdrop_filter_ && grid_data_ == o.grid_data_ && |
- grid_item_data_ == o.grid_item_data_ && |
- scroll_snap_data_ == o.scroll_snap_data_ && |
+ DataEquivalent(deprecated_flexible_box_data_, |
+ o.deprecated_flexible_box_data_) && |
+ DataEquivalent(flexible_box_data_, o.flexible_box_data_) && |
+ DataEquivalent(multi_col_data_, o.multi_col_data_) && |
+ DataEquivalent(transform_data_, o.transform_data_) && |
+ DataEquivalent(will_change_data_, o.will_change_data_) && |
+ DataEquivalent(filter_, o.filter_) && |
+ DataEquivalent(backdrop_filter_, o.backdrop_filter_) && |
+ DataEquivalent(grid_data_, o.grid_data_) && |
+ DataEquivalent(grid_item_data_, o.grid_item_data_) && |
+ DataEquivalent(scroll_snap_data_, o.scroll_snap_data_) && |
DataEquivalent(content_, o.content_) && |
DataEquivalent(counter_directives_, o.counter_directives_) && |
DataEquivalent(box_shadow_, o.box_shadow_) && |