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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: src/inspector/V8ConsoleMessage.cpp

Issue 2300823002: Revert of [inspector] Initial import of v8_inspector. (Closed)
Patch Set: Created 4 years, 4 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/inspector/V8ConsoleMessage.h ('k') | src/inspector/V8Debugger.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/inspector/V8ConsoleMessage.cpp
diff --git a/src/inspector/V8ConsoleMessage.cpp b/src/inspector/V8ConsoleMessage.cpp
deleted file mode 100644
index 1b20766ccb1d34f3f5fc8cab1f0c56152da9501b..0000000000000000000000000000000000000000
--- a/src/inspector/V8ConsoleMessage.cpp
+++ /dev/null
@@ -1,444 +0,0 @@
-// Copyright 2016 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.
-
-#include "src/inspector/V8ConsoleMessage.h"
-
-#include "src/inspector/InspectedContext.h"
-#include "src/inspector/StringUtil.h"
-#include "src/inspector/V8ConsoleAgentImpl.h"
-#include "src/inspector/V8InspectorImpl.h"
-#include "src/inspector/V8InspectorSessionImpl.h"
-#include "src/inspector/V8RuntimeAgentImpl.h"
-#include "src/inspector/V8StackTraceImpl.h"
-#include "src/inspector/protocol/Protocol.h"
-#include "src/inspector/public/V8InspectorClient.h"
-
-namespace v8_inspector {
-
-namespace {
-
-String16 consoleAPITypeValue(ConsoleAPIType type)
-{
- switch (type) {
- case ConsoleAPIType::kLog: return protocol::Runtime::ConsoleAPICalled::TypeEnum::Log;
- case ConsoleAPIType::kDebug: return protocol::Runtime::ConsoleAPICalled::TypeEnum::Debug;
- case ConsoleAPIType::kInfo: return protocol::Runtime::ConsoleAPICalled::TypeEnum::Info;
- case ConsoleAPIType::kError: return protocol::Runtime::ConsoleAPICalled::TypeEnum::Error;
- case ConsoleAPIType::kWarning: return protocol::Runtime::ConsoleAPICalled::TypeEnum::Warning;
- case ConsoleAPIType::kClear: return protocol::Runtime::ConsoleAPICalled::TypeEnum::Clear;
- case ConsoleAPIType::kDir: return protocol::Runtime::ConsoleAPICalled::TypeEnum::Dir;
- case ConsoleAPIType::kDirXML: return protocol::Runtime::ConsoleAPICalled::TypeEnum::Dirxml;
- case ConsoleAPIType::kTable: return protocol::Runtime::ConsoleAPICalled::TypeEnum::Table;
- case ConsoleAPIType::kTrace: return protocol::Runtime::ConsoleAPICalled::TypeEnum::Trace;
- case ConsoleAPIType::kStartGroup: return protocol::Runtime::ConsoleAPICalled::TypeEnum::StartGroup;
- case ConsoleAPIType::kStartGroupCollapsed: return protocol::Runtime::ConsoleAPICalled::TypeEnum::StartGroupCollapsed;
- case ConsoleAPIType::kEndGroup: return protocol::Runtime::ConsoleAPICalled::TypeEnum::EndGroup;
- case ConsoleAPIType::kAssert: return protocol::Runtime::ConsoleAPICalled::TypeEnum::Assert;
- case ConsoleAPIType::kTimeEnd: return protocol::Runtime::ConsoleAPICalled::TypeEnum::Debug;
- case ConsoleAPIType::kCount: return protocol::Runtime::ConsoleAPICalled::TypeEnum::Debug;
- }
- return protocol::Runtime::ConsoleAPICalled::TypeEnum::Log;
-}
-
-const unsigned maxConsoleMessageCount = 1000;
-const unsigned maxArrayItemsLimit = 10000;
-const unsigned maxStackDepthLimit = 32;
-
-class V8ValueStringBuilder {
-public:
- static String16 toString(v8::Local<v8::Value> value, v8::Isolate* isolate)
- {
- V8ValueStringBuilder builder(isolate);
- if (!builder.append(value))
- return String16();
- return builder.toString();
- }
-
-private:
- enum {
- IgnoreNull = 1 << 0,
- IgnoreUndefined = 1 << 1,
- };
-
- V8ValueStringBuilder(v8::Isolate* isolate)
- : m_arrayLimit(maxArrayItemsLimit)
- , m_isolate(isolate)
- , m_tryCatch(isolate)
- {
- }
-
- bool append(v8::Local<v8::Value> value, unsigned ignoreOptions = 0)
- {
- if (value.IsEmpty())
- return true;
- if ((ignoreOptions & IgnoreNull) && value->IsNull())
- return true;
- if ((ignoreOptions & IgnoreUndefined) && value->IsUndefined())
- return true;
- if (value->IsString())
- return append(v8::Local<v8::String>::Cast(value));
- if (value->IsStringObject())
- return append(v8::Local<v8::StringObject>::Cast(value)->ValueOf());
- if (value->IsSymbol())
- return append(v8::Local<v8::Symbol>::Cast(value));
- if (value->IsSymbolObject())
- return append(v8::Local<v8::SymbolObject>::Cast(value)->ValueOf());
- if (value->IsNumberObject()) {
- m_builder.append(String16::fromDoublePrecision6(v8::Local<v8::NumberObject>::Cast(value)->ValueOf()));
- return true;
- }
- if (value->IsBooleanObject()) {
- m_builder.append(v8::Local<v8::BooleanObject>::Cast(value)->ValueOf() ? "true" : "false");
- return true;
- }
- if (value->IsArray())
- return append(v8::Local<v8::Array>::Cast(value));
- if (value->IsProxy()) {
- m_builder.append("[object Proxy]");
- return true;
- }
- if (value->IsObject()
- && !value->IsDate()
- && !value->IsFunction()
- && !value->IsNativeError()
- && !value->IsRegExp()) {
- v8::Local<v8::Object> object = v8::Local<v8::Object>::Cast(value);
- v8::Local<v8::String> stringValue;
- if (object->ObjectProtoToString(m_isolate->GetCurrentContext()).ToLocal(&stringValue))
- return append(stringValue);
- }
- v8::Local<v8::String> stringValue;
- if (!value->ToString(m_isolate->GetCurrentContext()).ToLocal(&stringValue))
- return false;
- return append(stringValue);
- }
-
- bool append(v8::Local<v8::Array> array)
- {
- for (const auto& it : m_visitedArrays) {
- if (it == array)
- return true;
- }
- uint32_t length = array->Length();
- if (length > m_arrayLimit)
- return false;
- if (m_visitedArrays.size() > maxStackDepthLimit)
- return false;
-
- bool result = true;
- m_arrayLimit -= length;
- m_visitedArrays.push_back(array);
- for (uint32_t i = 0; i < length; ++i) {
- if (i)
- m_builder.append(',');
- if (!append(array->Get(i), IgnoreNull | IgnoreUndefined)) {
- result = false;
- break;
- }
- }
- m_visitedArrays.pop_back();
- return result;
- }
-
- bool append(v8::Local<v8::Symbol> symbol)
- {
- m_builder.append("Symbol(");
- bool result = append(symbol->Name(), IgnoreUndefined);
- m_builder.append(')');
- return result;
- }
-
- bool append(v8::Local<v8::String> string)
- {
- if (m_tryCatch.HasCaught())
- return false;
- if (!string.IsEmpty())
- m_builder.append(toProtocolString(string));
- return true;
- }
-
- String16 toString()
- {
- if (m_tryCatch.HasCaught())
- return String16();
- return m_builder.toString();
- }
-
- uint32_t m_arrayLimit;
- v8::Isolate* m_isolate;
- String16Builder m_builder;
- std::vector<v8::Local<v8::Array>> m_visitedArrays;
- v8::TryCatch m_tryCatch;
-};
-
-} // namespace
-
-V8ConsoleMessage::V8ConsoleMessage(V8MessageOrigin origin, double timestamp, const String16& message)
- : m_origin(origin)
- , m_timestamp(timestamp)
- , m_message(message)
- , m_lineNumber(0)
- , m_columnNumber(0)
- , m_scriptId(0)
- , m_contextId(0)
- , m_type(ConsoleAPIType::kLog)
- , m_exceptionId(0)
- , m_revokedExceptionId(0)
-{
-}
-
-V8ConsoleMessage::~V8ConsoleMessage()
-{
-}
-
-void V8ConsoleMessage::setLocation(const String16& url, unsigned lineNumber, unsigned columnNumber, std::unique_ptr<V8StackTraceImpl> stackTrace, int scriptId)
-{
- m_url = url;
- m_lineNumber = lineNumber;
- m_columnNumber = columnNumber;
- m_stackTrace = std::move(stackTrace);
- m_scriptId = scriptId;
-}
-
-void V8ConsoleMessage::reportToFrontend(protocol::Console::Frontend* frontend) const
-{
- DCHECK(m_origin == V8MessageOrigin::kConsole);
- String16 level = protocol::Console::ConsoleMessage::LevelEnum::Log;
- if (m_type == ConsoleAPIType::kDebug || m_type == ConsoleAPIType::kCount || m_type == ConsoleAPIType::kTimeEnd)
- level = protocol::Console::ConsoleMessage::LevelEnum::Debug;
- else if (m_type == ConsoleAPIType::kError || m_type == ConsoleAPIType::kAssert)
- level = protocol::Console::ConsoleMessage::LevelEnum::Error;
- else if (m_type == ConsoleAPIType::kWarning)
- level = protocol::Console::ConsoleMessage::LevelEnum::Warning;
- else if (m_type == ConsoleAPIType::kInfo)
- level = protocol::Console::ConsoleMessage::LevelEnum::Info;
- std::unique_ptr<protocol::Console::ConsoleMessage> result =
- protocol::Console::ConsoleMessage::create()
- .setSource(protocol::Console::ConsoleMessage::SourceEnum::ConsoleApi)
- .setLevel(level)
- .setText(m_message)
- .build();
- result->setLine(static_cast<int>(m_lineNumber));
- result->setColumn(static_cast<int>(m_columnNumber));
- result->setUrl(m_url);
- frontend->messageAdded(std::move(result));
-}
-
-std::unique_ptr<protocol::Array<protocol::Runtime::RemoteObject>> V8ConsoleMessage::wrapArguments(V8InspectorSessionImpl* session, bool generatePreview) const
-{
- if (!m_arguments.size() || !m_contextId)
- return nullptr;
- InspectedContext* inspectedContext = session->inspector()->getContext(session->contextGroupId(), m_contextId);
- if (!inspectedContext)
- return nullptr;
-
- v8::Isolate* isolate = inspectedContext->isolate();
- v8::HandleScope handles(isolate);
- v8::Local<v8::Context> context = inspectedContext->context();
-
- std::unique_ptr<protocol::Array<protocol::Runtime::RemoteObject>> args = protocol::Array<protocol::Runtime::RemoteObject>::create();
- if (m_type == ConsoleAPIType::kTable && generatePreview) {
- v8::Local<v8::Value> table = m_arguments[0]->Get(isolate);
- v8::Local<v8::Value> columns = m_arguments.size() > 1 ? m_arguments[1]->Get(isolate) : v8::Local<v8::Value>();
- std::unique_ptr<protocol::Runtime::RemoteObject> wrapped = session->wrapTable(context, table, columns);
- if (wrapped)
- args->addItem(std::move(wrapped));
- else
- args = nullptr;
- } else {
- for (size_t i = 0; i < m_arguments.size(); ++i) {
- std::unique_ptr<protocol::Runtime::RemoteObject> wrapped = session->wrapObject(context, m_arguments[i]->Get(isolate), "console", generatePreview);
- if (!wrapped) {
- args = nullptr;
- break;
- }
- args->addItem(std::move(wrapped));
- }
- }
- return args;
-}
-
-void V8ConsoleMessage::reportToFrontend(protocol::Runtime::Frontend* frontend, V8InspectorSessionImpl* session, bool generatePreview) const
-{
- if (m_origin == V8MessageOrigin::kException) {
- std::unique_ptr<protocol::Runtime::RemoteObject> exception = wrapException(session, generatePreview);
- std::unique_ptr<protocol::Runtime::ExceptionDetails> exceptionDetails = protocol::Runtime::ExceptionDetails::create()
- .setExceptionId(m_exceptionId)
- .setText(exception ? m_message : m_detailedMessage)
- .setLineNumber(m_lineNumber ? m_lineNumber - 1 : 0)
- .setColumnNumber(m_columnNumber ? m_columnNumber - 1 : 0)
- .build();
- if (m_scriptId)
- exceptionDetails->setScriptId(String16::fromInteger(m_scriptId));
- if (!m_url.isEmpty())
- exceptionDetails->setUrl(m_url);
- if (m_stackTrace)
- exceptionDetails->setStackTrace(m_stackTrace->buildInspectorObjectImpl());
- if (m_contextId)
- exceptionDetails->setExecutionContextId(m_contextId);
- if (exception)
- exceptionDetails->setException(std::move(exception));
- frontend->exceptionThrown(m_timestamp, std::move(exceptionDetails));
- return;
- }
- if (m_origin == V8MessageOrigin::kRevokedException) {
- frontend->exceptionRevoked(m_message, m_revokedExceptionId);
- return;
- }
- if (m_origin == V8MessageOrigin::kConsole) {
- std::unique_ptr<protocol::Array<protocol::Runtime::RemoteObject>> arguments = wrapArguments(session, generatePreview);
- if (!arguments) {
- arguments = protocol::Array<protocol::Runtime::RemoteObject>::create();
- if (!m_message.isEmpty()) {
- std::unique_ptr<protocol::Runtime::RemoteObject> messageArg = protocol::Runtime::RemoteObject::create().setType(protocol::Runtime::RemoteObject::TypeEnum::String).build();
- messageArg->setValue(protocol::StringValue::create(m_message));
- arguments->addItem(std::move(messageArg));
- }
- }
- frontend->consoleAPICalled(consoleAPITypeValue(m_type), std::move(arguments), m_contextId, m_timestamp, m_stackTrace ? m_stackTrace->buildInspectorObjectImpl() : nullptr);
- return;
- }
- NOTREACHED();
-}
-
-std::unique_ptr<protocol::Runtime::RemoteObject> V8ConsoleMessage::wrapException(V8InspectorSessionImpl* session, bool generatePreview) const
-{
- if (!m_arguments.size() || !m_contextId)
- return nullptr;
- DCHECK_EQ(1u, m_arguments.size());
- InspectedContext* inspectedContext = session->inspector()->getContext(session->contextGroupId(), m_contextId);
- if (!inspectedContext)
- return nullptr;
-
- v8::Isolate* isolate = inspectedContext->isolate();
- v8::HandleScope handles(isolate);
- // TODO(dgozman): should we use different object group?
- return session->wrapObject(inspectedContext->context(), m_arguments[0]->Get(isolate), "console", generatePreview);
-}
-
-V8MessageOrigin V8ConsoleMessage::origin() const
-{
- return m_origin;
-}
-
-ConsoleAPIType V8ConsoleMessage::type() const
-{
- return m_type;
-}
-
-// static
-std::unique_ptr<V8ConsoleMessage> V8ConsoleMessage::createForConsoleAPI(double timestamp, ConsoleAPIType type, const std::vector<v8::Local<v8::Value>>& arguments, std::unique_ptr<V8StackTraceImpl> stackTrace, InspectedContext* context)
-{
- std::unique_ptr<V8ConsoleMessage> message = wrapUnique(new V8ConsoleMessage(V8MessageOrigin::kConsole, timestamp, String16()));
- if (stackTrace && !stackTrace->isEmpty()) {
- message->m_url = toString16(stackTrace->topSourceURL());
- message->m_lineNumber = stackTrace->topLineNumber();
- message->m_columnNumber = stackTrace->topColumnNumber();
- }
- message->m_stackTrace = std::move(stackTrace);
- message->m_type = type;
- message->m_contextId = context->contextId();
- for (size_t i = 0; i < arguments.size(); ++i)
- message->m_arguments.push_back(wrapUnique(new v8::Global<v8::Value>(context->isolate(), arguments.at(i))));
- if (arguments.size())
- message->m_message = V8ValueStringBuilder::toString(arguments[0], context->isolate());
-
- V8ConsoleAPIType clientType = V8ConsoleAPIType::kLog;
- if (type == ConsoleAPIType::kDebug || type == ConsoleAPIType::kCount || type == ConsoleAPIType::kTimeEnd)
- clientType = V8ConsoleAPIType::kDebug;
- else if (type == ConsoleAPIType::kError || type == ConsoleAPIType::kAssert)
- clientType = V8ConsoleAPIType::kError;
- else if (type == ConsoleAPIType::kWarning)
- clientType = V8ConsoleAPIType::kWarning;
- else if (type == ConsoleAPIType::kInfo)
- clientType = V8ConsoleAPIType::kInfo;
- else if (type == ConsoleAPIType::kClear)
- clientType = V8ConsoleAPIType::kClear;
- context->inspector()->client()->consoleAPIMessage(context->contextGroupId(), clientType, toStringView(message->m_message), toStringView(message->m_url), message->m_lineNumber, message->m_columnNumber, message->m_stackTrace.get());
-
- return message;
-}
-
-// static
-std::unique_ptr<V8ConsoleMessage> V8ConsoleMessage::createForException(double timestamp, const String16& detailedMessage, const String16& url, unsigned lineNumber, unsigned columnNumber, std::unique_ptr<V8StackTraceImpl> stackTrace, int scriptId, v8::Isolate* isolate, const String16& message, int contextId, v8::Local<v8::Value> exception, unsigned exceptionId)
-{
- std::unique_ptr<V8ConsoleMessage> consoleMessage = wrapUnique(new V8ConsoleMessage(V8MessageOrigin::kException, timestamp, message));
- consoleMessage->setLocation(url, lineNumber, columnNumber, std::move(stackTrace), scriptId);
- consoleMessage->m_exceptionId = exceptionId;
- consoleMessage->m_detailedMessage = detailedMessage;
- if (contextId && !exception.IsEmpty()) {
- consoleMessage->m_contextId = contextId;
- consoleMessage->m_arguments.push_back(wrapUnique(new v8::Global<v8::Value>(isolate, exception)));
- }
- return consoleMessage;
-}
-
-// static
-std::unique_ptr<V8ConsoleMessage> V8ConsoleMessage::createForRevokedException(double timestamp, const String16& messageText, unsigned revokedExceptionId)
-{
- std::unique_ptr<V8ConsoleMessage> message = wrapUnique(new V8ConsoleMessage(V8MessageOrigin::kRevokedException, timestamp, messageText));
- message->m_revokedExceptionId = revokedExceptionId;
- return message;
-}
-
-void V8ConsoleMessage::contextDestroyed(int contextId)
-{
- if (contextId != m_contextId)
- return;
- m_contextId = 0;
- if (m_message.isEmpty())
- m_message = "<message collected>";
- Arguments empty;
- m_arguments.swap(empty);
-}
-
-// ------------------------ V8ConsoleMessageStorage ----------------------------
-
-V8ConsoleMessageStorage::V8ConsoleMessageStorage(V8InspectorImpl* inspector, int contextGroupId)
- : m_inspector(inspector)
- , m_contextGroupId(contextGroupId)
- , m_expiredCount(0)
-{
-}
-
-V8ConsoleMessageStorage::~V8ConsoleMessageStorage()
-{
- clear();
-}
-
-void V8ConsoleMessageStorage::addMessage(std::unique_ptr<V8ConsoleMessage> message)
-{
- if (message->type() == ConsoleAPIType::kClear)
- clear();
-
- V8InspectorSessionImpl* session = m_inspector->sessionForContextGroup(m_contextGroupId);
- if (session) {
- if (message->origin() == V8MessageOrigin::kConsole)
- session->consoleAgent()->messageAdded(message.get());
- session->runtimeAgent()->messageAdded(message.get());
- }
-
- DCHECK(m_messages.size() <= maxConsoleMessageCount);
- if (m_messages.size() == maxConsoleMessageCount) {
- ++m_expiredCount;
- m_messages.pop_front();
- }
- m_messages.push_back(std::move(message));
-}
-
-void V8ConsoleMessageStorage::clear()
-{
- m_messages.clear();
- m_expiredCount = 0;
- if (V8InspectorSessionImpl* session = m_inspector->sessionForContextGroup(m_contextGroupId))
- session->releaseObjectGroup("console");
-}
-
-void V8ConsoleMessageStorage::contextDestroyed(int contextId)
-{
- for (size_t i = 0; i < m_messages.size(); ++i)
- m_messages[i]->contextDestroyed(contextId);
-}
-
-} // namespace v8_inspector
« no previous file with comments | « src/inspector/V8ConsoleMessage.h ('k') | src/inspector/V8Debugger.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698