| Index: third_party/WebKit/Source/core/css/resolver/StyleResolver.h
|
| diff --git a/third_party/WebKit/Source/core/css/resolver/StyleResolver.h b/third_party/WebKit/Source/core/css/resolver/StyleResolver.h
|
| index a06ff9ba448bfc0f27549d1bc00eceb6b1711d78..667d93ca4267b3cbaf4ad090c0db2f423de3de60 100644
|
| --- a/third_party/WebKit/Source/core/css/resolver/StyleResolver.h
|
| +++ b/third_party/WebKit/Source/core/css/resolver/StyleResolver.h
|
| @@ -81,7 +81,8 @@ class CORE_EXPORT StyleResolver final
|
|
|
| PassRefPtr<ComputedStyle> styleForElement(
|
| Element*,
|
| - const ComputedStyle* parentStyle = 0,
|
| + const ComputedStyle* parentStyle = nullptr,
|
| + const ComputedStyle* layoutParentStyle = nullptr,
|
| StyleSharingBehavior = AllowStyleSharing,
|
| RuleMatchingBehavior = MatchAllRules);
|
|
|
| @@ -95,7 +96,8 @@ class CORE_EXPORT StyleResolver final
|
| PassRefPtr<ComputedStyle> pseudoStyleForElement(
|
| Element*,
|
| const PseudoStyleRequest&,
|
| - const ComputedStyle* parentStyle);
|
| + const ComputedStyle* parentStyle,
|
| + const ComputedStyle* layoutParentStyle);
|
|
|
| PassRefPtr<ComputedStyle> styleForPage(int pageIndex);
|
| PassRefPtr<ComputedStyle> styleForText(Text*);
|
|
|