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

Unified Diff: cc/resources/raster_worker_pool_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: rebase 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
« no previous file with comments | « cc/resources/raster_worker_pool_perftest.cc ('k') | cc/resources/resource_provider.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/resources/raster_worker_pool_unittest.cc
diff --git a/cc/resources/raster_worker_pool_unittest.cc b/cc/resources/raster_worker_pool_unittest.cc
index 3c39c05b0ef4426bac0c34421b544c68fc6e7ac6..7b14eaa685ce56fe5274e89f85d24b253bb5952c 100644
--- a/cc/resources/raster_worker_pool_unittest.cc
+++ b/cc/resources/raster_worker_pool_unittest.cc
@@ -22,6 +22,7 @@
#include "cc/resources/zero_copy_raster_worker_pool.h"
#include "cc/test/fake_output_surface.h"
#include "cc/test/fake_output_surface_client.h"
+#include "cc/test/test_gpu_memory_buffer_manager.h"
#include "cc/test/test_shared_bitmap_manager.h"
#include "cc/test/test_web_graphics_context_3d.h"
#include "testing/gtest/include/gtest/gtest.h"
@@ -269,9 +270,14 @@ class RasterWorkerPoolTest
CHECK(output_surface_->BindToClient(&output_surface_client_));
TestWebGraphicsContext3D* context3d = context_provider_->TestContext3d();
context3d->set_support_sync_query(true);
- resource_provider_ =
- ResourceProvider::Create(
- output_surface_.get(), NULL, NULL, 0, false, 1, false).Pass();
+ resource_provider_ = ResourceProvider::Create(output_surface_.get(),
+ NULL,
+ &gpu_memory_buffer_manager_,
+ NULL,
+ 0,
+ false,
+ 1,
+ false).Pass();
}
void CreateSoftwareOutputSurfaceAndResourceProvider() {
@@ -281,6 +287,7 @@ class RasterWorkerPoolTest
resource_provider_ = ResourceProvider::Create(output_surface_.get(),
&shared_bitmap_manager_,
NULL,
+ NULL,
0,
false,
1,
@@ -309,6 +316,7 @@ class RasterWorkerPoolTest
scoped_ptr<ResourceProvider> resource_provider_;
scoped_ptr<ResourcePool> staging_resource_pool_;
scoped_ptr<RasterWorkerPool> raster_worker_pool_;
+ TestGpuMemoryBufferManager gpu_memory_buffer_manager_;
TestSharedBitmapManager shared_bitmap_manager_;
base::CancelableClosure timeout_;
int timeout_seconds_;
@@ -334,7 +342,6 @@ TEST_P(RasterWorkerPoolTest, FailedMapResource) {
return;
TestWebGraphicsContext3D* context3d = context_provider_->TestContext3d();
- context3d->set_times_map_image_chromium_succeeds(0);
context3d->set_times_map_buffer_chromium_succeeds(0);
AppendTask(0u);
ScheduleTasks();
« no previous file with comments | « cc/resources/raster_worker_pool_perftest.cc ('k') | cc/resources/resource_provider.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698