| Index: sky/engine/core/css/resolver/StyleResolver.cpp
|
| diff --git a/sky/engine/core/css/resolver/StyleResolver.cpp b/sky/engine/core/css/resolver/StyleResolver.cpp
|
| index 873eb12c652cfa226dc6d481ed8489967282c208..cddbcad1771506cf79c6925a07cd79985dc0376a 100644
|
| --- a/sky/engine/core/css/resolver/StyleResolver.cpp
|
| +++ b/sky/engine/core/css/resolver/StyleResolver.cpp
|
| @@ -316,7 +316,7 @@ void StyleResolver::matchUARules(ElementRuleCollector& collector, RuleSet* rules
|
| collector.sortAndTransferMatchedRules();
|
| }
|
|
|
| -void StyleResolver::matchAllRules(StyleResolverState& state, ElementRuleCollector& collector, bool includeSMILProperties)
|
| +void StyleResolver::matchAllRules(StyleResolverState& state, ElementRuleCollector& collector)
|
| {
|
| matchUARules(collector);
|
| matchAuthorRules(state.element(), collector, false);
|
| @@ -351,8 +351,7 @@ void StyleResolver::loadPendingResources(StyleResolverState& state)
|
| document().styleEngine()->fontSelector()->fontLoader()->loadPendingFonts();
|
| }
|
|
|
| -PassRefPtr<RenderStyle> StyleResolver::styleForElement(Element* element, RenderStyle* defaultParent, StyleSharingBehavior sharingBehavior,
|
| - RuleMatchingBehavior matchingBehavior)
|
| +PassRefPtr<RenderStyle> StyleResolver::styleForElement(Element* element, RenderStyle* defaultParent)
|
| {
|
| ASSERT(document().frame());
|
| ASSERT(document().settings());
|
| @@ -364,7 +363,7 @@ PassRefPtr<RenderStyle> StyleResolver::styleForElement(Element* element, RenderS
|
| document().setDirectionSetOnDocumentElement(false);
|
| StyleResolverState state(document(), element, defaultParent);
|
|
|
| - if (sharingBehavior == AllowStyleSharing && state.parentStyle()) {
|
| + if (state.parentStyle()) {
|
| SharedStyleFinder styleFinder(state.elementContext(), *this);
|
| if (RefPtr<RenderStyle> sharedStyle = styleFinder.findSharedStyle())
|
| return sharedStyle.release();
|
| @@ -391,7 +390,7 @@ PassRefPtr<RenderStyle> StyleResolver::styleForElement(Element* element, RenderS
|
| {
|
| ElementRuleCollector collector(state.elementContext(), state.style());
|
|
|
| - matchAllRules(state, collector, matchingBehavior != MatchAllRulesExcludingSMIL);
|
| + matchAllRules(state, collector);
|
|
|
| applyMatchedProperties(state, collector.matchedResult());
|
| }
|
|
|