third_party/WebKit/Source/bindings/templates/callback_interface.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/templates/callback_interface.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/scripts/v8_types.py ('k') | third_party/WebKit/Source/bindings/tests/results/core/V8TestCallbackInterface.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/bindings/templates/callback_interface.cpp

diff --git a/third_party/WebKit/Source/bindings/templates/callback_interface.cpp b/third_party/WebKit/Source/bindings/templates/callback_interface.cpp

index 1e57223866b719fe18e08b15de17c50d308f7f15..22f1506c9c738de843fa7f29370961fa06c42974 100644

--- a/third_party/WebKit/Source/bindings/templates/callback_interface.cpp

+++ b/third_party/WebKit/Source/bindings/templates/callback_interface.cpp

@@ -8,7 +8,7 @@

namespace blink {

{{v8_class}}::{{v8_class}}(v8::Local<v8::Function> callback, ScriptState* scriptState)

- : ActiveDOMCallback(scriptState->executionContext())

+ : ActiveDOMCallback(scriptState->getExecutionContext())

, m_scriptState(scriptState)

{

m_callback.set(scriptState->isolate(), callback);

@@ -63,10 +63,10 @@ DEFINE_TRACE({{v8_class}})

{% if method.idl_type == 'boolean' %}

v8::TryCatch exceptionCatcher(m_scriptState->isolate());

exceptionCatcher.SetVerbose(true);

- ScriptController::callFunction(m_scriptState->executionContext(), m_callback.newLocal(m_scriptState->isolate()), {{this_handle_parameter}}{{method.arguments | length}}, argv, m_scriptState->isolate());

+ ScriptController::callFunction(m_scriptState->getExecutionContext(), m_callback.newLocal(m_scriptState->isolate()), {{this_handle_parameter}}{{method.arguments | length}}, argv, m_scriptState->isolate());

return !exceptionCatcher.HasCaught();

{% else %}{# void #}

{% endif %}

}