From 581222c25bb9b1c435be50bb9d434bef564f02c5 Mon Sep 17 00:00:00 2001 From: dcarney Date: Thu, 23 Apr 2015 01:43:56 -0700 Subject: Revert of update chrome to handle temporary WEB_FRAME_USES_V8_LOCAL condition (patchset #1 id:1 of https://codereview.chromium.org/1095463003/) Reason for revert: this cl was just a temporary bridge and is no longer needed Original issue's description: > update chrome to handle temporary WEB_FRAME_USES_V8_LOCAL condition > > note: this cl will be reverted once v8::Local is aliased to v8::Handle > > TBR=kalman@chromium.org > BUG= > > Committed: https://crrev.com/dd8fc1ebd8763c1a7a93dcf54417eb5aba4599cb > Cr-Commit-Position: refs/heads/master@{#325417} TBR=jochen@chromium.org,kalman@chromium.org BUG= Review URL: https://codereview.chromium.org/1094393003 Cr-Commit-Position: refs/heads/master@{#326477} --- .../guest_view/mime_handler_view/mime_handler_view_container.cc | 4 ---- extensions/renderer/script_context.cc | 9 +-------- 2 files changed, 1 insertion(+), 12 deletions(-) (limited to 'extensions') 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 args[] = { -#else v8::Handle 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 ScriptContext::CallFunction( v8::Local(v8::Undefined(isolate()))); } -#ifdef WEB_FRAME_USES_V8_LOCAL - v8::Local* call_args = - reinterpret_cast*>(argv); -#else - v8::Handle* call_args = argv; -#endif - v8::Handle global = v8_context()->Global(); if (!web_frame_) return handle_scope.Escape(function->Call(global, argc, argv)); return handle_scope.Escape( v8::Local(web_frame_->callFunctionEvenIfScriptDisabled( - function, global, argc, call_args))); + function, global, argc, argv))); } Feature::Availability ScriptContext::GetAvailability( -- cgit v1.1