| Index: third_party/WebKit/Source/platform/v8_inspector/public/V8DebuggerClient.h
|
| diff --git a/third_party/WebKit/Source/platform/v8_inspector/public/V8DebuggerClient.h b/third_party/WebKit/Source/platform/v8_inspector/public/V8DebuggerClient.h
|
| index e927d4cc664c81e9da5359e200f8cce2c011931f..4e84d6ce0e53c29782a62a1e68725d4e53042c0f 100644
|
| --- a/third_party/WebKit/Source/platform/v8_inspector/public/V8DebuggerClient.h
|
| +++ b/third_party/WebKit/Source/platform/v8_inspector/public/V8DebuggerClient.h
|
| @@ -6,8 +6,7 @@
|
| #define V8DebuggerClient_h
|
|
|
| #include "platform/inspector_protocol/Platform.h"
|
| -#include "platform/v8_inspector/public/ConsoleAPITypes.h"
|
| -#include "platform/v8_inspector/public/ConsoleTypes.h"
|
| +#include "platform/v8_inspector/public/V8ConsoleTypes.h"
|
| #include "platform/v8_inspector/public/V8ContextInfo.h"
|
|
|
| #include <v8.h>
|
| @@ -21,8 +20,6 @@ public:
|
| virtual void quitMessageLoopOnPause() = 0;
|
| virtual void muteWarningsAndDeprecations() = 0;
|
| virtual void unmuteWarningsAndDeprecations() = 0;
|
| - virtual void muteConsole() = 0;
|
| - virtual void unmuteConsole() = 0;
|
| virtual void beginUserGesture() = 0;
|
| virtual void endUserGesture() = 0;
|
| virtual bool callingContextCanAccessContext(v8::Local<v8::Context> calling, v8::Local<v8::Context> target) = 0;
|
| @@ -30,15 +27,16 @@ public:
|
| virtual bool formatAccessorsAsProperties(v8::Local<v8::Value>) = 0;
|
| virtual bool isExecutionAllowed() = 0;
|
| virtual double currentTimeMS() = 0;
|
| - virtual int ensureDefaultContextInGroup(int contextGroupId) = 0;
|
| + virtual v8::Local<v8::Context> ensureDefaultContextInGroup(int contextGroupId) = 0;
|
| virtual bool isInspectableHeapObject(v8::Local<v8::Object>) = 0;
|
|
|
| virtual void installAdditionalCommandLineAPI(v8::Local<v8::Context>, v8::Local<v8::Object>) = 0;
|
| - virtual void reportMessageToConsole(v8::Local<v8::Context>, MessageType, MessageLevel, const String16& message, const v8::FunctionCallbackInfo<v8::Value>* arguments, unsigned skipArgumentCount) = 0;
|
|
|
| virtual void consoleTime(const String16& title) = 0;
|
| virtual void consoleTimeEnd(const String16& title) = 0;
|
| virtual void consoleTimeStamp(const String16& title) = 0;
|
| + // TODO(dgozman: route all messages through here, remove FrameConsole.
|
| + virtual void messageAddedToConsole(int contextGroupId, MessageSource, MessageLevel, const String16& message, const String16& url, unsigned lineNumber, unsigned columnNumber, V8StackTrace*) = 0;
|
|
|
| virtual v8::MaybeLocal<v8::Value> memoryInfo(v8::Isolate*, v8::Local<v8::Context>) = 0;
|
|
|
|
|