third_party/WebKit/Source/core/inspector/InspectorResourceContentLoader.cpp - Issue 1738623004: Rename enums/functions that collide in 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/InspectorResourceContentLoader.cpp

Issue 1738623004: Rename enums/functions that collide in chromium style. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@get-names-4

Patch Set: get-names-5: rebase-and-stuff 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/inspector/InspectorResourceAgent.cpp ('k') | third_party/WebKit/Source/core/layout/LayoutThemeMac.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index 5ff99608b845023832ca7785a9402d0327b0c36f..54fe833211b6787cf98aa62fd6822dad4faf6d0a 100644

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

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

@@ -31,7 +31,7 @@ public:

void waitForResource(Resource* resource)

{

- if (resource->type() == Resource::Raw)

+ if (resource->getType() == Resource::Raw)

resource->addClient(static_cast<RawResourceClient*>(this));

else

resource->addClient(static_cast<StyleSheetResourceClient*>(this));

@@ -58,7 +58,7 @@ void InspectorResourceContentLoader::ResourceClient::resourceFinished(Resource*

if (m_loader)

m_loader->resourceFinished(this);

- if (resource->type() == Resource::Raw)

+ if (resource->getType() == Resource::Raw)

resource->removeClient(static_cast<RawResourceClient*>(this));

else

resource->removeClient(static_cast<StyleSheetResourceClient*>(this));

@@ -75,7 +75,7 @@ void InspectorResourceContentLoader::ResourceClient::setCSSStyleSheet(const Stri

void InspectorResourceContentLoader::ResourceClient::notifyFinished(Resource* resource)

{

- if (resource->type() == Resource::CSSStyleSheet)

+ if (resource->getType() == Resource::CSSStyleSheet)

return;

resourceFinished(resource);

}