Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(119)

Unified Diff: extensions/renderer/script_context.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 | « extensions/renderer/guest_view/mime_handler_view/mime_handler_view_container.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: extensions/renderer/script_context.cc
diff --git a/extensions/renderer/script_context.cc b/extensions/renderer/script_context.cc
index 9ed4c23fee41d666dc236e0ab137384866cac1a9..8104fa07146acf81cb94b65b0e39f4fc5187cacd 100644
--- a/extensions/renderer/script_context.cc
+++ b/extensions/renderer/script_context.cc
@@ -188,12 +188,19 @@ v8::Local<v8::Value> ScriptContext::CallFunction(
v8::Local<v8::Primitive>(v8::Undefined(isolate())));
}
+#ifdef WEB_FRAME_USES_V8_LOCAL
+ v8::Local<v8::Value>* call_args =
+ reinterpret_cast<v8::Local<v8::Value>*>(argv);
+#else
+ v8::Handle<v8::Value>* call_args = argv;
+#endif
+
v8::Handle<v8::Object> global = v8_context()->Global();
if (!web_frame_)
return handle_scope.Escape(function->Call(global, argc, argv));
return handle_scope.Escape(
v8::Local<v8::Value>(web_frame_->callFunctionEvenIfScriptDisabled(
- function, global, argc, argv)));
+ function, global, argc, call_args)));
}
Feature::Availability ScriptContext::GetAvailability(
« no previous file with comments | « extensions/renderer/guest_view/mime_handler_view/mime_handler_view_container.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698