Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1240)

Unified Diff: content/browser/renderer_host/browser_compositor_view_mac.mm

Issue 2702093002: Consistent CopyFromSurface() API, consolidated to RWHV (Closed)
Patch Set: REBASE Created 3 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: content/browser/renderer_host/browser_compositor_view_mac.mm
diff --git a/content/browser/renderer_host/browser_compositor_view_mac.mm b/content/browser/renderer_host/browser_compositor_view_mac.mm
index 3e3776bd3e142d72713f4b1a633a705d62519bfc..e4c25e739a89797e5c9d0e4342addcc1067f49e9 100644
--- a/content/browser/renderer_host/browser_compositor_view_mac.mm
+++ b/content/browser/renderer_host/browser_compositor_view_mac.mm
@@ -14,6 +14,7 @@
#include "content/browser/renderer_host/resize_lock.h"
#include "content/public/browser/browser_thread.h"
#include "content/public/browser/context_factory.h"
+#include "media/base/video_frame.h"
#include "ui/accelerated_widget_mac/accelerated_widget_mac.h"
#include "ui/accelerated_widget_mac/window_resize_helper_mac.h"
#include "ui/base/layout.h"
@@ -253,7 +254,7 @@ void BrowserCompositorMac::CopyToVideoFrameCompleted(
void BrowserCompositorMac::CopyFromCompositingSurfaceToVideoFrame(
const gfx::Rect& src_subrect,
- const scoped_refptr<media::VideoFrame>& target,
+ scoped_refptr<media::VideoFrame> target,
const base::Callback<void(const gfx::Rect&, bool)>& callback) {
DCHECK(delegated_frame_host_);
DCHECK(state_ == HasAttachedCompositor);
@@ -264,7 +265,7 @@ void BrowserCompositorMac::CopyFromCompositingSurfaceToVideoFrame(
weak_factory_.GetWeakPtr(), callback);
delegated_frame_host_->CopyFromCompositingSurfaceToVideoFrame(
- src_subrect, target, callback_with_decrement);
+ src_subrect, std::move(target), callback_with_decrement);
}
void BrowserCompositorMac::SwapCompositorFrame(
« no previous file with comments | « content/browser/renderer_host/browser_compositor_view_mac.h ('k') | content/browser/renderer_host/delegated_frame_host.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698