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

Side by Side Diff: content/gpu/gpu_child_thread.h

Issue 1716813002: Use GpuPreferences to avoid directly accessing switches in gpu related code (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Update Created 4 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
« no previous file with comments | « content/common/gpu/gpu_command_buffer_stub.cc ('k') | content/gpu/gpu_child_thread.cc » ('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 (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 #ifndef CONTENT_GPU_GPU_CHILD_THREAD_H_ 5 #ifndef CONTENT_GPU_GPU_CHILD_THREAD_H_
6 #define CONTENT_GPU_GPU_CHILD_THREAD_H_ 6 #define CONTENT_GPU_GPU_CHILD_THREAD_H_
7 7
8 #include <stdint.h> 8 #include <stdint.h>
9 9
10 #include <queue> 10 #include <queue>
11 #include <string> 11 #include <string>
12 12
13 #include "base/command_line.h" 13 #include "base/command_line.h"
14 #include "base/macros.h" 14 #include "base/macros.h"
15 #include "base/memory/ref_counted.h" 15 #include "base/memory/ref_counted.h"
16 #include "base/memory/scoped_ptr.h" 16 #include "base/memory/scoped_ptr.h"
17 #include "base/time/time.h" 17 #include "base/time/time.h"
18 #include "build/build_config.h" 18 #include "build/build_config.h"
19 #include "content/child/child_thread_impl.h" 19 #include "content/child/child_thread_impl.h"
20 #include "content/common/gpu/gpu_channel.h" 20 #include "content/common/gpu/gpu_channel.h"
21 #include "content/common/gpu/gpu_channel_manager.h" 21 #include "content/common/gpu/gpu_channel_manager.h"
22 #include "content/common/gpu/gpu_channel_manager_delegate.h" 22 #include "content/common/gpu/gpu_channel_manager_delegate.h"
23 #include "content/common/gpu/gpu_config.h" 23 #include "content/common/gpu/gpu_config.h"
24 #include "content/common/gpu/x_util.h" 24 #include "content/common/gpu/x_util.h"
25 #include "content/common/process_control.mojom.h" 25 #include "content/common/process_control.mojom.h"
26 #include "gpu/command_buffer/service/gpu_preferences.h"
26 #include "gpu/config/gpu_info.h" 27 #include "gpu/config/gpu_info.h"
27 #include "mojo/public/cpp/bindings/binding_set.h" 28 #include "mojo/public/cpp/bindings/binding_set.h"
28 #include "mojo/public/cpp/bindings/interface_request.h" 29 #include "mojo/public/cpp/bindings/interface_request.h"
29 #include "ui/gfx/native_widget_types.h" 30 #include "ui/gfx/native_widget_types.h"
30 31
31 namespace gpu { 32 namespace gpu {
32 class SyncPointManager; 33 class SyncPointManager;
33 } 34 }
34 35
35 namespace sandbox { 36 namespace sandbox {
(...skipping 14 matching lines...) Expand all
50 public: 51 public:
51 typedef std::queue<IPC::Message*> DeferredMessages; 52 typedef std::queue<IPC::Message*> DeferredMessages;
52 53
53 GpuChildThread(GpuWatchdogThread* gpu_watchdog_thread, 54 GpuChildThread(GpuWatchdogThread* gpu_watchdog_thread,
54 bool dead_on_arrival, 55 bool dead_on_arrival,
55 const gpu::GPUInfo& gpu_info, 56 const gpu::GPUInfo& gpu_info,
56 const DeferredMessages& deferred_messages, 57 const DeferredMessages& deferred_messages,
57 GpuMemoryBufferFactory* gpu_memory_buffer_factory, 58 GpuMemoryBufferFactory* gpu_memory_buffer_factory,
58 gpu::SyncPointManager* sync_point_manager); 59 gpu::SyncPointManager* sync_point_manager);
59 60
60 GpuChildThread(const InProcessChildThreadParams& params, 61 GpuChildThread(const gpu::GpuPreferences& gpu_preferences,
62 const InProcessChildThreadParams& params,
61 GpuMemoryBufferFactory* gpu_memory_buffer_factory, 63 GpuMemoryBufferFactory* gpu_memory_buffer_factory,
62 gpu::SyncPointManager* sync_point_manager); 64 gpu::SyncPointManager* sync_point_manager);
63 65
64 ~GpuChildThread() override; 66 ~GpuChildThread() override;
65 67
66 void Shutdown() override; 68 void Shutdown() override;
67 69
68 void Init(const base::Time& process_start_time); 70 void Init(const base::Time& process_start_time);
69 void StopWatchdog(); 71 void StopWatchdog();
70 72
73 static gpu::GpuPreferences GetGpuPreferencesFromCommandLine();
74
75 private:
71 // ChildThread overrides. 76 // ChildThread overrides.
72 bool Send(IPC::Message* msg) override; 77 bool Send(IPC::Message* msg) override;
73 bool OnControlMessageReceived(const IPC::Message& msg) override; 78 bool OnControlMessageReceived(const IPC::Message& msg) override;
74 bool OnMessageReceived(const IPC::Message& msg) override; 79 bool OnMessageReceived(const IPC::Message& msg) override;
75 80
76 private:
77 // GpuChannelManagerDelegate implementation. 81 // GpuChannelManagerDelegate implementation.
78 void AddSubscription(int32_t client_id, unsigned int target) override; 82 void AddSubscription(int32_t client_id, unsigned int target) override;
79 void ChannelEstablished(const IPC::ChannelHandle& channel_handle) override; 83 void ChannelEstablished(const IPC::ChannelHandle& channel_handle) override;
80 void DidCreateOffscreenContext(const GURL& active_url) override; 84 void DidCreateOffscreenContext(const GURL& active_url) override;
81 void DidDestroyChannel(int client_id) override; 85 void DidDestroyChannel(int client_id) override;
82 void DidDestroyOffscreenContext(const GURL& active_url) override; 86 void DidDestroyOffscreenContext(const GURL& active_url) override;
83 void DidLoseContext(bool offscreen, 87 void DidLoseContext(bool offscreen,
84 gpu::error::ContextLostReason reason, 88 gpu::error::ContextLostReason reason,
85 const GURL& active_url) override; 89 const GURL& active_url) override;
86 void GpuMemoryUmaStats(const GPUMemoryUmaStats& params) override; 90 void GpuMemoryUmaStats(const GPUMemoryUmaStats& params) override;
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
124 unsigned int target, 128 unsigned int target,
125 const gpu::ValueState& state); 129 const gpu::ValueState& state);
126 #if defined(OS_ANDROID) 130 #if defined(OS_ANDROID)
127 void OnWakeUpGpu(); 131 void OnWakeUpGpu();
128 #endif 132 #endif
129 void OnLoseAllContexts(); 133 void OnLoseAllContexts();
130 134
131 void BindProcessControlRequest( 135 void BindProcessControlRequest(
132 mojo::InterfaceRequest<ProcessControl> request); 136 mojo::InterfaceRequest<ProcessControl> request);
133 137
138 gpu::GpuPreferences gpu_preferences_;
139
134 // Set this flag to true if a fatal error occurred before we receive the 140 // Set this flag to true if a fatal error occurred before we receive the
135 // OnInitialize message, in which case we just declare ourselves DOA. 141 // OnInitialize message, in which case we just declare ourselves DOA.
136 bool dead_on_arrival_; 142 bool dead_on_arrival_;
137 base::Time process_start_time_; 143 base::Time process_start_time_;
138 scoped_refptr<GpuWatchdogThread> watchdog_thread_; 144 scoped_refptr<GpuWatchdogThread> watchdog_thread_;
139 145
140 #if defined(OS_WIN) 146 #if defined(OS_WIN)
141 // Windows specific client sandbox interface. 147 // Windows specific client sandbox interface.
142 sandbox::TargetServices* target_services_; 148 sandbox::TargetServices* target_services_;
143 #endif 149 #endif
(...skipping 20 matching lines...) Expand all
164 170
165 // Bindings to the ProcessControl impl. 171 // Bindings to the ProcessControl impl.
166 mojo::BindingSet<ProcessControl> process_control_bindings_; 172 mojo::BindingSet<ProcessControl> process_control_bindings_;
167 173
168 DISALLOW_COPY_AND_ASSIGN(GpuChildThread); 174 DISALLOW_COPY_AND_ASSIGN(GpuChildThread);
169 }; 175 };
170 176
171 } // namespace content 177 } // namespace content
172 178
173 #endif // CONTENT_GPU_GPU_CHILD_THREAD_H_ 179 #endif // CONTENT_GPU_GPU_CHILD_THREAD_H_
OLDNEW
« no previous file with comments | « content/common/gpu/gpu_command_buffer_stub.cc ('k') | content/gpu/gpu_child_thread.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698