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

Unified Diff: cc/output/overlay_unittest.cc

Issue 634083002: gpu: Compositor management of GpuMemoryBuffer instances. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@cc-pre-chromium-image-refactor
Patch Set: some build fixes Created 6 years, 2 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: cc/output/overlay_unittest.cc
diff --git a/cc/output/overlay_unittest.cc b/cc/output/overlay_unittest.cc
index 698b42b0bfe89f6d19e520c6bac2579dfa787edc..7b68d15927dccd60dda1aedb3b04be298912888d 100644
--- a/cc/output/overlay_unittest.cc
+++ b/cc/output/overlay_unittest.cc
@@ -236,8 +236,15 @@ TEST(OverlayTest, OverlaysProcessorHasStrategy) {
scoped_ptr<SharedBitmapManager> shared_bitmap_manager(
new TestSharedBitmapManager());
- scoped_ptr<ResourceProvider> resource_provider(ResourceProvider::Create(
- &output_surface, shared_bitmap_manager.get(), NULL, 0, false, 1, false));
+ scoped_ptr<ResourceProvider> resource_provider(
+ ResourceProvider::Create(&output_surface,
+ shared_bitmap_manager.get(),
+ NULL,
+ NULL,
+ 0,
+ false,
+ 1,
+ false));
scoped_ptr<DefaultOverlayProcessor> overlay_processor(
new DefaultOverlayProcessor(&output_surface, resource_provider.get()));
@@ -258,6 +265,7 @@ class SingleOverlayOnTopTest : public testing::Test {
resource_provider_ = ResourceProvider::Create(output_surface_.get(),
shared_bitmap_manager_.get(),
NULL,
+ NULL,
0,
false,
1,
@@ -572,7 +580,7 @@ class GLRendererWithOverlaysTest : public testing::Test {
output_surface_.reset(new OverlayOutputSurface(provider_));
CHECK(output_surface_->BindToClient(&output_surface_client_));
resource_provider_ = ResourceProvider::Create(
- output_surface_.get(), NULL, NULL, 0, false, 1, false);
+ output_surface_.get(), NULL, NULL, NULL, 0, false, 1, false);
provider_->support()->SetScheduleOverlayPlaneCallback(base::Bind(
&MockOverlayScheduler::Schedule, base::Unretained(&scheduler_)));

Powered by Google App Engine
This is Rietveld 408576698