Skip to content

V
V8
Commit 908cd381 authored by kozyatinskiy's avatar kozyatinskiy Committed by Commit bot
Browse files
Options

[inspector] console get all information from inspector when needed 

With this CL we don't need to store reference to InspectedContext inside of JavaScript console object and able to get all required information from callback data.
It allows us to implement console methods without taking in account how and where we create and store these methods:
- later we can move console object implementation to builtins..
- ..and install command line API methods smarter.

BUG=chromium:588893
R=dgozman@chromium.org

Review-Url: https://codereview.chromium.org/2784713002
Cr-Commit-Position: refs/heads/master@{#44212}
parent 4e3f4b2d
Hide whitespace changes
Inline Side-by-side
Showing with 963 additions and 271 deletions
src/inspector/inspected-context.cc
View file @ 908cd381
...@@ -14,23 +14,6 @@ ...@@ -14,23 +14,6 @@
namespace v8_inspector { namespace v8_inspector {
namespace {
void clearContext(const v8::WeakCallbackInfo<v8::Global<v8::Context>>& data) {
// Inspected context is created in V8InspectorImpl::contextCreated method
// and destroyed in V8InspectorImpl::contextDestroyed.
// Both methods takes valid v8::Local<v8::Context> handle to the same context,
// it means that context is created before InspectedContext constructor and is
// always destroyed after InspectedContext destructor therefore this callback
// should be never called.
// It's possible only if inspector client doesn't call contextDestroyed which
// is considered an error.
CHECK(false);
data.GetParameter()->Reset();
}
} // namespace
InspectedContext::InspectedContext(V8InspectorImpl* inspector, InspectedContext::InspectedContext(V8InspectorImpl* inspector,
const V8ContextInfo& info, int contextId) const V8ContextInfo& info, int contextId)
: m_inspector(inspector), : m_inspector(inspector),
...@@ -44,27 +27,18 @@ InspectedContext::InspectedContext(V8InspectorImpl* inspector, ...@@ -44,27 +27,18 @@ InspectedContext::InspectedContext(V8InspectorImpl* inspector,
v8::Isolate* isolate = m_inspector->isolate(); v8::Isolate* isolate = m_inspector->isolate();
info.context->SetEmbedderData(static_cast<int>(v8::Context::kDebugIdIndex), info.context->SetEmbedderData(static_cast<int>(v8::Context::kDebugIdIndex),
v8::Int32::New(isolate, contextId)); v8::Int32::New(isolate, contextId));
m_context.SetWeak(&m_context, &clearContext,
v8::WeakCallbackType::kParameter);
v8::Local<v8::Object> global = info.context->Global(); v8::Local<v8::Object> global = info.context->Global();
v8::Local<v8::Object> console = v8::Local<v8::Object> console =
V8Console::createConsole(this, info.hasMemoryOnConsole); V8Console::createConsole(this, info.hasMemoryOnConsole);
if (!global if (!global
->Set(info.context, toV8StringInternalized(isolate, "console"), ->Set(info.context, toV8StringInternalized(isolate, "console"),
console) console)
.FromMaybe(false)) .FromMaybe(false)) {
return; return;
m_console.Reset(isolate, console); }
m_console.SetWeak();
} }
InspectedContext::~InspectedContext() { InspectedContext::~InspectedContext() {
if (!m_console.IsEmpty()) {
v8::HandleScope scope(isolate());
V8Console::clearInspectedContextIfNeeded(context(),
m_console.Get(isolate()));
}
} }
// static // static
......
src/inspector/inspected-context.h
View file @ 908cd381
...@@ -53,7 +53,6 @@ class InspectedContext { ...@@ -53,7 +53,6 @@ class InspectedContext {
const String16 m_auxData; const String16 m_auxData;
bool m_reported; bool m_reported;
std::unique_ptr<InjectedScript> m_injectedScript; std::unique_ptr<InjectedScript> m_injectedScript;
v8::Global<v8::Object> m_console;
DISALLOW_COPY_AND_ASSIGN(InspectedContext); DISALLOW_COPY_AND_ASSIGN(InspectedContext);
}; };
......
src/inspector/v8-console-message.cc
View file @ 908cd381
...@@ -353,15 +353,11 @@ ConsoleAPIType V8ConsoleMessage::type() const { return m_type; } ...@@ -353,15 +353,11 @@ ConsoleAPIType V8ConsoleMessage::type() const { return m_type; }
// static // static
std::unique_ptr<V8ConsoleMessage> V8ConsoleMessage::createForConsoleAPI( std::unique_ptr<V8ConsoleMessage> V8ConsoleMessage::createForConsoleAPI(
double timestamp, ConsoleAPIType type, v8::Local<v8::Context> v8Context, int contextId, int groupId,
V8InspectorImpl* inspector, double timestamp, ConsoleAPIType type,
const std::vector<v8::Local<v8::Value>>& arguments, const std::vector<v8::Local<v8::Value>>& arguments,
std::unique_ptr<V8StackTraceImpl> stackTrace, std::unique_ptr<V8StackTraceImpl> stackTrace) {
InspectedContext* inspectedContext) { v8::Isolate* isolate = v8Context->GetIsolate();
v8::Isolate* isolate = inspectedContext->isolate();
int contextId = inspectedContext->contextId();
int contextGroupId = inspectedContext->contextGroupId();
V8InspectorImpl* inspector = inspectedContext->inspector();
v8::Local<v8::Context> context = inspectedContext->context();
std::unique_ptr<V8ConsoleMessage> message( std::unique_ptr<V8ConsoleMessage> message(
new V8ConsoleMessage(V8MessageOrigin::kConsole, timestamp, String16())); new V8ConsoleMessage(V8MessageOrigin::kConsole, timestamp, String16()));
...@@ -380,7 +376,8 @@ std::unique_ptr<V8ConsoleMessage> V8ConsoleMessage::createForConsoleAPI( ...@@ -380,7 +376,8 @@ std::unique_ptr<V8ConsoleMessage> V8ConsoleMessage::createForConsoleAPI(
v8::debug::EstimatedValueSize(isolate, arguments.at(i)); v8::debug::EstimatedValueSize(isolate, arguments.at(i));
} }
if (arguments.size()) if (arguments.size())
message->m_message = V8ValueStringBuilder::toString(arguments[0], context); message->m_message =
V8ValueStringBuilder::toString(arguments[0], v8Context);
v8::Isolate::MessageErrorLevel clientLevel = v8::Isolate::kMessageInfo; v8::Isolate::MessageErrorLevel clientLevel = v8::Isolate::kMessageInfo;
if (type == ConsoleAPIType::kDebug || type == ConsoleAPIType::kCount || if (type == ConsoleAPIType::kDebug || type == ConsoleAPIType::kCount ||
...@@ -397,7 +394,7 @@ std::unique_ptr<V8ConsoleMessage> V8ConsoleMessage::createForConsoleAPI( ...@@ -397,7 +394,7 @@ std::unique_ptr<V8ConsoleMessage> V8ConsoleMessage::createForConsoleAPI(
if (type != ConsoleAPIType::kClear) { if (type != ConsoleAPIType::kClear) {
inspector->client()->consoleAPIMessage( inspector->client()->consoleAPIMessage(
contextGroupId, clientLevel, toStringView(message->m_message), groupId, clientLevel, toStringView(message->m_message),
toStringView(message->m_url), message->m_lineNumber, toStringView(message->m_url), message->m_lineNumber,
message->m_columnNumber, message->m_stackTrace.get()); message->m_columnNumber, message->m_stackTrace.get());
} }
...@@ -490,8 +487,37 @@ void V8ConsoleMessageStorage::clear() { ...@@ -490,8 +487,37 @@ void V8ConsoleMessageStorage::clear() {
m_messages.clear(); m_messages.clear();
m_estimatedSize = 0; m_estimatedSize = 0;
if (V8InspectorSessionImpl* session = if (V8InspectorSessionImpl* session =
m_inspector->sessionForContextGroup(m_contextGroupId)) m_inspector->sessionForContextGroup(m_contextGroupId)) {
session->releaseObjectGroup("console"); session->releaseObjectGroup("console");
}
m_data.clear();
}
bool V8ConsoleMessageStorage::shouldReportDeprecationMessage(
int contextId, const String16& method) {
std::set<String16>& reportedDeprecationMessages =
m_data[contextId].m_reportedDeprecationMessages;
auto it = reportedDeprecationMessages.find(method);
if (it != reportedDeprecationMessages.end()) return false;
reportedDeprecationMessages.insert(it, method);
return true;
}
int V8ConsoleMessageStorage::count(int contextId, const String16& id) {
return ++m_data[contextId].m_count[id];
}
void V8ConsoleMessageStorage::time(int contextId, const String16& id) {
m_data[contextId].m_time[id] = m_inspector->client()->currentTimeMS();
}
double V8ConsoleMessageStorage::timeEnd(int contextId, const String16& id) {
std::map<String16, double>& time = m_data[contextId].m_time;
auto it = time.find(id);
if (it == time.end()) return 0.0;
double elapsed = m_inspector->client()->currentTimeMS() - it->second;
time.erase(it);
return elapsed;
} }
void V8ConsoleMessageStorage::contextDestroyed(int contextId) { void V8ConsoleMessageStorage::contextDestroyed(int contextId) {
...@@ -500,6 +526,8 @@ void V8ConsoleMessageStorage::contextDestroyed(int contextId) { ...@@ -500,6 +526,8 @@ void V8ConsoleMessageStorage::contextDestroyed(int contextId) {
m_messages[i]->contextDestroyed(contextId); m_messages[i]->contextDestroyed(contextId);
m_estimatedSize += m_messages[i]->estimatedSize(); m_estimatedSize += m_messages[i]->estimatedSize();
} }
auto it = m_data.find(contextId);
if (it != m_data.end()) m_data.erase(contextId);
} }
} // namespace v8_inspector } // namespace v8_inspector
src/inspector/v8-console-message.h
View file @ 908cd381
...@@ -6,6 +6,8 @@ ...@@ -6,6 +6,8 @@
#define V8_INSPECTOR_V8CONSOLEMESSAGE_H_ #define V8_INSPECTOR_V8CONSOLEMESSAGE_H_
#include <deque> #include <deque>
#include <map>
#include <set>
#include "include/v8.h" #include "include/v8.h"
#include "src/inspector/protocol/Console.h" #include "src/inspector/protocol/Console.h"
#include "src/inspector/protocol/Forward.h" #include "src/inspector/protocol/Forward.h"
...@@ -44,9 +46,10 @@ class V8ConsoleMessage { ...@@ -44,9 +46,10 @@ class V8ConsoleMessage {
~V8ConsoleMessage(); ~V8ConsoleMessage();
static std::unique_ptr<V8ConsoleMessage> createForConsoleAPI( static std::unique_ptr<V8ConsoleMessage> createForConsoleAPI(
double timestamp, ConsoleAPIType, v8::Local<v8::Context> v8Context, int contextId, int groupId,
V8InspectorImpl* inspector, double timestamp, ConsoleAPIType,
const std::vector<v8::Local<v8::Value>>& arguments, const std::vector<v8::Local<v8::Value>>& arguments,
std::unique_ptr<V8StackTraceImpl>, InspectedContext*); std::unique_ptr<V8StackTraceImpl>);
static std::unique_ptr<V8ConsoleMessage> createForException( static std::unique_ptr<V8ConsoleMessage> createForException(
double timestamp, const String16& detailedMessage, const String16& url, double timestamp, const String16& detailedMessage, const String16& url,
...@@ -112,11 +115,23 @@ class V8ConsoleMessageStorage { ...@@ -112,11 +115,23 @@ class V8ConsoleMessageStorage {
void contextDestroyed(int contextId); void contextDestroyed(int contextId);
void clear(); void clear();
bool shouldReportDeprecationMessage(int contextId, const String16& method);
int count(int contextId, const String16& id);
void time(int contextId, const String16& id);
double timeEnd(int contextId, const String16& id);
private: private:
V8InspectorImpl* m_inspector; V8InspectorImpl* m_inspector;
int m_contextGroupId; int m_contextGroupId;
int m_estimatedSize = 0; int m_estimatedSize = 0;
std::deque<std::unique_ptr<V8ConsoleMessage>> m_messages; std::deque<std::unique_ptr<V8ConsoleMessage>> m_messages;
struct PerContextData {
std::set<String16> m_reportedDeprecationMessages;
std::map<String16, int> m_count;
std::map<String16, double> m_time;
};
std::map<int, PerContextData> m_data;
}; };
} // namespace v8_inspector } // namespace v8_inspector
......
src/inspector/v8-console.cc
View file @ 908cd381
...@@ -23,49 +23,31 @@ namespace v8_inspector { ...@@ -23,49 +23,31 @@ namespace v8_inspector {
namespace { namespace {
v8::Local<v8::Private> inspectedContextPrivateKey(v8::Isolate* isolate) {
return v8::Private::ForApi(
isolate, toV8StringInternalized(isolate, "V8Console#InspectedContext"));
}
class ConsoleHelper { class ConsoleHelper {
public: public:
explicit ConsoleHelper(const v8::FunctionCallbackInfo<v8::Value>& info) explicit ConsoleHelper(const v8::FunctionCallbackInfo<v8::Value>& info)
: m_info(info), : m_info(info),
m_isolate(info.GetIsolate()), m_isolate(info.GetIsolate()),
m_context(info.GetIsolate()->GetCurrentContext()), m_context(info.GetIsolate()->GetCurrentContext()),
m_inspectedContext(nullptr), m_contextId(InspectedContext::contextId(m_context)) {
m_inspectorClient(nullptr) {} m_inspector = static_cast<V8InspectorImpl*>(
m_info.Data().As<v8::External>()->Value());
v8::Local<v8::Object> ensureConsole() { m_groupId = m_inspector->contextGroupId(m_contextId);
if (m_console.IsEmpty()) {
DCHECK(!m_info.Data().IsEmpty());
DCHECK(!m_info.Data()->IsUndefined());
m_console = m_info.Data().As<v8::Object>();
}
return m_console;
} }
InspectedContext* ensureInspectedContext() { V8InspectorImpl* inspector() { return m_inspector; }
if (m_inspectedContext) return m_inspectedContext;
v8::Local<v8::Object> console = ensureConsole(); int contextId() const { return m_contextId; }
int groupId() const { return m_groupId; }
v8::Local<v8::Private> key = inspectedContextPrivateKey(m_isolate);
v8::Local<v8::Value> inspectedContextValue; InjectedScript* injectedScript() {
if (!console->GetPrivate(m_context, key).ToLocal(&inspectedContextValue)) InspectedContext* context = m_inspector->getContext(m_groupId, m_contextId);
return nullptr; if (!context) return nullptr;
DCHECK(inspectedContextValue->IsExternal()); return context->getInjectedScript();
m_inspectedContext = static_cast<InspectedContext*>(
inspectedContextValue.As<v8::External>()->Value());
return m_inspectedContext;
} }
V8InspectorClient* ensureDebuggerClient() { V8ConsoleMessageStorage* consoleMessageStorage() {
if (m_inspectorClient) return m_inspectorClient; return inspector()->ensureConsoleMessageStorage(m_groupId);
InspectedContext* inspectedContext = ensureInspectedContext();
if (!inspectedContext) return nullptr;
m_inspectorClient = inspectedContext->inspector()->client();
return m_inspectorClient;
} }
void reportCall(ConsoleAPIType type) { void reportCall(ConsoleAPIType type) {
...@@ -91,20 +73,19 @@ class ConsoleHelper { ...@@ -91,20 +73,19 @@ class ConsoleHelper {
void reportCall(ConsoleAPIType type, void reportCall(ConsoleAPIType type,
const std::vector<v8::Local<v8::Value>>& arguments) { const std::vector<v8::Local<v8::Value>>& arguments) {
InspectedContext* inspectedContext = ensureInspectedContext();
if (!inspectedContext) return;
int contextGroupId = inspectedContext->contextGroupId();
V8InspectorImpl* inspector = inspectedContext->inspector();
std::unique_ptr<V8ConsoleMessage> message = std::unique_ptr<V8ConsoleMessage> message =
V8ConsoleMessage::createForConsoleAPI( V8ConsoleMessage::createForConsoleAPI(
inspector->client()->currentTimeMS(), type, arguments, m_context, m_contextId, m_groupId, m_inspector,
inspector->debugger()->captureStackTrace(false), inspectedContext); m_inspector->client()->currentTimeMS(), type, arguments,
inspector->ensureConsoleMessageStorage(contextGroupId) m_inspector->debugger()->captureStackTrace(false));
->addMessage(std::move(message)); consoleMessageStorage()->addMessage(std::move(message));
} }
void reportDeprecatedCall(const char* id, const String16& message) { void reportDeprecatedCall(const char* id, const String16& message) {
if (checkAndSetPrivateFlagOnConsole(id, false)) return; if (!consoleMessageStorage()->shouldReportDeprecationMessage(m_contextId,
id)) {
return;
}
std::vector<v8::Local<v8::Value>> arguments(1, std::vector<v8::Local<v8::Value>> arguments(1,
toV8String(m_isolate, message)); toV8String(m_isolate, message));
reportCall(ConsoleAPIType::kWarning, arguments); reportCall(ConsoleAPIType::kWarning, arguments);
...@@ -145,56 +126,6 @@ class ConsoleHelper { ...@@ -145,56 +126,6 @@ class ConsoleHelper {
return func; return func;
} }
v8::MaybeLocal<v8::Map> privateMap(const char* name) {
v8::Local<v8::Object> console = ensureConsole();
v8::Local<v8::Private> privateKey =
v8::Private::ForApi(m_isolate, toV8StringInternalized(m_isolate, name));
v8::Local<v8::Value> mapValue;
if (!console->GetPrivate(m_context, privateKey).ToLocal(&mapValue))
return v8::MaybeLocal<v8::Map>();
if (mapValue->IsUndefined()) {
v8::Local<v8::Map> map = v8::Map::New(m_isolate);
if (!console->SetPrivate(m_context, privateKey, map).FromMaybe(false))
return v8::MaybeLocal<v8::Map>();
return map;
}
return mapValue->IsMap() ? mapValue.As<v8::Map>()
: v8::MaybeLocal<v8::Map>();
}
int32_t getIntFromMap(v8::Local<v8::Map> map, const String16& key,
int32_t defaultValue) {
v8::Local<v8::String> v8Key = toV8String(m_isolate, key);
if (!map->Has(m_context, v8Key).FromMaybe(false)) return defaultValue;
v8::Local<v8::Value> intValue;
if (!map->Get(m_context, v8Key).ToLocal(&intValue)) return defaultValue;
return static_cast<int32_t>(intValue.As<v8::Integer>()->Value());
}
void setIntOnMap(v8::Local<v8::Map> map, const String16& key, int32_t value) {
v8::Local<v8::String> v8Key = toV8String(m_isolate, key);
if (!map->Set(m_context, v8Key, v8::Integer::New(m_isolate, value))
.ToLocal(&map))
return;
}
double getDoubleFromMap(v8::Local<v8::Map> map, const String16& key,
double defaultValue) {
v8::Local<v8::String> v8Key = toV8String(m_isolate, key);
if (!map->Has(m_context, v8Key).FromMaybe(false)) return defaultValue;
v8::Local<v8::Value> intValue;
if (!map->Get(m_context, v8Key).ToLocal(&intValue)) return defaultValue;
return intValue.As<v8::Number>()->Value();
}
void setDoubleOnMap(v8::Local<v8::Map> map, const String16& key,
double value) {
v8::Local<v8::String> v8Key = toV8String(m_isolate, key);
if (!map->Set(m_context, v8Key, v8::Number::New(m_isolate, value))
.ToLocal(&map))
return;
}
V8ProfilerAgentImpl* profilerAgent() { V8ProfilerAgentImpl* profilerAgent() {
if (V8InspectorSessionImpl* session = currentSession()) { if (V8InspectorSessionImpl* session = currentSession()) {
if (session && session->profilerAgent()->enabled()) if (session && session->profilerAgent()->enabled())
...@@ -212,10 +143,7 @@ class ConsoleHelper { ...@@ -212,10 +143,7 @@ class ConsoleHelper {
} }
V8InspectorSessionImpl* currentSession() { V8InspectorSessionImpl* currentSession() {
InspectedContext* inspectedContext = ensureInspectedContext(); return m_inspector->sessionForContextGroup(m_groupId);
if (!inspectedContext) return nullptr;
return inspectedContext->inspector()->sessionForContextGroup(
inspectedContext->contextGroupId());
} }
private: private:
...@@ -223,26 +151,9 @@ class ConsoleHelper { ...@@ -223,26 +151,9 @@ class ConsoleHelper {
v8::Isolate* m_isolate; v8::Isolate* m_isolate;
v8::Local<v8::Context> m_context; v8::Local<v8::Context> m_context;
v8::Local<v8::Object> m_console; v8::Local<v8::Object> m_console;
InspectedContext* m_inspectedContext; V8InspectorImpl* m_inspector = nullptr;
V8InspectorClient* m_inspectorClient; int m_contextId;
int m_groupId;
bool checkAndSetPrivateFlagOnConsole(const char* name, bool defaultValue) {
v8::Local<v8::Object> console = ensureConsole();
v8::Local<v8::Private> key =
v8::Private::ForApi(m_isolate, toV8StringInternalized(m_isolate, name));
v8::Local<v8::Value> flagValue;
if (!console->GetPrivate(m_context, key).ToLocal(&flagValue))
return defaultValue;
DCHECK(flagValue->IsUndefined() || flagValue->IsBoolean());
if (flagValue->IsBoolean()) {
DCHECK(flagValue.As<v8::Boolean>()->Value());
return true;
}
if (!console->SetPrivate(m_context, key, v8::True(m_isolate))
.FromMaybe(false))
return defaultValue;
return false;
}
DISALLOW_COPY_AND_ASSIGN(ConsoleHelper); DISALLOW_COPY_AND_ASSIGN(ConsoleHelper);
}; };
...@@ -253,13 +164,13 @@ void returnDataCallback(const v8::FunctionCallbackInfo<v8::Value>& info) { ...@@ -253,13 +164,13 @@ void returnDataCallback(const v8::FunctionCallbackInfo<v8::Value>& info) {
void createBoundFunctionProperty(v8::Local<v8::Context> context, void createBoundFunctionProperty(v8::Local<v8::Context> context,
v8::Local<v8::Object> console, v8::Local<v8::Object> console,
const char* name, v8::Local<v8::Value> data, const char* name,
v8::FunctionCallback callback, v8::FunctionCallback callback,
const char* description = nullptr) { const char* description = nullptr) {
v8::Local<v8::String> funcName = v8::Local<v8::String> funcName =
toV8StringInternalized(context->GetIsolate(), name); toV8StringInternalized(context->GetIsolate(), name);
v8::Local<v8::Function> func; v8::Local<v8::Function> func;
if (!v8::Function::New(context, callback, console, 0, if (!v8::Function::New(context, callback, data, 0,
v8::ConstructorBehavior::kThrow) v8::ConstructorBehavior::kThrow)
.ToLocal(&func)) .ToLocal(&func))
return; return;
...@@ -337,18 +248,13 @@ void V8Console::groupEndCallback( ...@@ -337,18 +248,13 @@ void V8Console::groupEndCallback(
void V8Console::clearCallback(const v8::FunctionCallbackInfo<v8::Value>& info) { void V8Console::clearCallback(const v8::FunctionCallbackInfo<v8::Value>& info) {
ConsoleHelper helper(info); ConsoleHelper helper(info);
InspectedContext* context = helper.ensureInspectedContext(); helper.inspector()->client()->consoleClear(helper.groupId());
if (!context) return;
int contextGroupId = context->contextGroupId();
if (V8InspectorClient* client = helper.ensureDebuggerClient())
client->consoleClear(contextGroupId);
helper.reportCallWithDefaultArgument(ConsoleAPIType::kClear, helper.reportCallWithDefaultArgument(ConsoleAPIType::kClear,
String16("console.clear")); String16("console.clear"));
} }
void V8Console::countCallback(const v8::FunctionCallbackInfo<v8::Value>& info) { void V8Console::countCallback(const v8::FunctionCallbackInfo<v8::Value>& info) {
ConsoleHelper helper(info); ConsoleHelper helper(info);
String16 title = helper.firstArgToString(String16()); String16 title = helper.firstArgToString(String16());
String16 identifier; String16 identifier;
if (title.isEmpty()) { if (title.isEmpty()) {
...@@ -362,10 +268,8 @@ void V8Console::countCallback(const v8::FunctionCallbackInfo<v8::Value>& info) { ...@@ -362,10 +268,8 @@ void V8Console::countCallback(const v8::FunctionCallbackInfo<v8::Value>& info) {
identifier = title + "@"; identifier = title + "@";
} }
v8::Local<v8::Map> countMap; int count =
if (!helper.privateMap("V8Console#countMap").ToLocal(&countMap)) return; helper.consoleMessageStorage()->count(helper.contextId(), identifier);
int32_t count = helper.getIntFromMap(countMap, identifier, 0) + 1;
helper.setIntOnMap(countMap, identifier, count);
String16 countString = String16::fromInteger(count); String16 countString = String16::fromInteger(count);
helper.reportCallWithArgument( helper.reportCallWithArgument(
ConsoleAPIType::kCount, ConsoleAPIType::kCount,
...@@ -415,33 +319,25 @@ void V8Console::profileEndCallback( ...@@ -415,33 +319,25 @@ void V8Console::profileEndCallback(
static void timeFunction(const v8::FunctionCallbackInfo<v8::Value>& info, static void timeFunction(const v8::FunctionCallbackInfo<v8::Value>& info,
bool timelinePrefix) { bool timelinePrefix) {
ConsoleHelper helper(info); ConsoleHelper helper(info);
if (V8InspectorClient* client = helper.ensureDebuggerClient()) { V8InspectorClient* client = helper.inspector()->client();
String16 protocolTitle = helper.firstArgToString("default"); String16 protocolTitle = helper.firstArgToString("default");
if (timelinePrefix) protocolTitle = "Timeline '" + protocolTitle + "'"; if (timelinePrefix) protocolTitle = "Timeline '" + protocolTitle + "'";
client->consoleTime(toStringView(protocolTitle)); client->consoleTime(toStringView(protocolTitle));
helper.consoleMessageStorage()->time(helper.contextId(), protocolTitle);
v8::Local<v8::Map> timeMap;
if (!helper.privateMap("V8Console#timeMap").ToLocal(&timeMap)) return;
helper.setDoubleOnMap(timeMap, protocolTitle, client->currentTimeMS());
}
} }
static void timeEndFunction(const v8::FunctionCallbackInfo<v8::Value>& info, static void timeEndFunction(const v8::FunctionCallbackInfo<v8::Value>& info,
bool timelinePrefix) { bool timelinePrefix) {
ConsoleHelper helper(info); ConsoleHelper helper(info);
if (V8InspectorClient* client = helper.ensureDebuggerClient()) { V8InspectorClient* client = helper.inspector()->client();
String16 protocolTitle = helper.firstArgToString("default"); String16 protocolTitle = helper.firstArgToString("default");
if (timelinePrefix) protocolTitle = "Timeline '" + protocolTitle + "'"; if (timelinePrefix) protocolTitle = "Timeline '" + protocolTitle + "'";
client->consoleTimeEnd(toStringView(protocolTitle)); client->consoleTimeEnd(toStringView(protocolTitle));
double elapsed = helper.consoleMessageStorage()->timeEnd(helper.contextId(),
v8::Local<v8::Map> timeMap; protocolTitle);
if (!helper.privateMap("V8Console#timeMap").ToLocal(&timeMap)) return; String16 message =
double elapsed = client->currentTimeMS() - protocolTitle + ": " + String16::fromDouble(elapsed) + "ms";
helper.getDoubleFromMap(timeMap, protocolTitle, 0.0); helper.reportCallWithArgument(ConsoleAPIType::kTimeEnd, message);
String16 message =
protocolTitle + ": " + String16::fromDouble(elapsed) + "ms";
helper.reportCallWithArgument(ConsoleAPIType::kTimeEnd, message);
}
} }
void V8Console::timelineCallback( void V8Console::timelineCallback(
...@@ -473,23 +369,20 @@ void V8Console::timeEndCallback( ...@@ -473,23 +369,20 @@ void V8Console::timeEndCallback(
void V8Console::timeStampCallback( void V8Console::timeStampCallback(
const v8::FunctionCallbackInfo<v8::Value>& info) { const v8::FunctionCallbackInfo<v8::Value>& info) {
ConsoleHelper helper(info); ConsoleHelper helper(info);
if (V8InspectorClient* client = helper.ensureDebuggerClient()) { String16 title = helper.firstArgToString(String16());
String16 title = helper.firstArgToString(String16()); helper.inspector()->client()->consoleTimeStamp(toStringView(title));
client->consoleTimeStamp(toStringView(title));
}
} }
void V8Console::memoryGetterCallback( void V8Console::memoryGetterCallback(
const v8::FunctionCallbackInfo<v8::Value>& info) { const v8::FunctionCallbackInfo<v8::Value>& info) {
if (V8InspectorClient* client = ConsoleHelper(info).ensureDebuggerClient()) { V8InspectorClient* client = ConsoleHelper(info).inspector()->client();
v8::Local<v8::Value> memoryValue; v8::Local<v8::Value> memoryValue;
if (!client if (!client
->memoryInfo(info.GetIsolate(), ->memoryInfo(info.GetIsolate(),
info.GetIsolate()->GetCurrentContext()) info.GetIsolate()->GetCurrentContext())
.ToLocal(&memoryValue)) .ToLocal(&memoryValue))
return; return;
info.GetReturnValue().Set(memoryValue); info.GetReturnValue().Set(memoryValue);
}
} }
void V8Console::memorySetterCallback( void V8Console::memorySetterCallback(
...@@ -610,10 +503,9 @@ void V8Console::unmonitorFunctionCallback( ...@@ -610,10 +503,9 @@ void V8Console::unmonitorFunctionCallback(
void V8Console::lastEvaluationResultCallback( void V8Console::lastEvaluationResultCallback(
const v8::FunctionCallbackInfo<v8::Value>& info) { const v8::FunctionCallbackInfo<v8::Value>& info) {
ConsoleHelper helper(info); ConsoleHelper helper(info);
InspectedContext* context = helper.ensureInspectedContext(); InjectedScript* injectedScript = helper.injectedScript();
if (!context) return; if (!injectedScript) return;
if (InjectedScript* injectedScript = context->getInjectedScript()) info.GetReturnValue().Set(injectedScript->lastEvaluationResult());
info.GetReturnValue().Set(injectedScript->lastEvaluationResult());
} }
static void inspectImpl(const v8::FunctionCallbackInfo<v8::Value>& info, static void inspectImpl(const v8::FunctionCallbackInfo<v8::Value>& info,
...@@ -622,9 +514,7 @@ static void inspectImpl(const v8::FunctionCallbackInfo<v8::Value>& info, ...@@ -622,9 +514,7 @@ static void inspectImpl(const v8::FunctionCallbackInfo<v8::Value>& info,
if (!copyToClipboard) info.GetReturnValue().Set(info[0]); if (!copyToClipboard) info.GetReturnValue().Set(info[0]);
ConsoleHelper helper(info); ConsoleHelper helper(info);
InspectedContext* context = helper.ensureInspectedContext(); InjectedScript* injectedScript = helper.injectedScript();
if (!context) return;
InjectedScript* injectedScript = context->getInjectedScript();
if (!injectedScript) return; if (!injectedScript) return;
std::unique_ptr<protocol::Runtime::RemoteObject> wrappedObject; std::unique_ptr<protocol::Runtime::RemoteObject> wrappedObject;
protocol::Response response = protocol::Response response =
...@@ -635,9 +525,10 @@ static void inspectImpl(const v8::FunctionCallbackInfo<v8::Value>& info, ...@@ -635,9 +525,10 @@ static void inspectImpl(const v8::FunctionCallbackInfo<v8::Value>& info,
std::unique_ptr<protocol::DictionaryValue> hints = std::unique_ptr<protocol::DictionaryValue> hints =
protocol::DictionaryValue::create(); protocol::DictionaryValue::create();
if (copyToClipboard) hints->setBoolean("copyToClipboard", true); if (copyToClipboard) hints->setBoolean("copyToClipboard", true);
if (V8InspectorSessionImpl* session = helper.currentSession()) if (V8InspectorSessionImpl* session = helper.currentSession()) {
session->runtimeAgent()->inspect(std::move(wrappedObject), session->runtimeAgent()->inspect(std::move(wrappedObject),
std::move(hints)); std::move(hints));
}
} }
void V8Console::inspectCallback( void V8Console::inspectCallback(
...@@ -677,49 +568,53 @@ v8::Local<v8::Object> V8Console::createConsole( ...@@ -677,49 +568,53 @@ v8::Local<v8::Object> V8Console::createConsole(
DCHECK(success); DCHECK(success);
USE(success); USE(success);
createBoundFunctionProperty(context, console, "debug", v8::Local<v8::External> data =
v8::External::New(isolate, inspectedContext->inspector());
createBoundFunctionProperty(context, console, data, "debug",
V8Console::debugCallback); V8Console::debugCallback);
createBoundFunctionProperty(context, console, "error", createBoundFunctionProperty(context, console, data, "error",
V8Console::errorCallback); V8Console::errorCallback);
createBoundFunctionProperty(context, console, "info", createBoundFunctionProperty(context, console, data, "info",
V8Console::infoCallback); V8Console::infoCallback);
createBoundFunctionProperty(context, console, "log", V8Console::logCallback); createBoundFunctionProperty(context, console, data, "log",
createBoundFunctionProperty(context, console, "warn", V8Console::logCallback);
createBoundFunctionProperty(context, console, data, "warn",
V8Console::warnCallback); V8Console::warnCallback);
createBoundFunctionProperty(context, console, "dir", V8Console::dirCallback); createBoundFunctionProperty(context, console, data, "dir",
createBoundFunctionProperty(context, console, "dirxml", V8Console::dirCallback);
createBoundFunctionProperty(context, console, data, "dirxml",
V8Console::dirxmlCallback); V8Console::dirxmlCallback);
createBoundFunctionProperty(context, console, "table", createBoundFunctionProperty(context, console, data, "table",
V8Console::tableCallback); V8Console::tableCallback);
createBoundFunctionProperty(context, console, "trace", createBoundFunctionProperty(context, console, data, "trace",
V8Console::traceCallback); V8Console::traceCallback);
createBoundFunctionProperty(context, console, "group", createBoundFunctionProperty(context, console, data, "group",
V8Console::groupCallback); V8Console::groupCallback);
createBoundFunctionProperty(context, console, "groupCollapsed", createBoundFunctionProperty(context, console, data, "groupCollapsed",
V8Console::groupCollapsedCallback); V8Console::groupCollapsedCallback);
createBoundFunctionProperty(context, console, "groupEnd", createBoundFunctionProperty(context, console, data, "groupEnd",
V8Console::groupEndCallback); V8Console::groupEndCallback);
createBoundFunctionProperty(context, console, "clear", createBoundFunctionProperty(context, console, data, "clear",
V8Console::clearCallback); V8Console::clearCallback);
createBoundFunctionProperty(context, console, "count", createBoundFunctionProperty(context, console, data, "count",
V8Console::countCallback); V8Console::countCallback);
createBoundFunctionProperty(context, console, "assert", createBoundFunctionProperty(context, console, data, "assert",
V8Console::assertCallback); V8Console::assertCallback);
createBoundFunctionProperty(context, console, "markTimeline", createBoundFunctionProperty(context, console, data, "markTimeline",
V8Console::markTimelineCallback); V8Console::markTimelineCallback);
createBoundFunctionProperty(context, console, "profile", createBoundFunctionProperty(context, console, data, "profile",
V8Console::profileCallback); V8Console::profileCallback);
createBoundFunctionProperty(context, console, "profileEnd", createBoundFunctionProperty(context, console, data, "profileEnd",
V8Console::profileEndCallback); V8Console::profileEndCallback);
createBoundFunctionProperty(context, console, "timeline", createBoundFunctionProperty(context, console, data, "timeline",
V8Console::timelineCallback); V8Console::timelineCallback);
createBoundFunctionProperty(context, console, "timelineEnd", createBoundFunctionProperty(context, console, data, "timelineEnd",
V8Console::timelineEndCallback); V8Console::timelineEndCallback);
createBoundFunctionProperty(context, console, "time", createBoundFunctionProperty(context, console, data, "time",
V8Console::timeCallback); V8Console::timeCallback);
createBoundFunctionProperty(context, console, "timeEnd", createBoundFunctionProperty(context, console, data, "timeEnd",
V8Console::timeEndCallback); V8Console::timeEndCallback);
createBoundFunctionProperty(context, console, "timeStamp", createBoundFunctionProperty(context, console, data, "timeStamp",
V8Console::timeStampCallback); V8Console::timeStampCallback);
const char* jsConsoleAssert = const char* jsConsoleAssert =
...@@ -747,7 +642,7 @@ v8::Local<v8::Object> V8Console::createConsole( ...@@ -747,7 +642,7 @@ v8::Local<v8::Object> V8Console::createConsole(
->Call(context, console, 0, nullptr); ->Call(context, console, 0, nullptr);
} }
if (hasMemoryAttribute) if (hasMemoryAttribute) {
console->SetAccessorProperty( console->SetAccessorProperty(
toV8StringInternalized(isolate, "memory"), toV8StringInternalized(isolate, "memory"),
v8::Function::New(context, V8Console::memoryGetterCallback, console, 0, v8::Function::New(context, V8Console::memoryGetterCallback, console, 0,
...@@ -758,19 +653,11 @@ v8::Local<v8::Object> V8Console::createConsole( ...@@ -758,19 +653,11 @@ v8::Local<v8::Object> V8Console::createConsole(
v8::ConstructorBehavior::kThrow) v8::ConstructorBehavior::kThrow)
.ToLocalChecked(), .ToLocalChecked(),
static_cast<v8::PropertyAttribute>(v8::None), v8::DEFAULT); static_cast<v8::PropertyAttribute>(v8::None), v8::DEFAULT);
}
console->SetPrivate(context, inspectedContextPrivateKey(isolate),
v8::External::New(isolate, inspectedContext));
return console; return console;
} }
void V8Console::clearInspectedContextIfNeeded(v8::Local<v8::Context> context,
v8::Local<v8::Object> console) {
v8::Isolate* isolate = context->GetIsolate();
console->SetPrivate(context, inspectedContextPrivateKey(isolate),
v8::External::New(isolate, nullptr));
}
v8::Local<v8::Object> V8Console::createCommandLineAPI( v8::Local<v8::Object> V8Console::createCommandLineAPI(
InspectedContext* inspectedContext) { InspectedContext* inspectedContext) {
v8::Local<v8::Context> context = inspectedContext->context(); v8::Local<v8::Context> context = inspectedContext->context();
...@@ -784,68 +671,70 @@ v8::Local<v8::Object> V8Console::createCommandLineAPI( ...@@ -784,68 +671,70 @@ v8::Local<v8::Object> V8Console::createCommandLineAPI(
DCHECK(success); DCHECK(success);
USE(success); USE(success);
createBoundFunctionProperty(context, commandLineAPI, "dir", v8::Local<v8::External> data =
v8::External::New(isolate, inspectedContext->inspector());
createBoundFunctionProperty(context, commandLineAPI, data, "dir",
V8Console::dirCallback, V8Console::dirCallback,
"function dir(value) { [Command Line API] }"); "function dir(value) { [Command Line API] }");
createBoundFunctionProperty(context, commandLineAPI, "dirxml", createBoundFunctionProperty(context, commandLineAPI, data, "dirxml",
V8Console::dirxmlCallback, V8Console::dirxmlCallback,
"function dirxml(value) { [Command Line API] }"); "function dirxml(value) { [Command Line API] }");
createBoundFunctionProperty(context, commandLineAPI, "profile", createBoundFunctionProperty(context, commandLineAPI, data, "profile",
V8Console::profileCallback, V8Console::profileCallback,
"function profile(title) { [Command Line API] }"); "function profile(title) { [Command Line API] }");
createBoundFunctionProperty( createBoundFunctionProperty(
context, commandLineAPI, "profileEnd", V8Console::profileEndCallback, context, commandLineAPI, data, "profileEnd",
V8Console::profileEndCallback,
"function profileEnd(title) { [Command Line API] }"); "function profileEnd(title) { [Command Line API] }");
createBoundFunctionProperty(context, commandLineAPI, "clear", createBoundFunctionProperty(context, commandLineAPI, data, "clear",
V8Console::clearCallback, V8Console::clearCallback,
"function clear() { [Command Line API] }"); "function clear() { [Command Line API] }");
createBoundFunctionProperty( createBoundFunctionProperty(
context, commandLineAPI, "table", V8Console::tableCallback, context, commandLineAPI, data, "table", V8Console::tableCallback,
"function table(data, [columns]) { [Command Line API] }"); "function table(data, [columns]) { [Command Line API] }");
createBoundFunctionProperty(context, commandLineAPI, "keys", createBoundFunctionProperty(context, commandLineAPI, data, "keys",
V8Console::keysCallback, V8Console::keysCallback,
"function keys(object) { [Command Line API] }"); "function keys(object) { [Command Line API] }");
createBoundFunctionProperty(context, commandLineAPI, "values", createBoundFunctionProperty(context, commandLineAPI, data, "values",
V8Console::valuesCallback, V8Console::valuesCallback,
"function values(object) { [Command Line API] }"); "function values(object) { [Command Line API] }");
createBoundFunctionProperty( createBoundFunctionProperty(
context, commandLineAPI, "debug", V8Console::debugFunctionCallback, context, commandLineAPI, data, "debug", V8Console::debugFunctionCallback,
"function debug(function) { [Command Line API] }"); "function debug(function) { [Command Line API] }");
createBoundFunctionProperty( createBoundFunctionProperty(
context, commandLineAPI, "undebug", V8Console::undebugFunctionCallback, context, commandLineAPI, data, "undebug",
V8Console::undebugFunctionCallback,
"function undebug(function) { [Command Line API] }"); "function undebug(function) { [Command Line API] }");
createBoundFunctionProperty( createBoundFunctionProperty(
context, commandLineAPI, "monitor", V8Console::monitorFunctionCallback, context, commandLineAPI, data, "monitor",
V8Console::monitorFunctionCallback,
"function monitor(function) { [Command Line API] }"); "function monitor(function) { [Command Line API] }");
createBoundFunctionProperty( createBoundFunctionProperty(
context, commandLineAPI, "unmonitor", context, commandLineAPI, data, "unmonitor",
V8Console::unmonitorFunctionCallback, V8Console::unmonitorFunctionCallback,
"function unmonitor(function) { [Command Line API] }"); "function unmonitor(function) { [Command Line API] }");
createBoundFunctionProperty( createBoundFunctionProperty(
context, commandLineAPI, "inspect", V8Console::inspectCallback, context, commandLineAPI, data, "inspect", V8Console::inspectCallback,
"function inspect(object) { [Command Line API] }"); "function inspect(object) { [Command Line API] }");
createBoundFunctionProperty(context, commandLineAPI, "copy", createBoundFunctionProperty(context, commandLineAPI, data, "copy",
V8Console::copyCallback, V8Console::copyCallback,
"function copy(value) { [Command Line API] }"); "function copy(value) { [Command Line API] }");
createBoundFunctionProperty(context, commandLineAPI, "$_", createBoundFunctionProperty(context, commandLineAPI, data, "$_",
V8Console::lastEvaluationResultCallback); V8Console::lastEvaluationResultCallback);
createBoundFunctionProperty(context, commandLineAPI, "$0", createBoundFunctionProperty(context, commandLineAPI, data, "$0",
V8Console::inspectedObject0); V8Console::inspectedObject0);
createBoundFunctionProperty(context, commandLineAPI, "$1", createBoundFunctionProperty(context, commandLineAPI, data, "$1",
V8Console::inspectedObject1); V8Console::inspectedObject1);
createBoundFunctionProperty(context, commandLineAPI, "$2", createBoundFunctionProperty(context, commandLineAPI, data, "$2",
V8Console::inspectedObject2); V8Console::inspectedObject2);
createBoundFunctionProperty(context, commandLineAPI, "$3", createBoundFunctionProperty(context, commandLineAPI, data, "$3",
V8Console::inspectedObject3); V8Console::inspectedObject3);
createBoundFunctionProperty(context, commandLineAPI, "$4", createBoundFunctionProperty(context, commandLineAPI, data, "$4",
V8Console::inspectedObject4); V8Console::inspectedObject4);
inspectedContext->inspector()->client()->installAdditionalCommandLineAPI( inspectedContext->inspector()->client()->installAdditionalCommandLineAPI(
context, commandLineAPI); context, commandLineAPI);
commandLineAPI->SetPrivate(context, inspectedContextPrivateKey(isolate),
v8::External::New(isolate, inspectedContext));
return commandLineAPI; return commandLineAPI;
} }
......
src/inspector/v8-console.h
View file @ 908cd381
...@@ -19,8 +19,6 @@ class V8Console { ...@@ -19,8 +19,6 @@ class V8Console {
public: public:
static v8::Local<v8::Object> createConsole(InspectedContext*, static v8::Local<v8::Object> createConsole(InspectedContext*,
bool hasMemoryAttribute); bool hasMemoryAttribute);
static void clearInspectedContextIfNeeded(v8::Local<v8::Context>,
v8::Local<v8::Object> console);
static v8::Local<v8::Object> createCommandLineAPI(InspectedContext*); static v8::Local<v8::Object> createCommandLineAPI(InspectedContext*);
class CommandLineAPIScope { class CommandLineAPIScope {
......
test/inspector/protocol-test.js
View file @ 908cd381
...@@ -75,6 +75,8 @@ InspectorTest.logMessage = function(originalMessage) ...@@ -75,6 +75,8 @@ InspectorTest.logMessage = function(originalMessage)
for (var key in object) { for (var key in object) {
if (nonStableFields.has(key)) if (nonStableFields.has(key))
object[key] = `<${key}>`; object[key] = `<${key}>`;
else if (typeof object[key] === "string" && object[key].match(/\d+:\d+:\d+:debug/))
object[key] = object[key].replace(/\d+/, '<scriptId>');
else if (typeof object[key] === "object") else if (typeof object[key] === "object")
objects.push(object[key]); objects.push(object[key]);
} }
......
test/inspector/runtime/command-line-api-expected.txt 0 → 100644
View file @ 908cd381
Checks command line API.
Running test: testKeys
{
id : <messageId>
result : {
result : {
className : Function
description : function keys(object) { [Command Line API] }
objectId : <objectId>
type : function
}
}
}
{
id : <messageId>
result : {
result : {
type : object
value : [
[0] : a
]
}
}
}
{
id : <messageId>
result : {
result : {
type : object
value : [
[0] : a
]
}
}
}
Running test: testInspect
[object Object]
{
method : Runtime.inspectRequested
params : {
hints : {
}
object : {
className : Object
description : Object
objectId : <objectId>
type : object
}
}
}
{
method : Runtime.inspectRequested
params : {
hints : {
}
object : {
description : 239
type : number
value : 239
}
}
}
{
method : Runtime.inspectRequested
params : {
hints : {
}
object : {
description : -0
type : number
unserializableValue : -0
}
}
}
{
method : Runtime.inspectRequested
params : {
hints : {
copyToClipboard : true
}
object : {
type : string
value : hello
}
}
}
{
id : <messageId>
result : {
result : {
type : undefined
}
}
}
{
method : Runtime.inspectRequested
params : {
hints : {
}
object : {
className : Object
description : Object
objectId : <objectId>
type : object
}
}
}
Running test: testEvaluationResult
{
id : <messageId>
result : {
result : {
type : undefined
}
}
}
{
id : <messageId>
result : {
result : {
description : 42
type : number
value : 42
}
}
}
{
id : <messageId>
result : {
result : {
description : 42
type : number
value : 42
}
}
}
{
id : <messageId>
result : {
result : {
description : -0
type : number
unserializableValue : -0
}
}
}
{
id : <messageId>
result : {
result : {
type : object
value : {
}
}
}
}
Running test: testDebug
{
id : <messageId>
result : {
result : {
className : Function
description : function debug(function) { [Command Line API] }
objectId : <objectId>
type : function
}
}
}
{
id : <messageId>
result : {
result : {
className : Function
description : function undebug(function) { [Command Line API] }
objectId : <objectId>
type : function
}
}
}
foo (:0:16)
(anonymous) (:0:0)
[
[0] : <scriptId>:0:12:debug
]
foo (:0:16)
(anonymous) (:0:0)
[
[0] : <scriptId>:0:12:debug
]
Running test: testMonitor
{
id : <messageId>
result : {
result : {
className : Function
description : function monitor(function) { [Command Line API] }
objectId : <objectId>
type : function
}
}
}
{
id : <messageId>
result : {
result : {
className : Function
description : function unmonitor(function) { [Command Line API] }
objectId : <objectId>
type : function
}
}
}
function foo called
after first call
store functions..
function foo called
after first call
Running test: testProfile
{
id : <messageId>
result : {
result : {
className : Function
description : function profile(title) { [Command Line API] }
objectId : <objectId>
type : function
}
}
}
{
id : <messageId>
result : {
result : {
className : Function
description : function profileEnd(title) { [Command Line API] }
objectId : <objectId>
type : function
}
}
}
{
method : Profiler.consoleProfileStarted
params : {
id : 1
location : {
columnNumber : 1
lineNumber : 1
scriptId : <scriptId>
}
title : 42
}
}
{
method : Profiler.consoleProfileFinished
params : {
id : 1
location : {
columnNumber : 1
lineNumber : 1
scriptId : <scriptId>
}
profile : <profile>
title : 42
}
}
{
method : Profiler.consoleProfileStarted
params : {
id : 2
location : {
columnNumber : 6
lineNumber : 1
scriptId : <scriptId>
}
title : 239
}
}
{
method : Profiler.consoleProfileFinished
params : {
id : 2
location : {
columnNumber : 6
lineNumber : 1
scriptId : <scriptId>
}
profile : <profile>
title : 239
}
}
Running test: testDir
{
id : <messageId>
result : {
result : {
className : Function
description : function dir(value) { [Command Line API] }
objectId : <objectId>
type : function
}
}
}
{
method : Runtime.consoleAPICalled
params : {
args : [
[0] : {
className : Object
description : Object
objectId : <objectId>
preview : {
description : Object
overflow : false
properties : [
]
type : object
}
type : object
}
]
executionContextId : <executionContextId>
stackTrace : {
callFrames : [
[0] : {
columnNumber : 0
functionName :
lineNumber : 0
scriptId : <scriptId>
url :
}
]
}
timestamp : <timestamp>
type : dir
}
}
{
method : Runtime.consoleAPICalled
params : {
args : [
[0] : {
description : 42
type : number
value : 42
}
]
executionContextId : <executionContextId>
stackTrace : {
callFrames : [
[0] : {
columnNumber : 0
functionName :
lineNumber : 0
scriptId : <scriptId>
url :
}
]
}
timestamp : <timestamp>
type : dir
}
}
{
method : Runtime.consoleAPICalled
params : {
args : [
[0] : {
className : Object
description : Object
objectId : <objectId>
preview : {
description : Object
overflow : false
properties : [
]
type : object
}
type : object
}
]
executionContextId : <executionContextId>
stackTrace : {
callFrames : [
[0] : {
columnNumber : 5
functionName :
lineNumber : 0
scriptId : <scriptId>
url :
}
]
}
timestamp : <timestamp>
type : dir
}
}
Running test: testDirXML
{
id : <messageId>
result : {
result : {
className : Function
description : function dirxml(value) { [Command Line API] }
objectId : <objectId>
type : function
}
}
}
{
method : Runtime.consoleAPICalled
params : {
args : [
[0] : {
className : Object
description : Object
objectId : <objectId>
preview : {
description : Object
overflow : false
properties : [
]
type : object
}
type : object
}
]
executionContextId : <executionContextId>
stackTrace : {
callFrames : [
[0] : {
columnNumber : 0
functionName :
lineNumber : 0
scriptId : <scriptId>
url :
}
]
}
timestamp : <timestamp>
type : dirxml
}
}
{
method : Runtime.consoleAPICalled
params : {
args : [
[0] : {
description : 42
type : number
value : 42
}
]
executionContextId : <executionContextId>
stackTrace : {
callFrames : [
[0] : {
columnNumber : 0
functionName :
lineNumber : 0
scriptId : <scriptId>
url :
}
]
}
timestamp : <timestamp>
type : dirxml
}
}
Running test: testTable
{
id : <messageId>
result : {
result : {
className : Function
description : function table(data, [columns]) { [Command Line API] }
objectId : <objectId>
type : function
}
}
}
{
method : Runtime.consoleAPICalled
params : {
args : [
[0] : {
className : Object
description : Object
objectId : <objectId>
preview : {
description : Object
overflow : false
properties : [
]
type : object
}
type : object
}
]
executionContextId : <executionContextId>
stackTrace : {
callFrames : [
[0] : {
columnNumber : 0
functionName :
lineNumber : 0
scriptId : <scriptId>
url :
}
]
}
timestamp : <timestamp>
type : table
}
}
{
method : Runtime.consoleAPICalled
params : {
args : [
[0] : {
description : 42
type : number
value : 42
}
]
executionContextId : <executionContextId>
stackTrace : {
callFrames : [
[0] : {
columnNumber : 0
functionName :
lineNumber : 0
scriptId : <scriptId>
url :
}
]
}
timestamp : <timestamp>
type : table
}
}
Running test: testClear
{
id : <messageId>
result : {
result : {
className : Function
description : function clear() { [Command Line API] }
objectId : <objectId>
type : function
}
}
}
{
method : Runtime.consoleAPICalled
params : {
args : [
[0] : {
type : string
value : console.clear
}
]
executionContextId : <executionContextId>
stackTrace : {
callFrames : [
[0] : {
columnNumber : 0
functionName :
lineNumber : 0
scriptId : <scriptId>
url :
}
]
}
timestamp : <timestamp>
type : clear
}
}
{
method : Runtime.consoleAPICalled
params : {
args : [
[0] : {
type : string
value : console.clear
}
]
executionContextId : <executionContextId>
stackTrace : {
callFrames : [
[0] : {
columnNumber : 5
functionName :
lineNumber : 0
scriptId : <scriptId>
url :
}
]
}
timestamp : <timestamp>
type : clear
}
}
test/inspector/runtime/command-line-api.js 0 → 100644
View file @ 908cd381
// Copyright 2017 the V8 project authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
InspectorTest.log('Checks command line API.');
InspectorTest.runAsyncTestSuite([
async function testKeys() {
InspectorTest.logMessage(await Protocol.Runtime.evaluate({
expression: 'keys', includeCommandLineAPI: true}));
InspectorTest.logMessage(await Protocol.Runtime.evaluate({
expression: 'keys({a : 1})', includeCommandLineAPI: true, returnByValue: true}));
Protocol.Runtime.evaluate({expression: 'this.keys = keys', includeCommandLineAPI: true});
InspectorTest.logMessage(await Protocol.Runtime.evaluate({
expression: 'this.keys({a : 1})', returnByValue: true}));
},
async function testInspect() {
InspectorTest.log(await Protocol.Runtime.evaluate({expression: 'inspect', includeCommandLineAPI: true}));
await Protocol.Runtime.enable();
Protocol.Runtime.onInspectRequested(InspectorTest.logMessage);
await Protocol.Runtime.evaluate({expression: 'inspect({})', includeCommandLineAPI: true});
await Protocol.Runtime.evaluate({expression: 'inspect(239)', includeCommandLineAPI: true});
await Protocol.Runtime.evaluate({expression: 'inspect(-0)', includeCommandLineAPI: true});
await Protocol.Runtime.evaluate({expression: 'copy(\'hello\')', includeCommandLineAPI: true});
InspectorTest.logMessage(await Protocol.Runtime.evaluate({expression: '$0', includeCommandLineAPI: true}));
Protocol.Runtime.evaluate({expression: 'this.inspect = inspect', includeCommandLineAPI: true});
await Protocol.Runtime.evaluate({expression: 'this.inspect({})'});
Protocol.Runtime.onInspectRequested(null);
await Protocol.Runtime.disable();
},
async function testEvaluationResult() {
InspectorTest.logMessage(await Protocol.Runtime.evaluate({expression: '$_', includeCommandLineAPI: true}));
await Protocol.Runtime.evaluate({expression: '42', objectGroup: 'console', includeCommandLineAPI: true});
InspectorTest.logMessage(await Protocol.Runtime.evaluate({expression: '$_', includeCommandLineAPI: true}));
await Protocol.Runtime.evaluate({expression: '239', includeCommandLineAPI: true});
InspectorTest.logMessage(await Protocol.Runtime.evaluate({expression: '$_', includeCommandLineAPI: true}));
await Protocol.Runtime.evaluate({expression: '-0', objectGroup: 'console', includeCommandLineAPI: true});
InspectorTest.logMessage(await Protocol.Runtime.evaluate({expression: '$_', includeCommandLineAPI: true}));
await Protocol.Runtime.evaluate({expression: '({})', objectGroup: 'console', includeCommandLineAPI: true});
InspectorTest.logMessage(await Protocol.Runtime.evaluate({expression: '$_', includeCommandLineAPI: true, returnByValue: true}));
},
async function testDebug() {
InspectorTest.setupScriptMap();
await Protocol.Debugger.enable();
InspectorTest.logMessage(await Protocol.Runtime.evaluate({expression: 'debug', includeCommandLineAPI: true}));
InspectorTest.logMessage(await Protocol.Runtime.evaluate({expression: 'undebug', includeCommandLineAPI: true}));
await Protocol.Runtime.evaluate({expression: 'function foo() {}'});
await Protocol.Runtime.evaluate({expression: 'debug(foo)', includeCommandLineAPI: true});
Protocol.Runtime.evaluate({ expression: 'foo()'});
let message = await Protocol.Debugger.oncePaused();
InspectorTest.logCallFrames(message.params.callFrames);
InspectorTest.logMessage(message.params.hitBreakpoints);
await Protocol.Debugger.resume();
await Protocol.Runtime.evaluate({expression: 'undebug(foo)', includeCommandLineAPI: true});
await Protocol.Runtime.evaluate({ expression: 'foo()'});
Protocol.Runtime.evaluate({
expression: 'this.debug = debug; this.undebug = undebug;', includeCommandLineAPI: true});
await Protocol.Runtime.evaluate({expression: 'this.debug(foo)'});
Protocol.Runtime.evaluate({ expression: 'foo()'});
message = await Protocol.Debugger.oncePaused();
InspectorTest.logCallFrames(message.params.callFrames);
InspectorTest.logMessage(message.params.hitBreakpoints);
await Protocol.Debugger.resume();
await Protocol.Runtime.evaluate({expression: 'this.undebug(foo)'});
await Protocol.Runtime.evaluate({expression: 'foo()'});
await Protocol.Debugger.disable();
},
async function testMonitor() {
await Protocol.Debugger.enable();
await Protocol.Runtime.enable();
Protocol.Runtime.onConsoleAPICalled(message => InspectorTest.log(message.params.args[0].value));
InspectorTest.logMessage(await Protocol.Runtime.evaluate({expression: 'monitor', includeCommandLineAPI: true}));
InspectorTest.logMessage(await Protocol.Runtime.evaluate({expression: 'unmonitor', includeCommandLineAPI: true}));
await Protocol.Runtime.evaluate({expression: 'function foo() {}'});
await Protocol.Runtime.evaluate({expression: 'monitor(foo)', includeCommandLineAPI: true});
Protocol.Runtime.evaluate({ expression: 'foo(); console.log(\'after first call\')'});
await Protocol.Runtime.evaluate({expression: 'unmonitor(foo)', includeCommandLineAPI: true});
await Protocol.Runtime.evaluate({ expression: 'foo()'});
Protocol.Runtime.evaluate({
expression: 'console.log(\'store functions..\'); this.monitor = monitor; this.unmonitor = unmonitor;', includeCommandLineAPI: true});
await Protocol.Runtime.evaluate({expression: 'this.monitor(foo)'});
Protocol.Runtime.evaluate({ expression: 'foo(); console.log(\'after first call\')'});
await Protocol.Runtime.evaluate({expression: 'this.unmonitor(foo)'});
await Protocol.Runtime.evaluate({ expression: 'foo()'});
Protocol.Runtime.onConsoleAPICalled(null);
await Protocol.Debugger.disable();
await Protocol.Runtime.disable();
},
async function testProfile() {
await Protocol.Profiler.enable();
InspectorTest.logMessage(await Protocol.Runtime.evaluate({expression: 'profile', includeCommandLineAPI: true}));
InspectorTest.logMessage(await Protocol.Runtime.evaluate({expression: 'profileEnd', includeCommandLineAPI: true}));
Protocol.Runtime.evaluate({expression: 'profile(42)', includeCommandLineAPI: true});
InspectorTest.logMessage(await Protocol.Profiler.onceConsoleProfileStarted());
Protocol.Runtime.evaluate({expression: 'profileEnd(42)', includeCommandLineAPI: true});
let message = await Protocol.Profiler.onceConsoleProfileFinished();
message.params.profile = '<profile>';
InspectorTest.logMessage(message);
Protocol.Runtime.evaluate({
expression: 'this.profile = profile; this.profileEnd = profileEnd;', includeCommandLineAPI: true});
Protocol.Runtime.evaluate({expression: 'this.profile(239)'});
InspectorTest.logMessage(await Protocol.Profiler.onceConsoleProfileStarted());
Protocol.Runtime.evaluate({expression: 'this.profileEnd(239)'});
message = await Protocol.Profiler.onceConsoleProfileFinished();
message.params.profile = '<profile>';
InspectorTest.logMessage(message);
await Protocol.Profiler.disable();
},
async function testDir() {
InspectorTest.logMessage(await Protocol.Runtime.evaluate({expression: 'dir', includeCommandLineAPI: true}));
await Protocol.Runtime.enable();
Protocol.Runtime.evaluate({expression: 'dir({})', includeCommandLineAPI: true});
InspectorTest.logMessage(await Protocol.Runtime.onceConsoleAPICalled());
Protocol.Runtime.evaluate({expression: 'dir(42)', includeCommandLineAPI: true});
InspectorTest.logMessage(await Protocol.Runtime.onceConsoleAPICalled());
Protocol.Runtime.evaluate({expression: 'this.dir = dir', includeCommandLineAPI: true});
Protocol.Runtime.evaluate({expression: 'this.dir({})'});
InspectorTest.logMessage(await Protocol.Runtime.onceConsoleAPICalled());
await Protocol.Runtime.disable();
},
async function testDirXML() {
InspectorTest.logMessage(await Protocol.Runtime.evaluate({expression: 'dirxml', includeCommandLineAPI: true}));
await Protocol.Runtime.enable();
Protocol.Runtime.evaluate({expression: 'dirxml({})', includeCommandLineAPI: true});
InspectorTest.logMessage(await Protocol.Runtime.onceConsoleAPICalled());
Protocol.Runtime.evaluate({expression: 'dirxml(42)', includeCommandLineAPI: true});
InspectorTest.logMessage(await Protocol.Runtime.onceConsoleAPICalled());
await Protocol.Runtime.disable();
},
async function testTable() {
InspectorTest.logMessage(await Protocol.Runtime.evaluate({expression: 'table', includeCommandLineAPI: true}));
await Protocol.Runtime.enable();
Protocol.Runtime.evaluate({expression: 'table({})', includeCommandLineAPI: true});
InspectorTest.logMessage(await Protocol.Runtime.onceConsoleAPICalled());
Protocol.Runtime.evaluate({expression: 'table(42)', includeCommandLineAPI: true});
InspectorTest.logMessage(await Protocol.Runtime.onceConsoleAPICalled());
await Protocol.Runtime.disable();
},
async function testClear() {
InspectorTest.logMessage(await Protocol.Runtime.evaluate({expression: 'clear', includeCommandLineAPI: true}));
await Protocol.Runtime.enable();
Protocol.Runtime.evaluate({expression: 'clear()', includeCommandLineAPI: true});
InspectorTest.logMessage(await Protocol.Runtime.onceConsoleAPICalled());
Protocol.Runtime.evaluate({expression: 'this.clear = clear', includeCommandLineAPI: true});
Protocol.Runtime.evaluate({expression: 'this.clear()'});
InspectorTest.logMessage(await Protocol.Runtime.onceConsoleAPICalled());
await Protocol.Runtime.disable();
}
]);
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