third_party/WebKit/Source/core/css/resolver/ScopedStyleResolver.h - Issue 1913833002: Current work-in-progress crbug.com/567021

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: third_party/WebKit/Source/core/css/resolver/ScopedStyleResolver.h

Issue 1913833002: Current work-in-progress crbug.com/567021 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: More assert fixes Created 4 years, 7 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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « third_party/WebKit/Source/core/css/parser/CSSParserImpl.cpp ('k') | third_party/WebKit/Source/core/css/resolver/ScopedStyleResolver.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/core/css/resolver/ScopedStyleResolver.h

diff --git a/third_party/WebKit/Source/core/css/resolver/ScopedStyleResolver.h b/third_party/WebKit/Source/core/css/resolver/ScopedStyleResolver.h

index adf8f4184437edcea7aec0eb4cfe8a5f897ae30a..e89cecc259511621125b46baf6de2deeaa5be29b 100644

--- a/third_party/WebKit/Source/core/css/resolver/ScopedStyleResolver.h

+++ b/third_party/WebKit/Source/core/css/resolver/ScopedStyleResolver.h

@@ -27,6 +27,7 @@

#ifndef ScopedStyleResolver_h

#define ScopedStyleResolver_h

+#include "core/css/ActiveStyleSheets.h"

#include "core/css/ElementRuleCollector.h"

#include "core/css/RuleSet.h"

#include "core/dom/TreeScope.h"

@@ -39,7 +40,6 @@ namespace blink {

class PageRuleCollector;

class StyleSheetContents;

-class ViewportStyleResolver;

// This class selects a ComputedStyle for a given element based on a collection of stylesheets.

class ScopedStyleResolver final : public GarbageCollected<ScopedStyleResolver> {

@@ -55,14 +55,13 @@ public:

StyleRuleKeyframes* keyframeStylesForAnimation(const StringImpl* animationName);

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

+ void appendActiveStyleSheets(unsigned index, const ActiveStyleSheetVector&);

void collectMatchingAuthorRules(ElementRuleCollector&, CascadeOrder = ignoreCascadeOrder);

void collectMatchingShadowHostRules(ElementRuleCollector&, CascadeOrder = ignoreCascadeOrder);

void collectMatchingTreeBoundaryCrossingRules(ElementRuleCollector&, CascadeOrder = ignoreCascadeOrder);

void matchPageRules(PageRuleCollector&);

void collectFeaturesTo(RuleFeatureSet&, HeapHashSet<Member<const StyleSheetContents>>& visitedSharedStyleSheetContents) const;

void resetAuthorStyle();

- void collectViewportRulesTo(ViewportStyleResolver*) const;

bool hasDeepOrShadowSelector() const { return m_hasDeepOrShadowSelector; }

DECLARE_TRACE();

@@ -81,6 +80,8 @@ private:

Member<TreeScope> m_scope;

HeapVector<Member<CSSStyleSheet>> m_authorStyleSheets;

+ MediaQueryResultList m_viewportDependentMediaQueryResults;

+ MediaQueryResultList m_deviceDependentMediaQueryResults;

using KeyframesRuleMap = HeapHashMap<const StringImpl*, Member<StyleRuleKeyframes>>;

KeyframesRuleMap m_keyframesRuleMap;