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 dc0ba2a0dfe4adb5238a7d0e7202135110ccb349..b0af4abac53728f4c2df0aa94f9887102c47d1fa 100644 |
--- a/third_party/WebKit/Source/core/style/ComputedStyle.cpp |
+++ b/third_party/WebKit/Source/core/style/ComputedStyle.cpp |
@@ -1564,15 +1564,16 @@ const Vector<AppliedTextDecoration>& ComputedStyle::AppliedTextDecorations() |
} |
StyleInheritedVariables* ComputedStyle::InheritedVariables() const { |
- return VariablesInternal().Get(); |
+ return InheritedVariablesInternal().Get(); |
} |
StyleNonInheritedVariables* ComputedStyle::NonInheritedVariables() const { |
- return rare_non_inherited_data_->variables_.get(); |
+ return rare_non_inherited_data_->non_inherited_variables_.get(); |
} |
StyleInheritedVariables& ComputedStyle::MutableInheritedVariables() { |
- RefPtr<StyleInheritedVariables>& variables = MutableVariablesInternal(); |
+ RefPtr<StyleInheritedVariables>& variables = |
+ MutableInheritedVariablesInternal(); |
if (!variables) |
variables = StyleInheritedVariables::Create(); |
else if (!variables->HasOneRef()) |
@@ -1582,7 +1583,7 @@ StyleInheritedVariables& ComputedStyle::MutableInheritedVariables() { |
StyleNonInheritedVariables& ComputedStyle::MutableNonInheritedVariables() { |
std::unique_ptr<StyleNonInheritedVariables>& variables = |
- rare_non_inherited_data_.Access()->variables_; |
+ rare_non_inherited_data_.Access()->non_inherited_variables_; |
if (!variables) |
variables = StyleNonInheritedVariables::Create(); |
return *variables; |