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.
[email protected]
(cherry picked from commit be96700c37911fa2dd9b33053021fd1b684c6cc6)
Change-Id: Ic60700240293908e9cec1a398e1fce3775bb1e9e
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1729591
Reviewed-by: Mounir Lamouri <[email protected]>
Commit-Queue: Daniel Vogelheim <[email protected]>
Cr-Original-Commit-Position: refs/heads/master@{#682808}
Bug: 981765
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1751185
Reviewed-by: Daniel Vogelheim <[email protected]>
Cr-Commit-Position: refs/branch-heads/3865@{#345}
Cr-Branched-From: 0cdcc6158160790658d1f033d3db873603250124-refs/heads/master@{#681094}
diff --git a/third_party/blink/renderer/modules/media_controls/media_controls_impl.cc b/third_party/blink/renderer/modules/media_controls/media_controls_impl.cc
index 3ea1a9d6..ed347cb 100644
--- a/third_party/blink/renderer/modules/media_controls/media_controls_impl.cc
+++ b/third_party/blink/renderer/modules/media_controls/media_controls_impl.cc
@@ -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::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()) {
