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

Unified Diff: cc/test/layer_tree_pixel_resource_test.cc

Issue 1063493002: cc: Remove all traces of synchronous GPU rasterization (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: merge Created 5 years, 9 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/test/layer_tree_pixel_resource_test.h ('k') | cc/test/layer_tree_test.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/test/layer_tree_pixel_resource_test.cc
diff --git a/cc/test/layer_tree_pixel_resource_test.cc b/cc/test/layer_tree_pixel_resource_test.cc
index 2e1295308bbbeb7775e1d5da6d86a9ae8fb90313..025cffd603df086e1139db42498d809766c3d00b 100644
--- a/cc/test/layer_tree_pixel_resource_test.cc
+++ b/cc/test/layer_tree_pixel_resource_test.cc
@@ -11,7 +11,6 @@
#include "cc/resources/one_copy_tile_task_worker_pool.h"
#include "cc/resources/pixel_buffer_tile_task_worker_pool.h"
#include "cc/resources/resource_pool.h"
-#include "cc/resources/software_rasterizer.h"
#include "cc/resources/tile_task_worker_pool.h"
#include "cc/resources/zero_copy_tile_task_worker_pool.h"
#include "cc/test/fake_output_surface.h"
@@ -125,27 +124,6 @@ void LayerTreeHostPixelResourceTest::InitializeFromTestCase(
NOTREACHED();
}
-scoped_ptr<Rasterizer> LayerTreeHostPixelResourceTest::CreateRasterizer(
- LayerTreeHostImpl* host_impl) {
- bool use_distance_field_text = false;
- ContextProvider* context_provider =
- host_impl->output_surface()->context_provider();
- ResourceProvider* resource_provider = host_impl->resource_provider();
- switch (resource_pool_option_) {
- case BITMAP_TILE_TASK_WORKER_POOL:
- case ZERO_COPY_TILE_TASK_WORKER_POOL:
- case ONE_COPY_TILE_TASK_WORKER_POOL:
- case PIXEL_BUFFER_TILE_TASK_WORKER_POOL:
- return SoftwareRasterizer::Create();
- case GPU_TILE_TASK_WORKER_POOL:
- EXPECT_TRUE(context_provider);
- return GpuRasterizer::Create(context_provider, resource_provider,
- use_distance_field_text, false, 0);
- }
- NOTREACHED();
- return nullptr;
-}
-
void LayerTreeHostPixelResourceTest::CreateResourceAndTileTaskWorkerPool(
LayerTreeHostImpl* host_impl,
scoped_ptr<TileTaskWorkerPool>* tile_task_worker_pool,
@@ -181,8 +159,8 @@ void LayerTreeHostPixelResourceTest::CreateResourceAndTileTaskWorkerPool(
draw_texture_target_);
*tile_task_worker_pool = GpuTileTaskWorkerPool::Create(
- task_runner, task_graph_runner(),
- static_cast<GpuRasterizer*>(host_impl->rasterizer()));
+ task_runner, task_graph_runner(), context_provider, resource_provider,
+ false, 0);
break;
case ZERO_COPY_TILE_TASK_WORKER_POOL:
EXPECT_TRUE(context_provider);
« no previous file with comments | « cc/test/layer_tree_pixel_resource_test.h ('k') | cc/test/layer_tree_test.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698