BASELINE: Update Chromium to 96.0.4664.181

Change-Id: I762cd1da89d73aa6313b4a753fe126c34833f046
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>

1 files changed, 11 insertions, 6 deletions

diff --git a/chromium/media/mojo/services/media_foundation_renderer_wrapper.cc b/chromium/media/mojo/services/media_foundation_renderer_wrapper.cc
index 698941ed74b..9cb3dd5f2a1 100644
--- a/chromium/media/mojo/services/media_foundation_renderer_wrapper.cc
+++ b/chromium/media/mojo/services/media_foundation_renderer_wrapper.cc
@@ -7,6 +7,7 @@
 #include "base/callback_helpers.h"
 #include "media/base/win/mf_helpers.h"
 #include "media/mojo/mojom/renderer_extensions.mojom.h"
+#include "media/mojo/services/mojo_media_log.h"
 #include "mojo/public/cpp/bindings/callback_helpers.h"
 #include "mojo/public/cpp/system/platform_handle.h"
 
@@ -31,11 +32,13 @@ bool HasAudio(MediaResource* media_resource) {
 MediaFoundationRendererWrapper::MediaFoundationRendererWrapper(
     scoped_refptr<base::SequencedTaskRunner> task_runner,
     mojom::FrameInterfaceFactory* frame_interfaces,
+    mojo::PendingRemote<mojom::MediaLog> media_log_remote,
     mojo::PendingReceiver<RendererExtension> renderer_extension_receiver)
     : frame_interfaces_(frame_interfaces),
       renderer_(std::make_unique<MediaFoundationRenderer>(
-          std::move(task_runner),
-          /*force_dcomp_mode_for_testing=*/false)),
+          task_runner,
+          std::make_unique<MojoMediaLog>(std::move(media_log_remote),
+                                         task_runner))),
       renderer_extension_receiver_(this,
                                    std::move(renderer_extension_receiver)),
       site_mute_observer_(this) {
@@ -95,7 +98,8 @@ base::TimeDelta MediaFoundationRendererWrapper::GetMediaTime() {
 void MediaFoundationRendererWrapper::GetDCOMPSurface(
     GetDCOMPSurfaceCallback callback) {
   if (has_get_dcomp_surface_called_) {
-    mojo::ReportBadMessage("GetDCOMPSurface should only be called once!");
+    renderer_extension_receiver_.ReportBadMessage(
+        "GetDCOMPSurface should only be called once!");
     return;
   }
 
@@ -109,9 +113,10 @@ void MediaFoundationRendererWrapper::SetVideoStreamEnabled(bool enabled) {
   renderer_->SetVideoStreamEnabled(enabled);
 }
 
-void MediaFoundationRendererWrapper::SetOutputParams(
-    const gfx::Rect& output_rect) {
-  renderer_->SetOutputParams(output_rect);
+void MediaFoundationRendererWrapper::SetOutputRect(
+    const gfx::Rect& output_rect,
+    SetOutputRectCallback callback) {
+  renderer_->SetOutputRect(output_rect, std::move(callback));
 }
 
 void MediaFoundationRendererWrapper::OnMuteStateChange(bool muted) {