third_party/WebKit/Source/bindings/core/v8/ScriptPromise.cpp - Issue 1773813007: blink: Rename modules/ method to prefix with get when they collide.

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/bindings/core/v8/ScriptPromise.cpp

Issue 1773813007: blink: Rename modules/ method to prefix with get when they collide. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: clash-modules: rebase-fixes Created 4 years, 9 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/bindings/core/v8/ScriptFunction.cpp ('k') | third_party/WebKit/Source/bindings/core/v8/ScriptPromiseProperty.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/bindings/core/v8/ScriptPromise.cpp

diff --git a/third_party/WebKit/Source/bindings/core/v8/ScriptPromise.cpp b/third_party/WebKit/Source/bindings/core/v8/ScriptPromise.cpp

index b3a198ba5b58a7aaf4e9320d1a072a052026dbc6..e473714efee6080aeec3245dbdd27d8ce63d8071 100644

--- a/third_party/WebKit/Source/bindings/core/v8/ScriptPromise.cpp

+++ b/third_party/WebKit/Source/bindings/core/v8/ScriptPromise.cpp

@@ -174,7 +174,7 @@ ScriptPromise ScriptPromise::InternalResolver::promise() const

{

if (m_resolver.isEmpty())

return ScriptPromise();

- return ScriptPromise(m_resolver.scriptState(), v8Promise());

+ return ScriptPromise(m_resolver.getScriptState(), v8Promise());

}

void ScriptPromise::InternalResolver::resolve(v8::Local<v8::Value> value)