third_party/WebKit/Source/core/inspector/InspectorStyleSheet.cpp - Issue 1729013002: 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/inspector/InspectorStyleSheet.cpp

Issue 1729013002: 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-3: . 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/resolver/CSSVariableResolver.cpp ('k') | third_party/WebKit/Source/core/paint/TextPainterTest.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/core/inspector/InspectorStyleSheet.cpp

diff --git a/third_party/WebKit/Source/core/inspector/InspectorStyleSheet.cpp b/third_party/WebKit/Source/core/inspector/InspectorStyleSheet.cpp

index df32b3d75d3d3c5ddcba11d530a364990408f525..56c8401db435d4b4bdf3cfdcf2575711e3db1544 100644

--- a/third_party/WebKit/Source/core/inspector/InspectorStyleSheet.cpp

+++ b/third_party/WebKit/Source/core/inspector/InspectorStyleSheet.cpp

@@ -84,7 +84,7 @@ public:

}

private:

- void startRuleHeader(StyleRule::Type, unsigned) override;

+ void startRuleHeader(StyleRule::RuleType, unsigned) override;

void endRuleHeader(unsigned) override;

void observeSelector(unsigned startOffset, unsigned endOffset) override;

void startRuleBody(unsigned) override;

@@ -110,7 +110,7 @@ private:

unsigned m_mediaQueryExpValueRangeStart;

};

-void StyleSheetHandler::startRuleHeader(StyleRule::Type type, unsigned offset)

+void StyleSheetHandler::startRuleHeader(StyleRule::RuleType type, unsigned offset)

{

// Pop off data for a previous invalid rule.

if (m_currentRuleData)