Source/core/css/resolver/ScopedStyleResolver.h - Issue 1332493002: Revert "Implement proposed shadow tree cascade order."

Side by Side Diff: Source/core/css/resolver/ScopedStyleResolver.h

Issue 1332493002: Revert "Implement proposed shadow tree cascade order." (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master

Patch Set: Created 5 years, 3 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/css/TreeBoundaryCrossingRules.cpp ('k') | Source/core/css/resolver/ScopedStyleResolver.cpp » ('j') | no next file with comments »

OLD	NEW
1 /*	1 /*

2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org)	2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org)

3 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserved.	3 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserved.

4 * Copyright (C) 2012 Google Inc. All rights reserved.	4 * Copyright (C) 2012 Google Inc. All rights reserved.

5 *	5 *

6 * Redistribution and use in source and binary forms, with or without	6 * Redistribution and use in source and binary forms, with or without

7 * modification, are permitted provided that the following conditions	7 * modification, are permitted provided that the following conditions

8 * are met:	8 * are met:

9 * 1. Redistributions of source code must retain the above copyright	9 * 1. Redistributions of source code must retain the above copyright

10 * notice, this list of conditions and the following disclaimer.	10 * notice, this list of conditions and the following disclaimer.

(...skipping 41 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
52 }	52 }

53	53

54 const TreeScope& treeScope() const { return *m_scope; }	54 const TreeScope& treeScope() const { return *m_scope; }

55 ScopedStyleResolver* parent() const;	55 ScopedStyleResolver* parent() const;

56	56

57 StyleRuleKeyframes* keyframeStylesForAnimation(const StringImpl* animationNa me);	57 StyleRuleKeyframes* keyframeStylesForAnimation(const StringImpl* animationNa me);

58	58

59 void appendCSSStyleSheet(CSSStyleSheet&, const MediaQueryEvaluator&);	59 void appendCSSStyleSheet(CSSStyleSheet&, const MediaQueryEvaluator&);

60 void collectMatchingAuthorRules(ElementRuleCollector&, bool includeEmptyRule s, CascadeOrder = ignoreCascadeOrder);	60 void collectMatchingAuthorRules(ElementRuleCollector&, bool includeEmptyRule s, CascadeOrder = ignoreCascadeOrder);

61 void collectMatchingShadowHostRules(ElementRuleCollector&, bool includeEmpty Rules, CascadeOrder = ignoreCascadeOrder);	61 void collectMatchingShadowHostRules(ElementRuleCollector&, bool includeEmpty Rules, CascadeOrder = ignoreCascadeOrder);

62 void collectMatchingTreeBoundaryCrossingRules(ElementRuleCollector&, bool in cludeEmptyRules, CascadeOrder = ignoreCascadeOrder);	62 void collectMatchingTreeBoundaryCrossingRules(ElementRuleCollector&, bool in cludeEmptyRules, CascadeOrder);

63 void matchPageRules(PageRuleCollector&);	63 void matchPageRules(PageRuleCollector&);

64 void collectFeaturesTo(RuleFeatureSet&, HashSet<const StyleSheetContents*>& visitedSharedStyleSheetContents) const;	64 void collectFeaturesTo(RuleFeatureSet&, HashSet<const StyleSheetContents*>& visitedSharedStyleSheetContents) const;

65 void resetAuthorStyle();	65 void resetAuthorStyle();

66 void collectViewportRulesTo(ViewportStyleResolver*) const;	66 void collectViewportRulesTo(ViewportStyleResolver*) const;

67	67

68 DECLARE_TRACE();	68 DECLARE_TRACE();

69	69

70 private:	70 private:

71 explicit ScopedStyleResolver(TreeScope& scope)	71 explicit ScopedStyleResolver(TreeScope& scope)

72 : m_scope(scope)	72 : m_scope(scope)

(...skipping 34 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
107 }	107 }

108 };	108 };

109 typedef WillBeHeapVector<OwnPtrWillBeMember<RuleSubSet>> CSSStyleSheetRuleSu bSet;	109 typedef WillBeHeapVector<OwnPtrWillBeMember<RuleSubSet>> CSSStyleSheetRuleSu bSet;

110	110

111 OwnPtrWillBeMember<CSSStyleSheetRuleSubSet> m_treeBoundaryCrossingRuleSet;	111 OwnPtrWillBeMember<CSSStyleSheetRuleSubSet> m_treeBoundaryCrossingRuleSet;

112 };	112 };

113	113

114 } // namespace blink	114 } // namespace blink

115	115

116 #endif // ScopedStyleResolver_h	116 #endif // ScopedStyleResolver_h

OLD	NEW