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

Side by Side Diff: cc/test/layer_tree_pixel_resource_test.cc

Issue 935333002: Update from https://crrev.com/316786 (Closed) Base URL: git@github.com:domokit/mojo.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 | « cc/test/layer_test_common.cc ('k') | cc/test/layer_tree_pixel_test.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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/test/layer_tree_pixel_resource_test.h" 5 #include "cc/test/layer_tree_pixel_resource_test.h"
6 6
7 #include "cc/layers/layer.h" 7 #include "cc/layers/layer.h"
8 #include "cc/resources/bitmap_tile_task_worker_pool.h" 8 #include "cc/resources/bitmap_tile_task_worker_pool.h"
9 #include "cc/resources/gpu_rasterizer.h" 9 #include "cc/resources/gpu_rasterizer.h"
10 #include "cc/resources/gpu_tile_task_worker_pool.h" 10 #include "cc/resources/gpu_tile_task_worker_pool.h"
(...skipping 165 matching lines...) Expand 10 before | Expand all | Expand 10 after
176 break; 176 break;
177 case GPU_TILE_TASK_WORKER_POOL: 177 case GPU_TILE_TASK_WORKER_POOL:
178 EXPECT_TRUE(context_provider); 178 EXPECT_TRUE(context_provider);
179 EXPECT_EQ(PIXEL_TEST_GL, test_type_); 179 EXPECT_EQ(PIXEL_TEST_GL, test_type_);
180 *resource_pool = 180 *resource_pool =
181 ResourcePool::Create(resource_provider, 181 ResourcePool::Create(resource_provider,
182 draw_texture_target_); 182 draw_texture_target_);
183 183
184 *tile_task_worker_pool = GpuTileTaskWorkerPool::Create( 184 *tile_task_worker_pool = GpuTileTaskWorkerPool::Create(
185 task_runner, TileTaskWorkerPool::GetTaskGraphRunner(), 185 task_runner, TileTaskWorkerPool::GetTaskGraphRunner(),
186 resource_provider); 186 static_cast<GpuRasterizer*>(host_impl->rasterizer()));
187 break; 187 break;
188 case ZERO_COPY_TILE_TASK_WORKER_POOL: 188 case ZERO_COPY_TILE_TASK_WORKER_POOL:
189 EXPECT_TRUE(context_provider); 189 EXPECT_TRUE(context_provider);
190 EXPECT_EQ(PIXEL_TEST_GL, test_type_); 190 EXPECT_EQ(PIXEL_TEST_GL, test_type_);
191 EXPECT_TRUE(host_impl->GetRendererCapabilities().using_image); 191 EXPECT_TRUE(host_impl->GetRendererCapabilities().using_image);
192 *resource_pool = 192 *resource_pool =
193 ResourcePool::Create(resource_provider, draw_texture_target_); 193 ResourcePool::Create(resource_provider, draw_texture_target_);
194 194
195 *tile_task_worker_pool = ZeroCopyTileTaskWorkerPool::Create( 195 *tile_task_worker_pool = ZeroCopyTileTaskWorkerPool::Create(
196 task_runner, TileTaskWorkerPool::GetTaskGraphRunner(), 196 task_runner, TileTaskWorkerPool::GetTaskGraphRunner(),
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
232 232
233 if (layer_tree_host()) 233 if (layer_tree_host())
234 EXPECT_TRUE(layer_tree_host()->settings().impl_side_painting); 234 EXPECT_TRUE(layer_tree_host()->settings().impl_side_painting);
235 } 235 }
236 236
237 ParameterizedPixelResourceTest::ParameterizedPixelResourceTest() 237 ParameterizedPixelResourceTest::ParameterizedPixelResourceTest()
238 : LayerTreeHostPixelResourceTest(GetParam()) { 238 : LayerTreeHostPixelResourceTest(GetParam()) {
239 } 239 }
240 240
241 } // namespace cc 241 } // namespace cc
OLDNEW
« no previous file with comments | « cc/test/layer_test_common.cc ('k') | cc/test/layer_tree_pixel_test.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698