diff options
| author | Ben Murdoch <benm@google.com> | 2011-12-02 17:19:32 +0000 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2011-12-02 17:27:49 +0000 |
| commit | 3fb3ca8c7ca439d408449a395897395c0faae8d1 (patch) | |
| tree | 5cb33db083ae7ebe431e2a460fb3806c54531f9c /src/debug.h | |
| parent | 257744e915dfc84d6d07a6b2accf8402d9ffc708 (diff) | |
| download | android_external_v8-3fb3ca8c7ca439d408449a395897395c0faae8d1.tar.gz android_external_v8-3fb3ca8c7ca439d408449a395897395c0faae8d1.tar.bz2 android_external_v8-3fb3ca8c7ca439d408449a395897395c0faae8d1.zip | |
Upgrade to V8 3.4
Merge 3.4.14.35
Simple merge required updates to makefiles only.
Bug: 568872
Change-Id: I403a38452c547e06fcfa951c12eca12a1bc40978
Diffstat (limited to 'src/debug.h')
| -rw-r--r-- | src/debug.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/debug.h b/src/debug.h index 95dca729..c614844a 100644 --- a/src/debug.h +++ b/src/debug.h @@ -1,4 +1,4 @@ -// Copyright 2006-2008 the V8 project authors. All rights reserved. +// Copyright 2011 the V8 project authors. All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions are // met: @@ -35,6 +35,7 @@ #include "execution.h" #include "factory.h" #include "flags.h" +#include "frames-inl.h" #include "hashmap.h" #include "platform.h" #include "string-stream.h" @@ -678,13 +679,14 @@ class MessageDispatchHelperThread; // Mutex to CommandMessageQueue. Includes logging of all puts and gets. class LockingCommandMessageQueue BASE_EMBEDDED { public: - explicit LockingCommandMessageQueue(int size); + LockingCommandMessageQueue(Logger* logger, int size); ~LockingCommandMessageQueue(); bool IsEmpty() const; CommandMessage Get(); void Put(const CommandMessage& message); void Clear(); private: + Logger* logger_; CommandMessageQueue queue_; Mutex* lock_; DISALLOW_COPY_AND_ASSIGN(LockingCommandMessageQueue); @@ -811,7 +813,7 @@ class Debugger { bool IsDebuggerActive(); private: - Debugger(); + explicit Debugger(Isolate* isolate); void CallEventCallback(v8::DebugEvent event, Handle<Object> exec_state, |