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

Unified Diff: src/d8-debug.cc

Issue 1239053004: Make d8 stop using to-be-deprecated APIs (Closed) Base URL: https://chromium.googlesource.com/v8/v8.git@master
Patch Set: updates Created 5 years, 5 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 | « src/d8.gyp ('k') | src/d8-posix.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/d8-debug.cc
diff --git a/src/d8-debug.cc b/src/d8-debug.cc
index a356bd4b4e36cd80976b8d77e25774784c159f55..e0090bbb611abfaf40f44572c89eab1b8e9a56d4 100644
--- a/src/d8-debug.cc
+++ b/src/d8-debug.cc
@@ -29,24 +29,30 @@ void HandleDebugEvent(const Debug::EventDetails& event_details) {
// Get the toJSONProtocol function on the event and get the JSON format.
Local<String> to_json_fun_name =
- String::NewFromUtf8(isolate, "toJSONProtocol");
- Handle<Object> event_data = event_details.GetEventData();
+ String::NewFromUtf8(isolate, "toJSONProtocol", NewStringType::kNormal)
+ .ToLocalChecked();
+ Local<Object> event_data = event_details.GetEventData();
Local<Function> to_json_fun =
- Local<Function>::Cast(event_data->Get(to_json_fun_name));
- Local<Value> event_json = to_json_fun->Call(event_data, 0, NULL);
- if (try_catch.HasCaught()) {
+ Local<Function>::Cast(event_data->Get(isolate->GetCurrentContext(),
+ to_json_fun_name).ToLocalChecked());
+ Local<Value> event_json;
+ if (!to_json_fun->Call(isolate->GetCurrentContext(), event_data, 0, NULL)
+ .ToLocal(&event_json)) {
Shell::ReportException(isolate, &try_catch);
return;
}
// Print the event details.
- Handle<Object> details =
- Shell::DebugMessageDetails(isolate, Handle<String>::Cast(event_json));
+ Local<Object> details =
+ Shell::DebugMessageDetails(isolate, Local<String>::Cast(event_json));
if (try_catch.HasCaught()) {
Shell::ReportException(isolate, &try_catch);
return;
}
- String::Utf8Value str(details->Get(String::NewFromUtf8(isolate, "text")));
+ String::Utf8Value str(
+ details->Get(isolate->GetCurrentContext(),
+ String::NewFromUtf8(isolate, "text", NewStringType::kNormal)
+ .ToLocalChecked()).ToLocalChecked());
if (str.length() == 0) {
// Empty string is used to signal not to process this event.
return;
@@ -55,15 +61,18 @@ void HandleDebugEvent(const Debug::EventDetails& event_details) {
// Get the debug command processor.
Local<String> fun_name =
- String::NewFromUtf8(isolate, "debugCommandProcessor");
- Handle<Object> exec_state = event_details.GetExecutionState();
- Local<Function> fun = Local<Function>::Cast(exec_state->Get(fun_name));
- Local<Object> cmd_processor =
- Local<Object>::Cast(fun->Call(exec_state, 0, NULL));
- if (try_catch.HasCaught()) {
+ String::NewFromUtf8(isolate, "debugCommandProcessor",
+ NewStringType::kNormal).ToLocalChecked();
+ Local<Object> exec_state = event_details.GetExecutionState();
+ Local<Function> fun = Local<Function>::Cast(
+ exec_state->Get(isolate->GetCurrentContext(), fun_name).ToLocalChecked());
+ Local<Value> cmd_processor_value;
+ if (!fun->Call(isolate->GetCurrentContext(), exec_state, 0, NULL)
+ .ToLocal(&cmd_processor_value)) {
Shell::ReportException(isolate, &try_catch);
return;
}
+ Local<Object> cmd_processor = Local<Object>::Cast(cmd_processor_value);
static const int kBufferSize = 256;
bool running = false;
@@ -79,8 +88,9 @@ void HandleDebugEvent(const Debug::EventDetails& event_details) {
TryCatch try_catch(isolate);
// Convert the debugger command to a JSON debugger request.
- Handle<Value> request = Shell::DebugCommandToJSONRequest(
- isolate, String::NewFromUtf8(isolate, command));
+ Local<Value> request = Shell::DebugCommandToJSONRequest(
+ isolate, String::NewFromUtf8(isolate, command, NewStringType::kNormal)
+ .ToLocalChecked());
if (try_catch.HasCaught()) {
Shell::ReportException(isolate, &try_catch);
continue;
@@ -92,39 +102,50 @@ void HandleDebugEvent(const Debug::EventDetails& event_details) {
continue;
}
- Handle<String> fun_name;
- Handle<Function> fun;
+ Local<String> fun_name;
+ Local<Function> fun;
// All the functions used below take one argument.
static const int kArgc = 1;
- Handle<Value> args[kArgc];
+ Local<Value> args[kArgc];
// Invoke the JavaScript to convert the debug command line to a JSON
// request, invoke the JSON request and convert the JSON respose to a text
// representation.
- fun_name = String::NewFromUtf8(isolate, "processDebugRequest");
- fun = Handle<Function>::Cast(cmd_processor->Get(fun_name));
+ fun_name = String::NewFromUtf8(isolate, "processDebugRequest",
+ NewStringType::kNormal).ToLocalChecked();
+ fun = Local<Function>::Cast(cmd_processor->Get(isolate->GetCurrentContext(),
+ fun_name).ToLocalChecked());
args[0] = request;
- Handle<Value> response_val = fun->Call(cmd_processor, kArgc, args);
- if (try_catch.HasCaught()) {
+ Local<Value> response_val;
+ if (!fun->Call(isolate->GetCurrentContext(), cmd_processor, kArgc, args)
+ .ToLocal(&response_val)) {
Shell::ReportException(isolate, &try_catch);
continue;
}
- Handle<String> response = Handle<String>::Cast(response_val);
+ Local<String> response = Local<String>::Cast(response_val);
// Convert the debugger response into text details and the running state.
- Handle<Object> response_details =
+ Local<Object> response_details =
Shell::DebugMessageDetails(isolate, response);
if (try_catch.HasCaught()) {
Shell::ReportException(isolate, &try_catch);
continue;
}
String::Utf8Value text_str(
- response_details->Get(String::NewFromUtf8(isolate, "text")));
+ response_details->Get(isolate->GetCurrentContext(),
+ String::NewFromUtf8(isolate, "text",
+ NewStringType::kNormal)
+ .ToLocalChecked()).ToLocalChecked());
if (text_str.length() > 0) {
printf("%s\n", *text_str);
}
- running = response_details->Get(String::NewFromUtf8(isolate, "running"))
- ->ToBoolean(isolate)
+ running = response_details->Get(isolate->GetCurrentContext(),
+ String::NewFromUtf8(isolate, "running",
+ NewStringType::kNormal)
+ .ToLocalChecked())
+ .ToLocalChecked()
+ ->ToBoolean(isolate->GetCurrentContext())
+ .ToLocalChecked()
->Value();
}
}
« no previous file with comments | « src/d8.gyp ('k') | src/d8-posix.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698