third_party/WebKit/Source/core/testing/Internals.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/testing/Internals.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 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

« third_party/WebKit/Source/core/editing/CaretBase.h ('K') | « third_party/WebKit/Source/core/svg/UnsafeSVGAttributeSanitizationTest.cpp ('k') | third_party/WebKit/Source/modules/fetch/FetchManager.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/core/testing/Internals.cpp

diff --git a/third_party/WebKit/Source/core/testing/Internals.cpp b/third_party/WebKit/Source/core/testing/Internals.cpp

index b64438310952189c839cc91f4cd6784215ab5d59..a585adf4d14c34a22ff507bc6db102a2d28c0650 100644

--- a/third_party/WebKit/Source/core/testing/Internals.cpp

+++ b/third_party/WebKit/Source/core/testing/Internals.cpp

@@ -401,7 +401,7 @@ bool Internals::isLoadingFromMemoryCache(const String& url)

return false;

const String cacheIdentifier = contextDocument()->fetcher()->getCacheIdentifier();

Resource* resource = memoryCache()->resourceForURL(contextDocument()->completeURL(url), cacheIdentifier);

- return resource && resource->status() == Resource::Cached;

+ return resource && resource->getStatus() == Resource::Cached;

}

bool Internals::isSharingStyle(Element* element1, Element* element2) const