third_party/WebKit/Source/core/css/resolver/StyleResolver.h - Issue 1803933002: Use correct cascading order for Shadow DOM v1

Side by Side Diff: third_party/WebKit/Source/core/css/resolver/StyleResolver.h

Issue 1803933002: Use correct cascading order for Shadow DOM v1 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fix for review comment #16 Created 4 years, 9 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 | « third_party/WebKit/Source/core/css/resolver/ScopedStyleResolver.cpp ('k') | third_party/WebKit/Source/core/css/resolver/StyleResolver.cpp » ('j') | third_party/WebKit/Source/core/dom/StyleEngine.h » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 *	4 *

5 * This library is free software; you can redistribute it and/or	5 * This library is free software; you can redistribute it and/or

6 * modify it under the terms of the GNU Library General Public	6 * modify it under the terms of the GNU Library General Public

7 * License as published by the Free Software Foundation; either	7 * License as published by the Free Software Foundation; either

8 * version 2 of the License, or (at your option) any later version.	8 * version 2 of the License, or (at your option) any later version.

9 *	9 *

10 * This library is distributed in the hope that it will be useful,	10 * This library is distributed in the hope that it will be useful,

(...skipping 176 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
187 void updateFont(StyleResolverState&);	187 void updateFont(StyleResolverState&);

188	188

189 void loadPendingResources(StyleResolverState&);	189 void loadPendingResources(StyleResolverState&);

190 void adjustComputedStyle(StyleResolverState&, Element*);	190 void adjustComputedStyle(StyleResolverState&, Element*);

191	191

192 void appendCSSStyleSheet(CSSStyleSheet&);	192 void appendCSSStyleSheet(CSSStyleSheet&);

193	193

194 void collectPseudoRulesForElement(const Element&, ElementRuleCollector&, Pse udoId, unsigned rulesToInclude);	194 void collectPseudoRulesForElement(const Element&, ElementRuleCollector&, Pse udoId, unsigned rulesToInclude);

195 void matchRuleSet(ElementRuleCollector&, RuleSet*);	195 void matchRuleSet(ElementRuleCollector&, RuleSet*);

196 void matchUARules(ElementRuleCollector&);	196 void matchUARules(ElementRuleCollector&);

	197 void matchScopedRules(const Element&, ElementRuleCollector&);

197 void matchAuthorRules(const Element&, ElementRuleCollector&);	198 void matchAuthorRules(const Element&, ElementRuleCollector&);

	199 void matchAuthorRulesV0(const Element&, ElementRuleCollector&);

198 void matchAllRules(StyleResolverState&, ElementRuleCollector&, bool includeS MILProperties);	200 void matchAllRules(StyleResolverState&, ElementRuleCollector&, bool includeS MILProperties);

199 void collectFeatures();	201 void collectFeatures();

200 void collectTreeBoundaryCrossingRules(const Element&, ElementRuleCollector&) ;	202 void collectTreeBoundaryCrossingRules(const Element&, ElementRuleCollector&) ;

201	203

202 void applyMatchedProperties(StyleResolverState&, const MatchResult&);	204 void applyMatchedProperties(StyleResolverState&, const MatchResult&);

203 bool applyAnimatedProperties(StyleResolverState&, const Element* animatingEl ement);	205 bool applyAnimatedProperties(StyleResolverState&, const Element* animatingEl ement);

204 void applyCallbackSelectors(StyleResolverState&);	206 void applyCallbackSelectors(StyleResolverState&);

205	207

206 template <CSSPropertyPriority priority>	208 template <CSSPropertyPriority priority>

207 void applyMatchedProperties(StyleResolverState&, const MatchedPropertiesRang e&, bool important, bool inheritedOnly);	209 void applyMatchedProperties(StyleResolverState&, const MatchedPropertiesRang e&, bool important, bool inheritedOnly);

(...skipping 42 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
250 bool m_printMediaType;	252 bool m_printMediaType;

251 bool m_hasFullscreenUAStyle = false;	253 bool m_hasFullscreenUAStyle = false;

252	254

253 unsigned m_styleSharingDepth;	255 unsigned m_styleSharingDepth;

254 WillBeHeapVector<OwnPtrWillBeMember<StyleSharingList>, styleSharingMaxDepth> m_styleSharingLists;	256 WillBeHeapVector<OwnPtrWillBeMember<StyleSharingList>, styleSharingMaxDepth> m_styleSharingLists;

255 };	257 };

256	258

257 } // namespace blink	259 } // namespace blink

258	260

259 #endif // StyleResolver_h	261 #endif // StyleResolver_h

OLD	NEW