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

Side by Side Diff: cc/trees/layer_tree_host_pixeltest_synchronous.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 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 "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/fake_content_layer_client.h" 10 #include "cc/test/fake_content_layer_client.h"
11 #include "cc/test/layer_tree_pixel_test.h" 11 #include "cc/test/layer_tree_pixel_test.h"
12 #include "cc/test/pixel_comparator.h" 12 #include "cc/test/pixel_comparator.h"
13 13
14 #if !defined(OS_ANDROID) 14 #if !defined(OS_ANDROID)
15 15
16 namespace cc { 16 namespace cc {
17 namespace { 17 namespace {
18 18
19 class LayerTreeHostSynchronousPixelTest : public LayerTreePixelTest { 19 class LayerTreeHostSynchronousPixelTest : public LayerTreePixelTest {
20 public: 20 public:
21 void InitializeSettings(LayerTreeSettings* settings) override { 21 void InitializeSettings(LayerTreeSettings* settings) override {
22 LayerTreePixelTest::InitializeSettings(settings); 22 LayerTreePixelTest::InitializeSettings(settings);
23 settings->single_thread_proxy_scheduler = false; 23 settings->single_thread_proxy_scheduler = false;
24 settings->use_zero_copy = true; 24 settings->use_zero_copy = true;
25 settings->use_one_copy = false;
26 } 25 }
27 26
28 void BeginTest() override { 27 void BeginTest() override {
29 LayerTreePixelTest::BeginTest(); 28 LayerTreePixelTest::BeginTest();
30 PostCompositeImmediatelyToMainThread(); 29 PostCompositeImmediatelyToMainThread();
31 } 30 }
32 }; 31 };
33 32
34 TEST_F(LayerTreeHostSynchronousPixelTest, OneContentLayer) { 33 TEST_F(LayerTreeHostSynchronousPixelTest, OneContentLayer) {
35 gfx::Size bounds(200, 200); 34 gfx::Size bounds(200, 200);
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
75 root->SetIsDrawable(true); 74 root->SetIsDrawable(true);
76 75
77 RunSingleThreadedPixelTest(PIXEL_TEST_GL, root, 76 RunSingleThreadedPixelTest(PIXEL_TEST_GL, root,
78 base::FilePath(FILE_PATH_LITERAL("green.png"))); 77 base::FilePath(FILE_PATH_LITERAL("green.png")));
79 } 78 }
80 79
81 } // namespace 80 } // namespace
82 } // namespace cc 81 } // namespace cc
83 82
84 #endif // OS_ANDROID 83 #endif // OS_ANDROID
OLDNEW
« no previous file with comments | « cc/trees/layer_tree_host_pixeltest_masks.cc ('k') | cc/trees/layer_tree_host_pixeltest_tiles.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698