third_party/WebKit/Source/core/css/resolver/ScopedStyleResolver.cpp - Issue 1773813007: blink: Rename modules/ method to prefix with get when they collide.

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.cpp

Issue 1773813007: blink: Rename modules/ method to prefix with get when they collide. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: clash-modules: rebase-fixes 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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « third_party/WebKit/Source/core/css/StyleRuleImport.cpp ('k') | third_party/WebKit/Source/core/dom/ActiveDOMObject.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.cpp

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

index 67ae3a267c7d081d7664a668c5a818de7325e41b..33cf98c2e322e903649f84df59445c8d4395f732 100644

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

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

@@ -83,7 +83,7 @@ void ScopedStyleResolver::appendCSSStyleSheet(CSSStyleSheet& cssSheet, const Med

unsigned index = m_authorStyleSheets.size();

m_authorStyleSheets.append(&cssSheet);

StyleSheetContents* sheet = cssSheet.contents();

- AddRuleFlags addRuleFlags = treeScope().document().securityOrigin()->canRequest(sheet->baseURL()) ? RuleHasDocumentSecurityOrigin : RuleHasNoSpecialState;

+ AddRuleFlags addRuleFlags = treeScope().document().getSecurityOrigin()->canRequest(sheet->baseURL()) ? RuleHasDocumentSecurityOrigin : RuleHasNoSpecialState;

const RuleSet& ruleSet = sheet->ensureRuleSet(medium, addRuleFlags);

addKeyframeRules(ruleSet);

« no previous file with comments | « third_party/WebKit/Source/core/css/StyleRuleImport.cpp ('k') | third_party/WebKit/Source/core/dom/ActiveDOMObject.cpp » ('j') | no next file with comments »