| Index: third_party/WebKit/Source/core/style/StyleRareInheritedData.cpp
|
| diff --git a/third_party/WebKit/Source/core/style/StyleRareInheritedData.cpp b/third_party/WebKit/Source/core/style/StyleRareInheritedData.cpp
|
| index 5d003ceae551c24ce8223f79739e6a2034cf86cb..56920b80c455153ce410c4cabb77959b1b4128d5 100644
|
| --- a/third_party/WebKit/Source/core/style/StyleRareInheritedData.cpp
|
| +++ b/third_party/WebKit/Source/core/style/StyleRareInheritedData.cpp
|
| @@ -199,7 +199,8 @@ bool StyleRareInheritedData::operator==(const StyleRareInheritedData& o) const {
|
| o.visited_link_text_emphasis_color_ &&
|
| visited_link_caret_color_ == o.visited_link_caret_color_ &&
|
| tap_highlight_color_ == o.tap_highlight_color_ &&
|
| - ShadowDataEquivalent(o) && highlight_ == o.highlight_ &&
|
| + DataEquivalent(text_shadow_, o.text_shadow_) &&
|
| + highlight_ == o.highlight_ &&
|
| DataEquivalent(cursor_data_, o.cursor_data_) &&
|
| text_indent_ == o.text_indent_ &&
|
| effective_zoom_ == o.effective_zoom_ && widows_ == o.widows_ &&
|
| @@ -246,7 +247,7 @@ bool StyleRareInheritedData::operator==(const StyleRareInheritedData& o) const {
|
| hyphenation_string_ == o.hyphenation_string_ &&
|
| line_height_step_ == o.line_height_step_ &&
|
| text_emphasis_custom_mark_ == o.text_emphasis_custom_mark_ &&
|
| - QuotesDataEquivalent(o) && tab_size_ == o.tab_size_ &&
|
| + DataEquivalent(quotes_, o.quotes_) && tab_size_ == o.tab_size_ &&
|
| image_rendering_ == o.image_rendering_ &&
|
| text_underline_position_ == o.text_underline_position_ &&
|
| text_decoration_skip_ == o.text_decoration_skip_ &&
|
| @@ -258,14 +259,4 @@ bool StyleRareInheritedData::operator==(const StyleRareInheritedData& o) const {
|
| text_size_adjust_ == o.text_size_adjust_;
|
| }
|
|
|
| -bool StyleRareInheritedData::ShadowDataEquivalent(
|
| - const StyleRareInheritedData& o) const {
|
| - return DataEquivalent(text_shadow_, o.text_shadow_);
|
| -}
|
| -
|
| -bool StyleRareInheritedData::QuotesDataEquivalent(
|
| - const StyleRareInheritedData& o) const {
|
| - return DataEquivalent(quotes_, o.quotes_);
|
| -}
|
| -
|
| } // namespace blink
|
|
|