third_party/WebKit/Source/core/css/invalidation/StyleSheetInvalidationAnalysis.cpp - Issue 1731583003: blink: Rename enums and functions to not collide with chromium style.

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/invalidation/StyleSheetInvalidationAnalysis.cpp

Issue 1731583003: blink: Rename enums and functions to not collide with chromium style. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: get-names-2: . Created 4 years, 10 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/SelectorFilter.cpp ('k') | third_party/WebKit/Source/core/css/parser/CSSParserSelector.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/core/css/invalidation/StyleSheetInvalidationAnalysis.cpp

diff --git a/third_party/WebKit/Source/core/css/invalidation/StyleSheetInvalidationAnalysis.cpp b/third_party/WebKit/Source/core/css/invalidation/StyleSheetInvalidationAnalysis.cpp

index 89db72fbfea1fd43b960912d7c09dad1d6e9f4fb..ce959ed2e6397a8dbeea38346fbf033afbb98f0c 100644

--- a/third_party/WebKit/Source/core/css/invalidation/StyleSheetInvalidationAnalysis.cpp

+++ b/third_party/WebKit/Source/core/css/invalidation/StyleSheetInvalidationAnalysis.cpp

@@ -55,7 +55,7 @@ static bool determineSelectorScopes(const CSSSelectorList& selectorList, HashSet

scopeSelector = current;

else if (current->match() == CSSSelector::Class && (!scopeSelector || scopeSelector->match() != CSSSelector::Id))

scopeSelector = current;

- CSSSelector::Relation relation = current->relation();

+ CSSSelector::RelationType relation = current->relation();

// FIXME: it would be better to use setNeedsStyleRecalc for all shadow hosts matching

// scopeSelector. Currently requests full style recalc.

if (relation == CSSSelector::ShadowDeep || relation == CSSSelector::ShadowPseudo)