Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(215)

Side by Side Diff: Source/core/css/ElementRuleCollector.cpp

Issue 327773004: Remove include of StyleResolverState.h from StyleResolver.h (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Rebased for landing Created 6 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « Source/core/animation/css/CSSAnimations.cpp ('k') | Source/core/css/FontFaceSet.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
3 * (C) 2004-2005 Allan Sandfeld Jensen (kde@carewolf.com) 3 * (C) 2004-2005 Allan Sandfeld Jensen (kde@carewolf.com)
4 * Copyright (C) 2006, 2007 Nicholas Shanks (webkit@nickshanks.com) 4 * Copyright (C) 2006, 2007 Nicholas Shanks (webkit@nickshanks.com)
5 * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Apple Inc. All rights reserved. 5 * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Apple Inc. All rights reserved.
6 * Copyright (C) 2007 Alexey Proskuryakov <ap@webkit.org> 6 * Copyright (C) 2007 Alexey Proskuryakov <ap@webkit.org>
7 * Copyright (C) 2007, 2008 Eric Seidel <eric@webkit.org> 7 * Copyright (C) 2007, 2008 Eric Seidel <eric@webkit.org>
8 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.t orchmobile.com/) 8 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.t orchmobile.com/)
9 * Copyright (c) 2011, Code Aurora Forum. All rights reserved. 9 * Copyright (c) 2011, Code Aurora Forum. All rights reserved.
10 * Copyright (C) Research In Motion Limited 2011. All rights reserved. 10 * Copyright (C) Research In Motion Limited 2011. All rights reserved.
(...skipping 23 matching lines...) Expand all
34 #include "core/css/CSSMediaRule.h" 34 #include "core/css/CSSMediaRule.h"
35 #include "core/css/CSSRuleList.h" 35 #include "core/css/CSSRuleList.h"
36 #include "core/css/CSSSelector.h" 36 #include "core/css/CSSSelector.h"
37 #include "core/css/CSSStyleRule.h" 37 #include "core/css/CSSStyleRule.h"
38 #include "core/css/CSSStyleSheet.h" 38 #include "core/css/CSSStyleSheet.h"
39 #include "core/css/CSSSupportsRule.h" 39 #include "core/css/CSSSupportsRule.h"
40 #include "core/css/SiblingTraversalStrategies.h" 40 #include "core/css/SiblingTraversalStrategies.h"
41 #include "core/css/StylePropertySet.h" 41 #include "core/css/StylePropertySet.h"
42 #include "core/css/resolver/StyleResolver.h" 42 #include "core/css/resolver/StyleResolver.h"
43 #include "core/dom/shadow/ShadowRoot.h" 43 #include "core/dom/shadow/ShadowRoot.h"
44 #include "core/rendering/style/StyleInheritedData.h"
44 45
45 namespace WebCore { 46 namespace WebCore {
46 47
47 ElementRuleCollector::ElementRuleCollector(const ElementResolveContext& context, 48 ElementRuleCollector::ElementRuleCollector(const ElementResolveContext& context,
48 const SelectorFilter& filter, RenderStyle* style) 49 const SelectorFilter& filter, RenderStyle* style)
49 : m_context(context) 50 : m_context(context)
50 , m_selectorFilter(filter) 51 , m_selectorFilter(filter)
51 , m_style(style) 52 , m_style(style)
52 , m_pseudoStyleRequest(NOPSEUDO) 53 , m_pseudoStyleRequest(NOPSEUDO)
53 , m_mode(SelectorChecker::ResolvingStyle) 54 , m_mode(SelectorChecker::ResolvingStyle)
(...skipping 287 matching lines...) Expand 10 before | Expand all | Expand 10 after
341 // information about "scope". 342 // information about "scope".
342 int firstRuleIndex = -1, lastRuleIndex = -1; 343 int firstRuleIndex = -1, lastRuleIndex = -1;
343 RuleRange ruleRange(firstRuleIndex, lastRuleIndex); 344 RuleRange ruleRange(firstRuleIndex, lastRuleIndex);
344 // FIXME: Verify whether it's ok to ignore CascadeScope here. 345 // FIXME: Verify whether it's ok to ignore CascadeScope here.
345 collectMatchingRules(MatchRequest(ruleSet), ruleRange, SelectorChecker::Stay sWithinTreeScope); 346 collectMatchingRules(MatchRequest(ruleSet), ruleRange, SelectorChecker::Stay sWithinTreeScope);
346 347
347 return m_matchedRules && !m_matchedRules->isEmpty(); 348 return m_matchedRules && !m_matchedRules->isEmpty();
348 } 349 }
349 350
350 } // namespace WebCore 351 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/core/animation/css/CSSAnimations.cpp ('k') | Source/core/css/FontFaceSet.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698