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

Side by Side Diff: cc/trees/layer_tree_host_pixeltest_masks.cc

Issue 1186393004: gpu: Remove async texture uploads. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 5 years, 3 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
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 "build/build_config.h" 5 #include "build/build_config.h"
6 #include "cc/layers/content_layer_client.h" 6 #include "cc/layers/content_layer_client.h"
7 #include "cc/layers/picture_image_layer.h" 7 #include "cc/layers/picture_image_layer.h"
8 #include "cc/layers/picture_layer.h" 8 #include "cc/layers/picture_layer.h"
9 #include "cc/layers/solid_color_layer.h" 9 #include "cc/layers/solid_color_layer.h"
10 #include "cc/test/layer_tree_pixel_resource_test.h" 10 #include "cc/test/layer_tree_pixel_resource_test.h"
(...skipping 353 matching lines...) Expand 10 before | Expand all | Expand 10 after
364 364
365 INSTANTIATE_TEST_CASE_P(PixelResourceTest, 365 INSTANTIATE_TEST_CASE_P(PixelResourceTest,
366 LayerTreeHostMasksForBackgroundFiltersPixelTest, 366 LayerTreeHostMasksForBackgroundFiltersPixelTest,
367 ::testing::Values(SOFTWARE, 367 ::testing::Values(SOFTWARE,
368 GL_GPU_RASTER_2D_DRAW, 368 GL_GPU_RASTER_2D_DRAW,
369 GL_ONE_COPY_2D_STAGING_2D_DRAW, 369 GL_ONE_COPY_2D_STAGING_2D_DRAW,
370 GL_ONE_COPY_RECT_STAGING_2D_DRAW, 370 GL_ONE_COPY_RECT_STAGING_2D_DRAW,
371 GL_ONE_COPY_EXTERNAL_STAGING_2D_DRAW, 371 GL_ONE_COPY_EXTERNAL_STAGING_2D_DRAW,
372 GL_ZERO_COPY_2D_DRAW, 372 GL_ZERO_COPY_2D_DRAW,
373 GL_ZERO_COPY_RECT_DRAW, 373 GL_ZERO_COPY_RECT_DRAW,
374 GL_ZERO_COPY_EXTERNAL_DRAW, 374 GL_ZERO_COPY_EXTERNAL_DRAW));
375 GL_ASYNC_UPLOAD_2D_DRAW));
376 375
377 TEST_P(LayerTreeHostMasksForBackgroundFiltersPixelTest, 376 TEST_P(LayerTreeHostMasksForBackgroundFiltersPixelTest,
378 MaskOfLayerWithBackgroundFilter) { 377 MaskOfLayerWithBackgroundFilter) {
379 scoped_refptr<SolidColorLayer> background = CreateSolidColorLayer( 378 scoped_refptr<SolidColorLayer> background = CreateSolidColorLayer(
380 gfx::Rect(100, 100), SK_ColorWHITE); 379 gfx::Rect(100, 100), SK_ColorWHITE);
381 380
382 gfx::Size picture_bounds(100, 100); 381 gfx::Size picture_bounds(100, 100);
383 CheckerContentLayerClient picture_client(picture_bounds, SK_ColorGREEN, true); 382 CheckerContentLayerClient picture_client(picture_bounds, SK_ColorGREEN, true);
384 scoped_refptr<PictureLayer> picture = 383 scoped_refptr<PictureLayer> picture =
385 PictureLayer::Create(layer_settings(), &picture_client); 384 PictureLayer::Create(layer_settings(), &picture_client);
(...skipping 85 matching lines...) Expand 10 before | Expand all | Expand 10 after
471 470
472 RunPixelResourceTest(background, 471 RunPixelResourceTest(background,
473 base::FilePath( 472 base::FilePath(
474 FILE_PATH_LITERAL("mask_of_layer_with_blend.png"))); 473 FILE_PATH_LITERAL("mask_of_layer_with_blend.png")));
475 } 474 }
476 475
477 } // namespace 476 } // namespace
478 } // namespace cc 477 } // namespace cc
479 478
480 #endif // !defined(OS_ANDROID) 479 #endif // !defined(OS_ANDROID)
OLDNEW
« no previous file with comments | « cc/trees/layer_tree_host_pixeltest_blending.cc ('k') | cc/trees/layer_tree_host_pixeltest_synchronous.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698