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

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

Issue 2120713002: Fix use_image_texture_target inconsistencies (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: cleanup Created 4 years, 5 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 "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 "base/threading/thread_task_runner_handle.h" 10 #include "base/threading/thread_task_runner_handle.h"
(...skipping 119 matching lines...) Expand 10 before | Expand all | Expand 10 after
130 std::move(compositor), std::move(worker), flipped_output_surface)); 130 std::move(compositor), std::move(worker), flipped_output_surface));
131 output_surface_->BindToClient(output_surface_client_.get()); 131 output_surface_->BindToClient(output_surface_client_.get());
132 132
133 shared_bitmap_manager_.reset(new TestSharedBitmapManager); 133 shared_bitmap_manager_.reset(new TestSharedBitmapManager);
134 gpu_memory_buffer_manager_.reset(new TestGpuMemoryBufferManager); 134 gpu_memory_buffer_manager_.reset(new TestGpuMemoryBufferManager);
135 resource_provider_ = base::MakeUnique<ResourceProvider>( 135 resource_provider_ = base::MakeUnique<ResourceProvider>(
136 output_surface_->context_provider(), shared_bitmap_manager_.get(), 136 output_surface_->context_provider(), shared_bitmap_manager_.get(),
137 gpu_memory_buffer_manager_.get(), main_thread_task_runner_.get(), 0, 1, 137 gpu_memory_buffer_manager_.get(), main_thread_task_runner_.get(), 0, 1,
138 output_surface_->capabilities().delegated_sync_points_required, 138 output_surface_->capabilities().delegated_sync_points_required,
139 settings_.renderer_settings.use_gpu_memory_buffer_resources, 139 settings_.renderer_settings.use_gpu_memory_buffer_resources,
140 settings_.use_image_texture_targets); 140 settings_.renderer_settings.use_image_texture_targets);
141 141
142 texture_mailbox_deleter_ = base::WrapUnique( 142 texture_mailbox_deleter_ = base::WrapUnique(
143 new TextureMailboxDeleter(base::ThreadTaskRunnerHandle::Get())); 143 new TextureMailboxDeleter(base::ThreadTaskRunnerHandle::Get()));
144 144
145 renderer_ = GLRenderer::Create( 145 renderer_ = GLRenderer::Create(
146 this, &settings_.renderer_settings, output_surface_.get(), 146 this, &settings_.renderer_settings, output_surface_.get(),
147 resource_provider_.get(), texture_mailbox_deleter_.get(), 0); 147 resource_provider_.get(), texture_mailbox_deleter_.get(), 0);
148 } 148 }
149 149
150 void PixelTest::ForceExpandedViewport(const gfx::Size& surface_expansion) { 150 void PixelTest::ForceExpandedViewport(const gfx::Size& surface_expansion) {
(...skipping 23 matching lines...) Expand all
174 std::unique_ptr<SoftwareOutputDevice> device( 174 std::unique_ptr<SoftwareOutputDevice> device(
175 new PixelTestSoftwareOutputDevice()); 175 new PixelTestSoftwareOutputDevice());
176 output_surface_.reset(new PixelTestOutputSurface(std::move(device))); 176 output_surface_.reset(new PixelTestOutputSurface(std::move(device)));
177 output_surface_->BindToClient(output_surface_client_.get()); 177 output_surface_->BindToClient(output_surface_client_.get());
178 shared_bitmap_manager_.reset(new TestSharedBitmapManager()); 178 shared_bitmap_manager_.reset(new TestSharedBitmapManager());
179 bool delegated_sync_points_required = false; // Meaningless for software. 179 bool delegated_sync_points_required = false; // Meaningless for software.
180 resource_provider_ = base::MakeUnique<ResourceProvider>( 180 resource_provider_ = base::MakeUnique<ResourceProvider>(
181 nullptr, shared_bitmap_manager_.get(), gpu_memory_buffer_manager_.get(), 181 nullptr, shared_bitmap_manager_.get(), gpu_memory_buffer_manager_.get(),
182 main_thread_task_runner_.get(), 0, 1, delegated_sync_points_required, 182 main_thread_task_runner_.get(), 0, 1, delegated_sync_points_required,
183 settings_.renderer_settings.use_gpu_memory_buffer_resources, 183 settings_.renderer_settings.use_gpu_memory_buffer_resources,
184 settings_.use_image_texture_targets); 184 settings_.renderer_settings.use_image_texture_targets);
185 renderer_ = SoftwareRenderer::Create( 185 renderer_ = SoftwareRenderer::Create(
186 this, &settings_.renderer_settings, output_surface_.get(), 186 this, &settings_.renderer_settings, output_surface_.get(),
187 resource_provider_.get(), true /* use_image_hijack_canvas */); 187 resource_provider_.get(), true /* use_image_hijack_canvas */);
188 } 188 }
189 189
190 } // namespace cc 190 } // namespace cc
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698