diff options
| author | dcarney <dcarney@chromium.org> | 2015-04-23 01:43:56 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-04-23 08:44:20 +0000 |
| commit | 581222c25bb9b1c435be50bb9d434bef564f02c5 (patch) | |
| tree | 50df9fc84f1b46755b02baf49fb93918b84cbd0e /extensions | |
| parent | 7da08ce558969cb4797baacd308d8b6fe12ff1e8 (diff) | |
| download | chromium_src-581222c25bb9b1c435be50bb9d434bef564f02c5.zip chromium_src-581222c25bb9b1c435be50bb9d434bef564f02c5.tar.gz chromium_src-581222c25bb9b1c435be50bb9d434bef564f02c5.tar.bz2 | |
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}
Diffstat (limited to 'extensions')
| -rw-r--r-- | extensions/renderer/guest_view/mime_handler_view/mime_handler_view_container.cc | 4 | ||||
| -rw-r--r-- | extensions/renderer/script_context.cc | 9 |
2 files changed, 1 insertions, 12 deletions
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( |