| Index: third_party/WebKit/Source/core/css/resolver/StyleResolverState.h
|
| diff --git a/third_party/WebKit/Source/core/css/resolver/StyleResolverState.h b/third_party/WebKit/Source/core/css/resolver/StyleResolverState.h
|
| index 02a72da35e9bedfc2bec8add924b9582d0714b56..0c88ce982db82530ec230ef381b727ff2b575781 100644
|
| --- a/third_party/WebKit/Source/core/css/resolver/StyleResolverState.h
|
| +++ b/third_party/WebKit/Source/core/css/resolver/StyleResolverState.h
|
| @@ -221,15 +221,15 @@ class CORE_EXPORT StyleResolverState {
|
| ElementResolveContext element_context_;
|
| Member<Document> document_;
|
|
|
| - // m_style is the primary output for each element's style resolve.
|
| + // style_ is the primary output for each element's style resolve.
|
| RefPtr<ComputedStyle> style_;
|
|
|
| CSSToLengthConversionData css_to_length_conversion_data_;
|
|
|
| - // m_parentStyle is not always just ElementResolveContext::parentStyle,
|
| + // parent_style_ is not always just ElementResolveContext::ParentStyle(),
|
| // so we keep it separate.
|
| RefPtr<ComputedStyle> parent_style_;
|
| - // This will almost-always be the same that m_parentStyle, except in the
|
| + // This will almost-always be the same that parent_style_, except in the
|
| // presence of display: contents. This is the style against which we have to
|
| // do adjustment.
|
| RefPtr<const ComputedStyle> layout_parent_style_;
|
|
|