Commit b3bf446e authored by Mostyn Bramley-Moore's avatar Mostyn Bramley-Moore Committed by Commit Bot

[jumbo] fix kGlobalHandleLabel redefinition

Followup after https://chromium-review.googlesource.com/c/v8/v8/+/919063

Bug: chromium:811842
Cq-Include-Trybots: master.tryserver.blink:linux_trusty_blink_rel
Change-Id: I8e8a4a6d9192d39502514c5a19539965b74b1681
Reviewed-on: https://chromium-review.googlesource.com/925603Reviewed-by: 's avatarUlan Degenbaev <ulan@chromium.org>
Commit-Queue: Mostyn Bramley-Moore <mostynb@vewd.com>
Cr-Commit-Position: refs/heads/master@{#51383}
parent d97bb317
......@@ -58,7 +58,7 @@ String16 consoleAPITypeValue(ConsoleAPIType type) {
return protocol::Runtime::ConsoleAPICalled::TypeEnum::Log;
}
const char kGlobalHandleLabel[] = "DevTools console";
const char kGlobalConsoleMessageHandleLabel[] = "DevTools console";
const unsigned maxConsoleMessageCount = 1000;
const int maxConsoleMessageV8Size = 10 * 1024 * 1024;
const unsigned maxArrayItemsLimit = 10000;
......@@ -382,7 +382,7 @@ std::unique_ptr<V8ConsoleMessage> V8ConsoleMessage::createForConsoleAPI(
for (size_t i = 0; i < arguments.size(); ++i) {
std::unique_ptr<v8::Global<v8::Value>> argument(
new v8::Global<v8::Value>(isolate, arguments.at(i)));
argument->AnnotateStrongRetainer(kGlobalHandleLabel);
argument->AnnotateStrongRetainer(kGlobalConsoleMessageHandleLabel);
message->m_arguments.push_back(std::move(argument));
message->m_v8Size +=
v8::debug::EstimatedValueSize(isolate, arguments.at(i));
......
......@@ -13,7 +13,7 @@ namespace v8_inspector {
namespace {
const char hexDigits[17] = "0123456789ABCDEF";
const char kGlobalHandleLabel[] = "DevTools debugger";
const char kGlobalDebuggerScriptHandleLabel[] = "DevTools debugger";
void appendUnsignedAsHex(uint64_t number, String16Builder* destination) {
for (size_t i = 0; i < 8; ++i) {
......@@ -148,7 +148,7 @@ class ActualScript : public V8DebuggerScript {
m_isModule = script->IsModule();
m_script.Reset(m_isolate, script);
m_script.AnnotateStrongRetainer(kGlobalHandleLabel);
m_script.AnnotateStrongRetainer(kGlobalDebuggerScriptHandleLabel);
}
bool isLiveEdit() const override { return m_isLiveEdit; }
......@@ -266,7 +266,7 @@ class WasmVirtualScript : public V8DebuggerScript {
: V8DebuggerScript(isolate, std::move(id), std::move(url)),
m_script(isolate, script),
m_wasmTranslation(wasmTranslation) {
m_script.AnnotateStrongRetainer(kGlobalHandleLabel);
m_script.AnnotateStrongRetainer(kGlobalDebuggerScriptHandleLabel);
int num_lines = 0;
int last_newline = -1;
size_t next_newline = source.find('\n', last_newline + 1);
......
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