third_party/WebKit/Source/core/dom/PendingScript.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/dom/PendingScript.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/css/RemoteFontFaceSource.cpp ('k') | third_party/WebKit/Source/core/editing/CaretBase.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/core/dom/PendingScript.cpp

diff --git a/third_party/WebKit/Source/core/dom/PendingScript.cpp b/third_party/WebKit/Source/core/dom/PendingScript.cpp

index 5058b054842ef0a0a1e7a2dec040952ddb10d19b..5003d50c0238958289a94c50d20063a586e5f2c7 100644

--- a/third_party/WebKit/Source/core/dom/PendingScript.cpp

+++ b/third_party/WebKit/Source/core/dom/PendingScript.cpp

@@ -155,7 +155,7 @@ void PendingScript::notifyFinished(Resource* resource)

// See https://crbug.com/500701 for more information.

if (m_element) {

- ASSERT(resource->type() == Resource::Script);

+ ASSERT(resource->getType() == Resource::Script);

ScriptResource* scriptResource = toScriptResource(resource);

String integrityAttr = m_element->fastGetAttribute(HTMLNames::integrityAttr);

« no previous file with comments | « third_party/WebKit/Source/core/css/RemoteFontFaceSource.cpp ('k') | third_party/WebKit/Source/core/editing/CaretBase.h » ('j') | no next file with comments »