third_party/WebKit/Source/bindings/core/v8/ScriptPromiseProperty.h - 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/ScriptPromiseProperty.h

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

Index: third_party/WebKit/Source/bindings/core/v8/ScriptPromiseProperty.h

diff --git a/third_party/WebKit/Source/bindings/core/v8/ScriptPromiseProperty.h b/third_party/WebKit/Source/bindings/core/v8/ScriptPromiseProperty.h

index 73d270edd49ec31700d4f66a3dd4ab210ecd7a22..61679bc0ffeedf9cf7d840eac24cf9b674dac549 100644

--- a/third_party/WebKit/Source/bindings/core/v8/ScriptPromiseProperty.h

+++ b/third_party/WebKit/Source/bindings/core/v8/ScriptPromiseProperty.h

@@ -96,7 +96,7 @@ void ScriptPromiseProperty<HolderType, ResolvedType, RejectedType>::resolve(Pass

ASSERT_NOT_REACHED();

return;

}

- if (!executionContext() || executionContext()->activeDOMObjectsAreStopped())

+ if (!getExecutionContext() || getExecutionContext()->activeDOMObjectsAreStopped())

return;

m_resolved = value;

resolveOrReject(Resolved);

@@ -110,7 +110,7 @@ void ScriptPromiseProperty<HolderType, ResolvedType, RejectedType>::reject(PassR

ASSERT_NOT_REACHED();

return;

}

- if (!executionContext() || executionContext()->activeDOMObjectsAreStopped())

+ if (!getExecutionContext() || getExecutionContext()->activeDOMObjectsAreStopped())

return;

m_rejected = value;

resolveOrReject(Rejected);