| Index: Source/core/css/resolver/StyleResolver.cpp
|
| diff --git a/Source/core/css/resolver/StyleResolver.cpp b/Source/core/css/resolver/StyleResolver.cpp
|
| index 1315fb80f80ecd5919e84a1ae13bc8e42419662d..2b7d079b3466524093903e4a6272666440c35774 100644
|
| --- a/Source/core/css/resolver/StyleResolver.cpp
|
| +++ b/Source/core/css/resolver/StyleResolver.cpp
|
| @@ -596,7 +596,7 @@ PassRefPtr<RenderStyle> StyleResolver::styleForElement(Element* element, RenderS
|
| RuleMatchingBehavior matchingBehavior)
|
| {
|
| ASSERT(document().frame());
|
| - ASSERT(documentSettings());
|
| + ASSERT(document().settings());
|
| ASSERT(!hasPendingAuthorStyleSheets());
|
| ASSERT(!m_needCollectFeatures);
|
|
|
| @@ -695,7 +695,7 @@ PassRefPtr<RenderStyle> StyleResolver::styleForElement(Element* element, RenderS
|
| PassRefPtr<RenderStyle> StyleResolver::styleForKeyframe(Element* element, const RenderStyle& elementStyle, RenderStyle* parentStyle, const StyleKeyframe* keyframe, const AtomicString& animationName)
|
| {
|
| ASSERT(document().frame());
|
| - ASSERT(documentSettings());
|
| + ASSERT(document().settings());
|
| ASSERT(!hasPendingAuthorStyleSheets());
|
|
|
| if (element == document().documentElement())
|
| @@ -806,7 +806,7 @@ PassRefPtrWillBeRawPtr<PseudoElement> StyleResolver::createPseudoElementIfNeeded
|
| bool StyleResolver::pseudoStyleForElementInternal(Element& element, const PseudoStyleRequest& pseudoStyleRequest, RenderStyle* parentStyle, StyleResolverState& state)
|
| {
|
| ASSERT(document().frame());
|
| - ASSERT(documentSettings());
|
| + ASSERT(document().settings());
|
| ASSERT(pseudoStyleRequest.pseudoId != FIRST_LINE_INHERITED);
|
|
|
| StyleResolverParentScope::ensureParentStackIsPushed();
|
|
|