content/browser/renderer_host/media/video_capture_controller.cc - Issue 1902463002: Introduce components/display_compositor

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: content/browser/renderer_host/media/video_capture_controller.cc

Issue 1902463002: Introduce components/display_compositor (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Remove bot changes. Will do in a separate CL Created 4 years, 8 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

« no previous file with comments | « content/browser/renderer_host/media/video_capture_buffer_pool_unittest.cc ('k') | content/browser/renderer_host/render_widget_host_view_android.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/renderer_host/media/video_capture_controller.cc

diff --git a/content/browser/renderer_host/media/video_capture_controller.cc b/content/browser/renderer_host/media/video_capture_controller.cc

index bad1a51a0ca2122e474ca574e8325ff05887a4cd..f10f85ff12789ac811a95bd9193d24c5508df81c 100644

--- a/content/browser/renderer_host/media/video_capture_controller.cc

+++ b/content/browser/renderer_host/media/video_capture_controller.cc

@@ -17,7 +17,7 @@

#include "base/metrics/sparse_histogram.h"

#include "base/stl_util.h"

#include "build/build_config.h"

-#include "content/browser/compositor/gl_helper.h"

+#include "components/display_compositor/gl_helper.h"

#include "content/browser/renderer_host/media/media_stream_manager.h"

#include "content/browser/renderer_host/media/video_capture_buffer_pool.h"

#include "content/browser/renderer_host/media/video_capture_device_client.h"

@@ -47,7 +47,8 @@ static const int kInfiniteRatio = 99999;

class SyncTokenClientImpl : public VideoFrame::SyncTokenClient {

public:

- explicit SyncTokenClientImpl(GLHelper* gl_helper) : gl_helper_(gl_helper) {}

+ explicit SyncTokenClientImpl(display_compositor::GLHelper* gl_helper)

+ : gl_helper_(gl_helper) {}

~SyncTokenClientImpl() override {}

void GenerateSyncToken(gpu::SyncToken* sync_token) override {

gl_helper_->GenerateSyncToken(sync_token);

@@ -57,7 +58,7 @@ class SyncTokenClientImpl : public VideoFrame::SyncTokenClient {

}

private:

- GLHelper* gl_helper_;

+ display_compositor::GLHelper* gl_helper_;

};

void ReturnVideoFrame(const scoped_refptr<VideoFrame>& video_frame,

@@ -66,7 +67,8 @@ void ReturnVideoFrame(const scoped_refptr<VideoFrame>& video_frame,

#if defined(OS_ANDROID)

NOTREACHED();

#else

- GLHelper* gl_helper = ImageTransportFactory::GetInstance()->GetGLHelper();

+ display_compositor::GLHelper* gl_helper =

+ ImageTransportFactory::GetInstance()->GetGLHelper();

// UpdateReleaseSyncToken() creates a new sync_token using |gl_helper|, so

// wait the given |sync_token| using |gl_helper|.

if (gl_helper) {