Commit be96700c authored by Daniel Vogelheim's avatar Daniel Vogelheim Committed by Commit Bot

Remove Trusted Type calls from MediaControlsImpl.

This code was introduced in crrev.com/c/917610 and made use of the (then-new)
Trusted Types API. It turns out, that code doesn't actually work if you enable
TT (because it passes a plain string to a "trusted" API). Instead, we should
just call a lower-level built-in that doesn't do the Trusted Type check.

Change-Id: Ic60700240293908e9cec1a398e1fce3775bb1e9e
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1729591Reviewed-by: default avatarMounir Lamouri <mlamouri@chromium.org>
Commit-Queue: Daniel Vogelheim <vogelheim@chromium.org>
Cr-Commit-Position: refs/heads/master@{#682808}
parent b4ac7129
......@@ -29,7 +29,6 @@
#include "third_party/blink/public/platform/platform.h"
#include "third_party/blink/public/platform/task_type.h"
#include "third_party/blink/public/platform/web_size.h"
#include "third_party/blink/renderer/bindings/core/v8/string_or_trusted_html.h"
#include "third_party/blink/renderer/core/css/css_property_value_set.h"
#include "third_party/blink/renderer/core/dom/element_traversal.h"
#include "third_party/blink/renderer/core/dom/events/event_dispatch_forbidden_scope.h"
......@@ -601,9 +600,9 @@ void MediaControlsImpl::InitializeControls() {
void MediaControlsImpl::PopulatePanel() {
// Clear the panels.
panel_->setInnerHTML(StringOrTrustedHTML::FromString(""));
panel_->SetInnerHTMLFromString("");
if (media_button_panel_)
media_button_panel_->setInnerHTML(StringOrTrustedHTML::FromString(""));
media_button_panel_->SetInnerHTMLFromString("");
Element* button_panel = panel_;
if (ShouldShowVideoControls()) {
......
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