| Index: third_party/WebKit/Source/core/style/ComputedStyle.h
|
| diff --git a/third_party/WebKit/Source/core/style/ComputedStyle.h b/third_party/WebKit/Source/core/style/ComputedStyle.h
|
| index 221444d69c8ce5ad0b0c6ca7ba2efdf2f60a16a8..a8cafcc846473538f3b96e68ba13a35536a8cba2 100644
|
| --- a/third_party/WebKit/Source/core/style/ComputedStyle.h
|
| +++ b/third_party/WebKit/Source/core/style/ComputedStyle.h
|
| @@ -191,7 +191,7 @@ class CORE_EXPORT ComputedStyle : public ComputedStyleBase,
|
|
|
| // inherited attributes
|
| DataRef<StyleRareInheritedData> rare_inherited_data_;
|
| - DataRef<StyleInheritedData> style_inherited_data_;
|
| + DataRef<StyleInheritedData> inherited_data_;
|
|
|
| // list of associated pseudo styles
|
| std::unique_ptr<PseudoStyleCache> cached_pseudo_styles_;
|
| @@ -2295,7 +2295,7 @@ class CORE_EXPORT ComputedStyle : public ComputedStyleBase,
|
| }
|
|
|
| float TextAutosizingMultiplier() const {
|
| - return style_inherited_data_->text_autosizing_multiplier;
|
| + return inherited_data_->text_autosizing_multiplier_;
|
| }
|
| void SetTextAutosizingMultiplier(float);
|
|
|
|
|