content/renderer/web_ui_runner.cc - Issue 1095463003: update chrome to handle temporary WEB_FRAME_USES_V8_LOCAL condition

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: content/renderer/web_ui_runner.cc

Issue 1095463003: update chrome to handle temporary WEB_FRAME_USES_V8_LOCAL condition (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 5 years, 8 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 | « content/renderer/pepper/ppb_var_deprecated_impl.cc ('k') | content/shell/renderer/test_runner/accessibility_controller.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/renderer/web_ui_runner.cc

diff --git a/content/renderer/web_ui_runner.cc b/content/renderer/web_ui_runner.cc

index 5d6f05cc66ab0632871b5e531b232c75da51e053..560342fdd3aa5c4c6a358fa718827cef782c786e 100644

--- a/content/renderer/web_ui_runner.cc

+++ b/content/renderer/web_ui_runner.cc

@@ -45,8 +45,14 @@ v8::Handle<v8::Value> WebUIRunner::Call(v8::Handle<v8::Function> function,

v8::Handle<v8::Value> receiver,

int argc,

v8::Handle<v8::Value> argv[]) {

+#ifdef WEB_FRAME_USES_V8_LOCAL

+ v8::Local<v8::Value>* cast_argv =

+ reinterpret_cast<v8::Local<v8::Value>*>(argv);

+#else

+ v8::Handle<v8::Value>* cast_argv = argv;

+#endif

return frame_->callFunctionEvenIfScriptDisabled(function, receiver, argc,

- argv);

+ cast_argv);

}

gin::ContextHolder* WebUIRunner::GetContextHolder() {