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

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

Issue 202763002: Switch to use SharedBitmapManager all the time in cc_unittests (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 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 unified diff | Download patch | Annotate | Revision Log
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/test/pixel_test.h" 5 #include "cc/test/pixel_test.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/path_service.h" 8 #include "base/path_service.h"
9 #include "base/run_loop.h" 9 #include "base/run_loop.h"
10 #include "cc/base/switches.h" 10 #include "cc/base/switches.h"
11 #include "cc/output/compositor_frame_metadata.h" 11 #include "cc/output/compositor_frame_metadata.h"
12 #include "cc/output/copy_output_request.h" 12 #include "cc/output/copy_output_request.h"
13 #include "cc/output/copy_output_result.h" 13 #include "cc/output/copy_output_result.h"
14 #include "cc/output/gl_renderer.h" 14 #include "cc/output/gl_renderer.h"
15 #include "cc/output/output_surface_client.h" 15 #include "cc/output/output_surface_client.h"
16 #include "cc/output/software_renderer.h" 16 #include "cc/output/software_renderer.h"
17 #include "cc/resources/resource_provider.h" 17 #include "cc/resources/resource_provider.h"
18 #include "cc/resources/texture_mailbox_deleter.h" 18 #include "cc/resources/texture_mailbox_deleter.h"
19 #include "cc/test/fake_output_surface_client.h" 19 #include "cc/test/fake_output_surface_client.h"
20 #include "cc/test/paths.h" 20 #include "cc/test/paths.h"
21 #include "cc/test/pixel_test_output_surface.h" 21 #include "cc/test/pixel_test_output_surface.h"
22 #include "cc/test/pixel_test_software_output_device.h" 22 #include "cc/test/pixel_test_software_output_device.h"
23 #include "cc/test/pixel_test_utils.h" 23 #include "cc/test/pixel_test_utils.h"
24 #include "cc/test/test_in_process_context_provider.h" 24 #include "cc/test/test_in_process_context_provider.h"
25 #include "cc/test/test_shared_bitmap_manager.h"
25 #include "testing/gtest/include/gtest/gtest.h" 26 #include "testing/gtest/include/gtest/gtest.h"
26 27
27 namespace cc { 28 namespace cc {
28 29
29 PixelTest::PixelTest() 30 PixelTest::PixelTest()
30 : device_viewport_size_(gfx::Size(200, 200)), 31 : device_viewport_size_(gfx::Size(200, 200)),
31 disable_picture_quad_image_filtering_(false), 32 disable_picture_quad_image_filtering_(false),
32 output_surface_client_(new FakeOutputSurfaceClient) {} 33 output_surface_client_(new FakeOutputSurfaceClient) {}
33 34
34 PixelTest::~PixelTest() {} 35 PixelTest::~PixelTest() {}
(...skipping 78 matching lines...) Expand 10 before | Expand all | Expand 10 after
113 *result_bitmap_, test_data_dir.Append(ref_file), comparator); 114 *result_bitmap_, test_data_dir.Append(ref_file), comparator);
114 } 115 }
115 116
116 void PixelTest::SetUpGLRenderer(bool use_skia_gpu_backend) { 117 void PixelTest::SetUpGLRenderer(bool use_skia_gpu_backend) {
117 enable_pixel_output_.reset(new gfx::DisableNullDrawGLBindings); 118 enable_pixel_output_.reset(new gfx::DisableNullDrawGLBindings);
118 119
119 output_surface_.reset( 120 output_surface_.reset(
120 new PixelTestOutputSurface(new TestInProcessContextProvider)); 121 new PixelTestOutputSurface(new TestInProcessContextProvider));
121 output_surface_->BindToClient(output_surface_client_.get()); 122 output_surface_->BindToClient(output_surface_client_.get());
122 123
123 resource_provider_ = 124 shared_bitmap_manager_.reset(new TestSharedBitmapManager());
124 ResourceProvider::Create(output_surface_.get(), NULL, 0, false, 1); 125 resource_provider_ = ResourceProvider::Create(
126 output_surface_.get(), shared_bitmap_manager_.get(), 0, false, 1);
125 127
126 texture_mailbox_deleter_ = make_scoped_ptr(new TextureMailboxDeleter); 128 texture_mailbox_deleter_ = make_scoped_ptr(new TextureMailboxDeleter);
127 129
128 renderer_ = GLRenderer::Create(this, 130 renderer_ = GLRenderer::Create(this,
129 &settings_, 131 &settings_,
130 output_surface_.get(), 132 output_surface_.get(),
131 resource_provider_.get(), 133 resource_provider_.get(),
132 texture_mailbox_deleter_.get(), 134 texture_mailbox_deleter_.get(),
133 0).PassAs<DirectRenderer>(); 135 0).PassAs<DirectRenderer>();
134 } 136 }
(...skipping 18 matching lines...) Expand all
153 155
154 void PixelTest::EnableExternalStencilTest() { 156 void PixelTest::EnableExternalStencilTest() {
155 static_cast<PixelTestOutputSurface*>(output_surface_.get()) 157 static_cast<PixelTestOutputSurface*>(output_surface_.get())
156 ->set_has_external_stencil_test(true); 158 ->set_has_external_stencil_test(true);
157 } 159 }
158 160
159 void PixelTest::SetUpSoftwareRenderer() { 161 void PixelTest::SetUpSoftwareRenderer() {
160 scoped_ptr<SoftwareOutputDevice> device(new PixelTestSoftwareOutputDevice()); 162 scoped_ptr<SoftwareOutputDevice> device(new PixelTestSoftwareOutputDevice());
161 output_surface_.reset(new PixelTestOutputSurface(device.Pass())); 163 output_surface_.reset(new PixelTestOutputSurface(device.Pass()));
162 output_surface_->BindToClient(output_surface_client_.get()); 164 output_surface_->BindToClient(output_surface_client_.get());
163 resource_provider_ = 165 shared_bitmap_manager_.reset(new TestSharedBitmapManager());
164 ResourceProvider::Create(output_surface_.get(), NULL, 0, false, 1); 166 resource_provider_ = ResourceProvider::Create(
165 renderer_ = SoftwareRenderer::Create( 167 output_surface_.get(), shared_bitmap_manager_.get(), 0, false, 1);
166 this, &settings_, output_surface_.get(), resource_provider_.get()) 168 renderer_ =
167 .PassAs<DirectRenderer>(); 169 SoftwareRenderer::Create(
170 this, &settings_, output_surface_.get(), resource_provider_.get())
171 .PassAs<DirectRenderer>();
168 } 172 }
169 173
170 } // namespace cc 174 } // namespace cc
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698