Commit 2dbad8b4 authored by Alfonso Castaño's avatar Alfonso Castaño Committed by Commit Bot

Custom stringification for Trusted Type objects in Blink (ThreadDebugger)

Since V8 and Renderer CL cannot be glued a separate CL includes the changes to V8:
https://chromium-review.googlesource.com/c/v8/v8/+/2494706

Screenshot: https://i.imgur.com/rTIchch.png, https://i.imgur.com/knMTmMm.png
Bug: chromium:1048143
Change-Id: I59ba1735b83da3eac328cff31dd1729ec3b16e80
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2494761
Commit-Queue: Alfonso Castaño <alcastano@google.com>
Reviewed-by: default avatarDaniel Vogelheim <vogelheim@chromium.org>
Reviewed-by: default avatarSigurd Schneider <sigurds@chromium.org>
Cr-Commit-Position: refs/heads/master@{#821213}
parent 27bcd807
......@@ -21,6 +21,9 @@
#include "third_party/blink/renderer/bindings/core/v8/v8_node.h"
#include "third_party/blink/renderer/bindings/core/v8/v8_node_list.h"
#include "third_party/blink/renderer/bindings/core/v8/v8_script_runner.h"
#include "third_party/blink/renderer/bindings/core/v8/v8_trusted_html.h"
#include "third_party/blink/renderer/bindings/core/v8/v8_trusted_script.h"
#include "third_party/blink/renderer/bindings/core/v8/v8_trusted_script_url.h"
#include "third_party/blink/renderer/core/frame/local_dom_window.h"
#include "third_party/blink/renderer/core/inspector/console_message.h"
#include "third_party/blink/renderer/core/inspector/inspector_dom_debugger_agent.h"
......@@ -166,6 +169,8 @@ std::unique_ptr<v8_inspector::StringBuffer> ThreadDebugger::valueSubtype(
static const char kArray[] = "array";
static const char kError[] = "error";
static const char kBlob[] = "blob";
static const char kTrustedType[] = "trustedtype";
if (V8Node::HasInstance(value, isolate_))
return ToV8InspectorStringBuffer(kNode);
if (V8NodeList::HasInstance(value, isolate_) ||
......@@ -178,6 +183,11 @@ std::unique_ptr<v8_inspector::StringBuffer> ThreadDebugger::valueSubtype(
return ToV8InspectorStringBuffer(kError);
if (V8Blob::HasInstance(value, isolate_))
return ToV8InspectorStringBuffer(kBlob);
if (V8TrustedHTML::HasInstance(value, isolate_) ||
V8TrustedScript::HasInstance(value, isolate_) ||
V8TrustedScriptURL::HasInstance(value, isolate_)) {
return ToV8InspectorStringBuffer(kTrustedType);
}
return nullptr;
}
......
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