1 files changed, 8 insertions, 12 deletions
diff --git a/chromium/third_party/blink/renderer/platform/video_capture/video_capture_impl.cc b/chromium/third_party/blink/renderer/platform/video_capture/video_capture_impl.cc
index e88c93054d6..4be9b4f4f6a 100644
--- a/chromium/third_party/blink/renderer/platform/video_capture/video_capture_impl.cc
+++ b/chromium/third_party/blink/renderer/platform/video_capture/video_capture_impl.cc
@@ -17,6 +17,7 @@
 #include <utility>
 
 #include "base/bind.h"
+#include "base/bind_helpers.h"
 #include "base/macros.h"
 #include "base/stl_util.h"
 #include "base/trace_event/trace_event.h"
@@ -553,17 +554,16 @@ void VideoCaptureImpl::OnBufferReady(
         uint8_t* u_data =
             y_data + (media::VideoFrame::Rows(media::VideoFrame::kYPlane,
                                               info->pixel_format,
-                                              info->coded_size.height) *
+                                              info->coded_size.height()) *
                       info->strides->stride_by_plane[0]);
         uint8_t* v_data =
             u_data + (media::VideoFrame::Rows(media::VideoFrame::kUPlane,
                                               info->pixel_format,
-                                              info->coded_size.height) *
+                                              info->coded_size.height()) *
                       info->strides->stride_by_plane[1]);
         frame = media::VideoFrame::WrapExternalYuvData(
             info->pixel_format, gfx::Size(info->coded_size),
-            gfx::Rect(info->visible_rect),
-            gfx::Size(info->visible_rect.width, info->visible_rect.height),
+            gfx::Rect(info->visible_rect), info->visible_rect.size(),
             info->strides->stride_by_plane[0],
             info->strides->stride_by_plane[1],
             info->strides->stride_by_plane[2], y_data, u_data, v_data,
@@ -571,8 +571,7 @@ void VideoCaptureImpl::OnBufferReady(
       } else {
         frame = media::VideoFrame::WrapExternalData(
             info->pixel_format, gfx::Size(info->coded_size),
-            gfx::Rect(info->visible_rect),
-            gfx::Size(info->visible_rect.width, info->visible_rect.height),
+            gfx::Rect(info->visible_rect), info->visible_rect.size(),
             const_cast<uint8_t*>(buffer_context->data()),
             buffer_context->data_size(), info->timestamp);
       }
@@ -582,8 +581,7 @@ void VideoCaptureImpl::OnBufferReady(
       // the data without attaching the shared region to the frame.
       frame = media::VideoFrame::WrapExternalData(
           info->pixel_format, gfx::Size(info->coded_size),
-          gfx::Rect(info->visible_rect),
-          gfx::Size(info->visible_rect.width, info->visible_rect.height),
+          gfx::Rect(info->visible_rect), info->visible_rect.size(),
           const_cast<uint8_t*>(buffer_context->data()),
           buffer_context->data_size(), info->timestamp);
       break;
@@ -600,8 +598,7 @@ void VideoCaptureImpl::OnBufferReady(
       frame = media::VideoFrame::WrapNativeTextures(
           info->pixel_format, mailbox_holder_array,
           media::VideoFrame::ReleaseMailboxCB(), gfx::Size(info->coded_size),
-          gfx::Rect(info->visible_rect),
-          gfx::Size(info->visible_rect.width, info->visible_rect.height),
+          gfx::Rect(info->visible_rect), info->visible_rect.size(),
           info->timestamp);
       break;
     }
@@ -641,8 +638,7 @@ void VideoCaptureImpl::OnBufferReady(
           FROM_HERE,
           base::BindOnce(
               &BufferContext::BindBufferToTextureOnMediaThread,
-              std::move(buffer_context), base::Passed(&info),
-              base::Passed(&gmb), frame,
+              std::move(buffer_context), std::move(info), std::move(gmb), frame,
               media::BindToCurrentLoop(base::BindOnce(
                   &VideoCaptureImpl::OnVideoFrameReady,
                   weak_factory_.GetWeakPtr(), buffer_id, reference_time))));