third_party/WebKit/Source/bindings/core/v8/ScriptPromisePropertyBase.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/ScriptPromisePropertyBase.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/ScriptPromiseProperty.h ('k') | third_party/WebKit/Source/bindings/core/v8/ScriptPromisePropertyTest.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index c355d764902a92447d1f64e846da0d9ac0b70976..edd1331b6f42b7a476970328a4ec08930f6ebee9 100644

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

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

@@ -32,11 +32,11 @@ static void clearHandle(const v8::WeakCallbackInfo<ScopedPersistent<v8::Object>>

ScriptPromise ScriptPromisePropertyBase::promise(DOMWrapperWorld& world)

{

- if (!executionContext())

+ if (!getExecutionContext())

return ScriptPromise();

v8::HandleScope handleScope(m_isolate);

- v8::Local<v8::Context> context = toV8Context(executionContext(), world);

+ v8::Local<v8::Context> context = toV8Context(getExecutionContext(), world);

if (context.IsEmpty())

return ScriptPromise();

ScriptState* scriptState = ScriptState::from(context);

@@ -72,7 +72,7 @@ ScriptPromise ScriptPromisePropertyBase::promise(DOMWrapperWorld& world)

void ScriptPromisePropertyBase::resolveOrReject(State targetState)

{

- ASSERT(executionContext());

+ ASSERT(getExecutionContext());

ASSERT(m_state == Pending);

ASSERT(targetState == Resolved || targetState == Rejected);