Chromium Code Reviews| 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..0d0e73f9d3e6779d8982d6970adf7461e943028a 100644 |
| --- a/third_party/WebKit/Source/core/css/resolver/StyleResolver.h |
| +++ b/third_party/WebKit/Source/core/css/resolver/StyleResolver.h |
| @@ -82,6 +82,7 @@ class CORE_EXPORT StyleResolver final |
| PassRefPtr<ComputedStyle> styleForElement( |
| Element*, |
| const ComputedStyle* parentStyle = 0, |
| + const ComputedStyle* layoutParentStyle = 0, |
|
rune
2017/01/27 13:09:23
nullptr
emilio
2017/01/27 22:13:15
Good call, I'll change both.
rune
2017/02/06 22:40:44
Acknowledged.
|
| 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*); |