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

Side by Side Diff: content/gpu/in_process_gpu_thread.cc

Issue 1389133002: content: Use type-parameterized tests for GpuMemoryBuffer implementations. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: add blankline Created 5 years, 2 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 | « content/gpu/gpu_main.cc ('k') | content/test/gpu_memory_buffer_factory_test_template.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 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 "content/gpu/in_process_gpu_thread.h" 5 #include "content/gpu/in_process_gpu_thread.h"
6 6
7 #include "content/common/gpu/gpu_memory_buffer_factory.h" 7 #include "content/common/gpu/gpu_memory_buffer_factory.h"
8 #include "content/gpu/gpu_child_thread.h" 8 #include "content/gpu/gpu_child_thread.h"
9 #include "content/gpu/gpu_process.h" 9 #include "content/gpu/gpu_process.h"
10 #include "gpu/command_buffer/service/sync_point_manager.h" 10 #include "gpu/command_buffer/service/sync_point_manager.h"
11 11
12 namespace content { 12 namespace content {
13 13
14 InProcessGpuThread::InProcessGpuThread( 14 InProcessGpuThread::InProcessGpuThread(
15 const InProcessChildThreadParams& params, 15 const InProcessChildThreadParams& params,
16 gpu::SyncPointManager* sync_point_manager_override) 16 gpu::SyncPointManager* sync_point_manager_override)
17 : base::Thread("Chrome_InProcGpuThread"), 17 : base::Thread("Chrome_InProcGpuThread"),
18 params_(params), 18 params_(params),
19 gpu_process_(NULL), 19 gpu_process_(NULL),
20 sync_point_manager_override_(sync_point_manager_override), 20 sync_point_manager_override_(sync_point_manager_override),
21 gpu_memory_buffer_factory_(GpuMemoryBufferFactory::Create( 21 gpu_memory_buffer_factory_(
22 GpuChildThread::GetGpuMemoryBufferFactoryType())) { 22 GpuMemoryBufferFactory::GetNativeType() != gfx::EMPTY_BUFFER
23 ? GpuMemoryBufferFactory::CreateNativeType()
24 : nullptr) {
23 if (!sync_point_manager_override_) { 25 if (!sync_point_manager_override_) {
24 sync_point_manager_.reset(new gpu::SyncPointManager(false)); 26 sync_point_manager_.reset(new gpu::SyncPointManager(false));
25 sync_point_manager_override_ = sync_point_manager_.get(); 27 sync_point_manager_override_ = sync_point_manager_.get();
26 } 28 }
27 } 29 }
28 30
29 InProcessGpuThread::~InProcessGpuThread() { 31 InProcessGpuThread::~InProcessGpuThread() {
30 Stop(); 32 Stop();
31 } 33 }
32 34
33 void InProcessGpuThread::Init() { 35 void InProcessGpuThread::Init() {
34 gpu_process_ = new GpuProcess(); 36 gpu_process_ = new GpuProcess();
35 // The process object takes ownership of the thread object, so do not 37 // The process object takes ownership of the thread object, so do not
36 // save and delete the pointer. 38 // save and delete the pointer.
37 gpu_process_->set_main_thread(new GpuChildThread( 39 gpu_process_->set_main_thread(new GpuChildThread(
38 params_, gpu_memory_buffer_factory_.get(), sync_point_manager_override_)); 40 params_, gpu_memory_buffer_factory_.get(), sync_point_manager_override_));
39 } 41 }
40 42
41 void InProcessGpuThread::CleanUp() { 43 void InProcessGpuThread::CleanUp() {
42 SetThreadWasQuitProperly(true); 44 SetThreadWasQuitProperly(true);
43 delete gpu_process_; 45 delete gpu_process_;
44 } 46 }
45 47
46 base::Thread* CreateInProcessGpuThread( 48 base::Thread* CreateInProcessGpuThread(
47 const InProcessChildThreadParams& params) { 49 const InProcessChildThreadParams& params) {
48 return new InProcessGpuThread(params, nullptr); 50 return new InProcessGpuThread(params, nullptr);
49 } 51 }
50 52
51 } // namespace content 53 } // namespace content
OLDNEW
« no previous file with comments | « content/gpu/gpu_main.cc ('k') | content/test/gpu_memory_buffer_factory_test_template.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698