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

Side by Side Diff: cc/resources/tile_task_worker_pool_perftest.cc

Issue 920343003: cc: Fix crash in TileTaskWorkerPoolPerfTests. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 10 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 unified diff | Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "cc/resources/tile_task_worker_pool.h" 5 #include "cc/resources/tile_task_worker_pool.h"
6 6
7 #include "base/test/test_simple_task_runner.h" 7 #include "base/test/test_simple_task_runner.h"
8 #include "base/time/time.h" 8 #include "base/time/time.h"
9 #include "cc/debug/lap_timer.h" 9 #include "cc/debug/lap_timer.h"
10 #include "cc/output/context_provider.h" 10 #include "cc/output/context_provider.h"
(...skipping 252 matching lines...) Expand 10 before | Expand all | Expand 10 after
263 Create3dOutputSurfaceAndResourceProvider(); 263 Create3dOutputSurfaceAndResourceProvider();
264 staging_resource_pool_ = ResourcePool::Create(resource_provider_.get(), 264 staging_resource_pool_ = ResourcePool::Create(resource_provider_.get(),
265 GL_TEXTURE_2D); 265 GL_TEXTURE_2D);
266 tile_task_worker_pool_ = OneCopyTileTaskWorkerPool::Create( 266 tile_task_worker_pool_ = OneCopyTileTaskWorkerPool::Create(
267 task_runner_.get(), task_graph_runner_.get(), 267 task_runner_.get(), task_graph_runner_.get(),
268 context_provider_.get(), resource_provider_.get(), 268 context_provider_.get(), resource_provider_.get(),
269 staging_resource_pool_.get()); 269 staging_resource_pool_.get());
270 break; 270 break;
271 case TILE_TASK_WORKER_POOL_TYPE_GPU: 271 case TILE_TASK_WORKER_POOL_TYPE_GPU:
272 Create3dOutputSurfaceAndResourceProvider(); 272 Create3dOutputSurfaceAndResourceProvider();
273 rasterizer_ = GpuRasterizer::Create(
274 context_provider_.get(), resource_provider_.get(), false, false, 0);
273 tile_task_worker_pool_ = GpuTileTaskWorkerPool::Create( 275 tile_task_worker_pool_ = GpuTileTaskWorkerPool::Create(
274 task_runner_.get(), task_graph_runner_.get(), 276 task_runner_.get(), task_graph_runner_.get(),
275 static_cast<GpuRasterizer*>(rasterizer_.get())); 277 static_cast<GpuRasterizer*>(rasterizer_.get()));
276 break; 278 break;
277 case TILE_TASK_WORKER_POOL_TYPE_BITMAP: 279 case TILE_TASK_WORKER_POOL_TYPE_BITMAP:
278 CreateSoftwareOutputSurfaceAndResourceProvider(); 280 CreateSoftwareOutputSurfaceAndResourceProvider();
279 tile_task_worker_pool_ = BitmapTileTaskWorkerPool::Create( 281 tile_task_worker_pool_ = BitmapTileTaskWorkerPool::Create(
280 task_runner_.get(), task_graph_runner_.get(), 282 task_runner_.get(), task_graph_runner_.get(),
281 resource_provider_.get()); 283 resource_provider_.get());
282 break; 284 break;
(...skipping 226 matching lines...) Expand 10 before | Expand all | Expand 10 after
509 RunBuildTileTaskQueueTest("1_0", 1, 0); 511 RunBuildTileTaskQueueTest("1_0", 1, 0);
510 RunBuildTileTaskQueueTest("32_0", 32, 0); 512 RunBuildTileTaskQueueTest("32_0", 32, 0);
511 RunBuildTileTaskQueueTest("1_1", 1, 1); 513 RunBuildTileTaskQueueTest("1_1", 1, 1);
512 RunBuildTileTaskQueueTest("32_1", 32, 1); 514 RunBuildTileTaskQueueTest("32_1", 32, 1);
513 RunBuildTileTaskQueueTest("1_4", 1, 4); 515 RunBuildTileTaskQueueTest("1_4", 1, 4);
514 RunBuildTileTaskQueueTest("32_4", 32, 4); 516 RunBuildTileTaskQueueTest("32_4", 32, 4);
515 } 517 }
516 518
517 } // namespace 519 } // namespace
518 } // namespace cc 520 } // namespace cc
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698