Reviewers: ,
Message:
Committed patchset #1 manually as r15735 (presubmit successful).
Description:
Revert "Deprecate some debugger methods"
This reverts commit 69957c36edaebe0b9b614099eb1b067fb0208671. Blink roll
this
patch depends on was reverted for some reason.
BUG=None
[email protected]
Committed: https://code.google.com/p/v8/source/detail?r=15735
Please review this at https://codereview.chromium.org/19483003/
SVN Base: https://v8.googlecode.com/svn/branches/bleeding_edge
Affected files:
M include/v8-debug.h
M src/d8-debug.h
M src/d8-debug.cc
M src/d8.cc
M test/cctest/test-debug.cc
Index: include/v8-debug.h
diff --git a/include/v8-debug.h b/include/v8-debug.h
index
e488aaa8891e707cd4cb61a5e48bca121e073095..f432de0be85f7d17a433fbc754a39265b4d1efc2
100755
--- a/include/v8-debug.h
+++ b/include/v8-debug.h
@@ -245,9 +245,8 @@ class EXPORT Debug {
typedef void (*DebugMessageDispatchHandler)();
// Set a C debug event listener.
- V8_DEPRECATED(static bool SetDebugEventListener(
- EventCallback that,
- Handle<Value> data = Handle<Value>()));
+ static bool SetDebugEventListener(EventCallback that,
+ Handle<Value> data = Handle<Value>());
static bool SetDebugEventListener2(EventCallback2 that,
Handle<Value> data = Handle<Value>());
@@ -275,9 +274,8 @@ class EXPORT Debug {
// Message based interface. The message protocol is JSON. NOTE the
message
// handler thread is not supported any more parameter must be false.
- V8_DEPRECATED(static void SetMessageHandler(
- MessageHandler handler,
- bool message_handler_thread = false));
+ static void SetMessageHandler(MessageHandler handler,
+ bool message_handler_thread = false);
static void SetMessageHandler2(MessageHandler2 handler);
// If no isolate is provided the default isolate is
Index: src/d8-debug.cc
diff --git a/src/d8-debug.cc b/src/d8-debug.cc
index
9a72518f4cbe2b28493668fee394d795317d16d9..aac7aab156d6745fba4a2c85b6763e2eee9a6cbe
100644
--- a/src/d8-debug.cc
+++ b/src/d8-debug.cc
@@ -50,12 +50,14 @@ void PrintPrompt() {
}
-void HandleDebugEvent(const Debug::EventDetails& event_details) {
+void HandleDebugEvent(DebugEvent event,
+ Handle<Object> exec_state,
+ Handle<Object> event_data,
+ Handle<Value> data) {
// TODO(svenpanne) There should be a way to retrieve this in the
callback.
Isolate* isolate = Isolate::GetCurrent();
HandleScope scope(isolate);
- DebugEvent event = event_details.GetEvent();
// Check for handled event.
if (event != Break && event != Exception && event != AfterCompile) {
return;
@@ -65,7 +67,6 @@ 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::New("toJSONProtocol");
- Handle<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);
@@ -90,7 +91,6 @@ void HandleDebugEvent(const Debug::EventDetails&
event_details) {
// Get the debug command processor.
Local<String> fun_name = String::New("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));
Index: src/d8-debug.h
diff --git a/src/d8-debug.h b/src/d8-debug.h
index
2386b6bd6c4690a9f8c37d7f1ac08977a6ef0db0..a6cea2a81bdb7a007fcac73ef16ffcb8084ff4eb
100644
--- a/src/d8-debug.h
+++ b/src/d8-debug.h
@@ -36,7 +36,10 @@
namespace v8 {
-void HandleDebugEvent(const Debug::EventDetails& event_details);
+void HandleDebugEvent(DebugEvent event,
+ Handle<Object> exec_state,
+ Handle<Object> event_data,
+ Handle<Value> data);
// Start the remove debugger connecting to a V8 debugger agent on the
specified
// port.
Index: src/d8.cc
diff --git a/src/d8.cc b/src/d8.cc
index
e576e9cb3708e1c096ec52a5ecbdffb7b9bae436..3ac8db09625b76b67dcaefc59b0901c91c815911
100644
--- a/src/d8.cc
+++ b/src/d8.cc
@@ -810,7 +810,7 @@ void Shell::InstallUtilityScript(Isolate* isolate) {
#ifdef ENABLE_DEBUGGER_SUPPORT
// Start the in-process debugger if requested.
if (i::FLAG_debugger && !i::FLAG_debugger_agent) {
- v8::Debug::SetDebugEventListener2(HandleDebugEvent);
+ v8::Debug::SetDebugEventListener(HandleDebugEvent);
}
#endif // ENABLE_DEBUGGER_SUPPORT
}
Index: test/cctest/test-debug.cc
diff --git a/test/cctest/test-debug.cc b/test/cctest/test-debug.cc
index
484eb8e3fb1aabef97521f31bbb3dc113e3fd0ac..0f31c14ad6d0767d165bd2c45fb456b66a4c0592
100644
--- a/test/cctest/test-debug.cc
+++ b/test/cctest/test-debug.cc
@@ -29,7 +29,6 @@
#include <stdlib.h>
-#define V8_DISABLE_DEPRECATIONS 1
#include "v8.h"
#include "api.h"
@@ -40,7 +39,6 @@
#include "platform.h"
#include "stub-cache.h"
#include "utils.h"
-#undef V8_DISABLE_DEPRECATIONS
using ::v8::internal::EmbeddedVector;
--
--
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev
---
You received this message because you are subscribed to the Google Groups "v8-dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
For more options, visit https://groups.google.com/groups/opt_out.
