diff options
8 files changed, 3 insertions, 43 deletions
diff --git a/content/renderer/gpu/gpu_benchmarking_extension.cc b/content/renderer/gpu/gpu_benchmarking_extension.cc index d4890b5..45a350a 100644 --- a/content/renderer/gpu/gpu_benchmarking_extension.cc +++ b/content/renderer/gpu/gpu_benchmarking_extension.cc @@ -254,11 +254,8 @@ void OnMicroBenchmarkCompleted( scoped_ptr<V8ValueConverter> converter = make_scoped_ptr(V8ValueConverter::create()); v8::Handle<v8::Value> value = converter->ToV8Value(result.get(), context); -#ifdef WEB_FRAME_USES_V8_LOCAL - v8::Local<v8::Value> argv[] = {value}; -#else v8::Handle<v8::Value> argv[] = { value }; -#endif + frame->callFunctionEvenIfScriptDisabled( callback_and_context->GetCallback(), v8::Object::New(isolate), diff --git a/content/renderer/pepper/ppb_var_deprecated_impl.cc b/content/renderer/pepper/ppb_var_deprecated_impl.cc index 064aeb1..589981c 100644 --- a/content/renderer/pepper/ppb_var_deprecated_impl.cc +++ b/content/renderer/pepper/ppb_var_deprecated_impl.cc @@ -248,14 +248,8 @@ PP_Var CallDeprecatedInternal(PP_Var var, return PP_MakeUndefined(); } -#ifdef WEB_FRAME_USES_V8_LOCAL - scoped_ptr<v8::Local<v8::Value>[]> converted_args( - new v8::Local<v8::Value>[argc]); -#else scoped_ptr<v8::Handle<v8::Value>[] > converted_args( new v8::Handle<v8::Value>[argc]); -#endif - for (uint32_t i = 0; i < argc; ++i) { converted_args[i] = try_catch.ToV8(argv[i]); if (try_catch.HasException()) diff --git a/content/renderer/web_ui_runner.cc b/content/renderer/web_ui_runner.cc index 560342f..5d6f05c 100644 --- a/content/renderer/web_ui_runner.cc +++ b/content/renderer/web_ui_runner.cc @@ -45,14 +45,8 @@ 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, - cast_argv); + argv); } gin::ContextHolder* WebUIRunner::GetContextHolder() { diff --git a/content/shell/renderer/test_runner/accessibility_controller.cc b/content/shell/renderer/test_runner/accessibility_controller.cc index 4aafbed..678f56d 100644 --- a/content/shell/renderer/test_runner/accessibility_controller.cc +++ b/content/shell/renderer/test_runner/accessibility_controller.cc @@ -191,11 +191,7 @@ void AccessibilityController::NotificationReceived( return; // Call global notification listeners. -#ifdef WEB_FRAME_USES_V8_LOCAL - v8::Local<v8::Value> argv[] = { -#else v8::Handle<v8::Value> argv[] = { -#endif element_handle, v8::String::NewFromUtf8(isolate, notification_name.data(), v8::String::kNormalString, diff --git a/content/shell/renderer/test_runner/test_runner.cc b/content/shell/renderer/test_runner/test_runner.cc index ba78c8b..0d789cb 100644 --- a/content/shell/renderer/test_runner/test_runner.cc +++ b/content/shell/renderer/test_runner/test_runner.cc @@ -105,15 +105,9 @@ class InvokeCallbackTask : public WebMethodTask<TestRunner> { v8::Context::Scope context_scope(context); -#ifdef WEB_FRAME_USES_V8_LOCAL - scoped_ptr<v8::Local<v8::Value>[]> local_argv; - if (argc_) { - local_argv.reset(new v8::Local<v8::Value>[argc_]); -#else scoped_ptr<v8::Handle<v8::Value>[]> local_argv; if (argc_) { local_argv.reset(new v8::Handle<v8::Value>[argc_]); -#endif for (int i = 0; i < argc_; ++i) local_argv[i] = v8::Local<v8::Value>::New(isolate, argv_[i]); } diff --git a/content/shell/renderer/test_runner/web_ax_object_proxy.cc b/content/shell/renderer/test_runner/web_ax_object_proxy.cc index d209786..cdff16e 100644 --- a/content/shell/renderer/test_runner/web_ax_object_proxy.cc +++ b/content/shell/renderer/test_runner/web_ax_object_proxy.cc @@ -621,11 +621,7 @@ void WebAXObjectProxy::NotificationReceived( v8::Isolate* isolate = blink::mainThreadIsolate(); -#ifdef WEB_FRAME_USES_V8_LOCAL - v8::Local<v8::Value> argv[] = { -#else v8::Handle<v8::Value> argv[] = { -#endif v8::String::NewFromUtf8(isolate, notification_name.data(), v8::String::kNormalString, notification_name.size()), diff --git a/extensions/renderer/guest_view/mime_handler_view/mime_handler_view_container.cc b/extensions/renderer/guest_view/mime_handler_view/mime_handler_view_container.cc index 8394c35..d71d6a2 100644 --- a/extensions/renderer/guest_view/mime_handler_view/mime_handler_view_container.cc +++ b/extensions/renderer/guest_view/mime_handler_view/mime_handler_view_container.cc @@ -235,11 +235,7 @@ void MimeHandlerViewContainer::PostMessage(v8::Isolate* isolate, if (!window_object.Get(std::string(kPostMessageName), &post_message)) return; -#ifdef WEB_FRAME_USES_V8_LOCAL - v8::Local<v8::Value> args[] = { -#else v8::Handle<v8::Value> args[] = { -#endif message, // Post the message to any domain inside the browser plugin. The embedder // should already know what is embedded. diff --git a/extensions/renderer/script_context.cc b/extensions/renderer/script_context.cc index 8104fa0..9ed4c23 100644 --- a/extensions/renderer/script_context.cc +++ b/extensions/renderer/script_context.cc @@ -188,19 +188,12 @@ 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, call_args))); + function, global, argc, argv))); } Feature::Availability ScriptContext::GetAvailability( |