third_party/WebKit/Source/core/fetch/DocumentResource.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/fetch/DocumentResource.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/fetch/DocumentResource.h ('k') | third_party/WebKit/Source/core/fetch/FetchContext.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/core/fetch/DocumentResource.cpp

diff --git a/third_party/WebKit/Source/core/fetch/DocumentResource.cpp b/third_party/WebKit/Source/core/fetch/DocumentResource.cpp

index d076e1ad6b38d9a33360100f2e9760fb45edfc03..191fa6e27bea8cd5d748daea3054417ea668a04b 100644

--- a/third_party/WebKit/Source/core/fetch/DocumentResource.cpp

+++ b/third_party/WebKit/Source/core/fetch/DocumentResource.cpp

@@ -80,7 +80,7 @@ void DocumentResource::checkNotify()

bool DocumentResource::mimeTypeAllowed() const

{

- ASSERT(type() == SVGDocument);

+ ASSERT(getType() == SVGDocument);

AtomicString mimeType = response().mimeType();

if (response().isHTTP())

mimeType = httpContentType();

@@ -92,7 +92,7 @@ bool DocumentResource::mimeTypeAllowed() const

PassRefPtrWillBeRawPtr<Document> DocumentResource::createDocument(const KURL& url)

{

- switch (type()) {

+ switch (getType()) {

case SVGDocument:

return XMLDocument::createSVG(DocumentInit(url));

default:

« no previous file with comments | « third_party/WebKit/Source/core/fetch/DocumentResource.h ('k') | third_party/WebKit/Source/core/fetch/FetchContext.h » ('j') | no next file with comments »