third_party/WebKit/Source/core/style/StyleRareNonInheritedData.cpp - Issue 2920133003: Rename RareInheritedData::variables and RareNonInheritedData::variables.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 2920133003: Rename RareInheritedData::variables and RareNonInheritedData::variables. (Closed)

Patch Set: Rebase 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:

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 72b1d5bed51749df667d0f8437e12a5dd4f723d8..8032c0fa17a2d73ec76e533fb6cfe857b0b311ac 100644

--- a/third_party/WebKit/Source/core/style/StyleRareNonInheritedData.cpp

+++ b/third_party/WebKit/Source/core/style/StyleRareNonInheritedData.cpp

@@ -93,7 +93,7 @@ StyleRareNonInheritedData::StyleRareNonInheritedData()

visited_link_border_right_color_(StyleColor::CurrentColor()),

visited_link_border_top_color_(StyleColor::CurrentColor()),

visited_link_border_bottom_color_(StyleColor::CurrentColor()),

- variables_(ComputedStyle::InitialNonInheritedVariables()),

+ non_inherited_variables_(ComputedStyle::InitialNonInheritedVariables()),

align_content_(ComputedStyle::InitialContentAlignment()),

align_items_(ComputedStyle::InitialDefaultAlignment()),

align_self_(ComputedStyle::InitialSelfAlignment()),

@@ -179,7 +179,9 @@ StyleRareNonInheritedData::StyleRareNonInheritedData(

callback_selectors_(o.callback_selectors_),

paint_images_(o.paint_images_ ? new PaintImages(*o.paint_images_)

: nullptr),

- variables_(o.variables_ ? o.variables_->Clone() : nullptr),

+ non_inherited_variables_(o.non_inherited_variables_

+ ? o.non_inherited_variables_->Clone()

+ : nullptr),

align_content_(o.align_content_),

align_items_(o.align_items_),

align_self_(o.align_self_),

@@ -262,7 +264,7 @@ bool StyleRareNonInheritedData::operator==(

visited_link_border_bottom_color_ ==

o.visited_link_border_bottom_color_ &&

callback_selectors_ == o.callback_selectors_ &&

- DataEquivalent(variables_, o.variables_) &&

+ DataEquivalent(non_inherited_variables_, o.non_inherited_variables_) &&

align_content_ == o.align_content_ && align_items_ == o.align_items_ &&

align_self_ == o.align_self_ &&

justify_content_ == o.justify_content_ &&

« no previous file with comments | « third_party/WebKit/Source/core/style/StyleRareNonInheritedData.h ('k') | no next file » | no next file with comments »