Index: third_party/WebKit/Source/core/css/resolver/StyleResolver.cpp |
diff --git a/third_party/WebKit/Source/core/css/resolver/StyleResolver.cpp b/third_party/WebKit/Source/core/css/resolver/StyleResolver.cpp |
index 329a5db96f9d4a8d6cf215ffb3ec8416d44c3109..8787909d20c0ad782efdc8821b3b18991ffbd003 100644 |
--- a/third_party/WebKit/Source/core/css/resolver/StyleResolver.cpp |
+++ b/third_party/WebKit/Source/core/css/resolver/StyleResolver.cpp |
@@ -693,10 +693,11 @@ PassRefPtr<ComputedStyle> StyleResolver::StyleForElement( |
} else { |
if (state.ParentStyle()) { |
RefPtr<ComputedStyle> style = ComputedStyle::Create(); |
- style->InheritFrom(*state.ParentStyle(), |
- IsAtShadowBoundary(element) |
- ? ComputedStyleBase::kAtShadowBoundary |
- : ComputedStyleBase::kNotAtShadowBoundary); |
+ style->InheritFrom( |
+ *state.ParentStyle(), |
+ IsAtShadowBoundary(element) |
+ ? ComputedStyleBase<ComputedStyle>::kAtShadowBoundary |
+ : ComputedStyleBase<ComputedStyle>::kNotAtShadowBoundary); |
alancutter (OOO until 2018)
2017/05/12 06:45:43
Can this just be ComputedStyle::kEnumValue?
nainar
2017/05/12 06:59:18
Yup, Done.
|
state.SetStyle(std::move(style)); |
} else { |
state.SetStyle(InitialStyleForElement()); |