Commit a7b3d8f9 authored by Peter Marshall's avatar Peter Marshall Committed by Commit Bot

[inspector] Name callback functions more descriptively

Change-Id: I37e241d9c62f1a7fed438ee8717f02f5b4f51bea
Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/2253846
Commit-Queue: Peter Marshall <petermarshall@chromium.org>
Commit-Queue: Simon Zünd <szuend@chromium.org>
Auto-Submit: Peter Marshall <petermarshall@chromium.org>
Reviewed-by: 's avatarSimon Zünd <szuend@chromium.org>
Cr-Commit-Position: refs/heads/master@{#68435}
parent 9f60cf68
...@@ -111,10 +111,11 @@ std::vector<uint16_t> ToVector(const v8_inspector::StringView& string) { ...@@ -111,10 +111,11 @@ std::vector<uint16_t> ToVector(const v8_inspector::StringView& string) {
class FrontendChannelImpl : public v8_inspector::V8Inspector::Channel { class FrontendChannelImpl : public v8_inspector::V8Inspector::Channel {
public: public:
FrontendChannelImpl(TaskRunner* task_runner, int context_group_id, FrontendChannelImpl(TaskRunner* task_runner, int context_group_id,
v8::Isolate* isolate, v8::Local<v8::Function> function) v8::Isolate* isolate,
v8::Local<v8::Function> dispatch_message_callback)
: task_runner_(task_runner), : task_runner_(task_runner),
context_group_id_(context_group_id), context_group_id_(context_group_id),
function_(isolate, function) {} dispatch_message_callback_(isolate, dispatch_message_callback) {}
~FrontendChannelImpl() override = default; ~FrontendChannelImpl() override = default;
void set_session_id(int session_id) { session_id_ = session_id; } void set_session_id(int session_id) { session_id_ = session_id; }
...@@ -151,7 +152,7 @@ class FrontendChannelImpl : public v8_inspector::V8Inspector::Channel { ...@@ -151,7 +152,7 @@ class FrontendChannelImpl : public v8_inspector::V8Inspector::Channel {
v8::Context::Scope context_scope(context); v8::Context::Scope context_scope(context);
v8::Local<v8::Value> message = ToV8String(data->isolate(), message_); v8::Local<v8::Value> message = ToV8String(data->isolate(), message_);
v8::MaybeLocal<v8::Value> result; v8::MaybeLocal<v8::Value> result;
result = channel_->function_.Get(data->isolate()) result = channel_->dispatch_message_callback_.Get(data->isolate())
->Call(context, context->Global(), 1, &message); ->Call(context, context->Global(), 1, &message);
} }
FrontendChannelImpl* channel_; FrontendChannelImpl* channel_;
...@@ -160,7 +161,7 @@ class FrontendChannelImpl : public v8_inspector::V8Inspector::Channel { ...@@ -160,7 +161,7 @@ class FrontendChannelImpl : public v8_inspector::V8Inspector::Channel {
TaskRunner* task_runner_; TaskRunner* task_runner_;
int context_group_id_; int context_group_id_;
v8::Global<v8::Function> function_; v8::Global<v8::Function> dispatch_message_callback_;
int session_id_; int session_id_;
DISALLOW_COPY_AND_ASSIGN(FrontendChannelImpl); DISALLOW_COPY_AND_ASSIGN(FrontendChannelImpl);
}; };
...@@ -636,8 +637,8 @@ std::map<int, std::unique_ptr<FrontendChannelImpl>> UtilsExtension::channels_; ...@@ -636,8 +637,8 @@ std::map<int, std::unique_ptr<FrontendChannelImpl>> UtilsExtension::channels_;
class SetTimeoutTask : public TaskRunner::Task { class SetTimeoutTask : public TaskRunner::Task {
public: public:
SetTimeoutTask(int context_group_id, v8::Isolate* isolate, SetTimeoutTask(int context_group_id, v8::Isolate* isolate,
v8::Local<v8::Function> function) v8::Local<v8::Function> callback)
: function_(isolate, function), context_group_id_(context_group_id) {} : callback_(isolate, callback), context_group_id_(context_group_id) {}
~SetTimeoutTask() override = default; ~SetTimeoutTask() override = default;
bool is_priority_task() final { return false; } bool is_priority_task() final { return false; }
...@@ -649,12 +650,12 @@ class SetTimeoutTask : public TaskRunner::Task { ...@@ -649,12 +650,12 @@ class SetTimeoutTask : public TaskRunner::Task {
v8::Local<v8::Context> context = data->GetContext(context_group_id_); v8::Local<v8::Context> context = data->GetContext(context_group_id_);
v8::Context::Scope context_scope(context); v8::Context::Scope context_scope(context);
v8::Local<v8::Function> function = function_.Get(data->isolate()); v8::Local<v8::Function> callback = callback_.Get(data->isolate());
v8::MaybeLocal<v8::Value> result; v8::MaybeLocal<v8::Value> result;
result = function->Call(context, context->Global(), 0, nullptr); result = callback->Call(context, context->Global(), 0, nullptr);
} }
v8::Global<v8::Function> function_; v8::Global<v8::Function> callback_;
int context_group_id_; int context_group_id_;
}; };
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment