content/browser/renderer_host/media/video_capture_buffer_pool_unittest.cc - Issue 1904773004: Revert of 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_buffer_pool_unittest.cc

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

Patch Set: 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/delegated_frame_host.cc ('k') | content/browser/renderer_host/media/video_capture_controller.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index 28c00339396e69fbac61ce96236a5f21ccb29fe1..cb867b5900f39904e8dd60ca3dd8dc9aa7f06f4d 100644

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

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

@@ -22,7 +22,7 @@

#include "build/build_config.h"

#include "cc/test/test_context_provider.h"

#include "cc/test/test_web_graphics_context_3d.h"

-#include "components/display_compositor/buffer_queue.h"

+#include "content/browser/compositor/buffer_queue.h"

#include "content/browser/gpu/browser_gpu_memory_buffer_manager.h"

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

#include "media/base/video_frame.h"

@@ -113,7 +113,7 @@

return base::WrapUnique(new MockGpuMemoryBuffer(size));

}

};

- class MockBufferQueue : public display_compositor::BufferQueue {

+ class MockBufferQueue : public BufferQueue {

public:

MockBufferQueue(scoped_refptr<cc::ContextProvider> context_provider,

BrowserGpuMemoryBufferManager* gpu_memory_buffer_manager,