OLD | NEW |
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_COMMON_GPU_GPU_CHANNEL_H_ | 5 #ifndef CONTENT_COMMON_GPU_GPU_CHANNEL_H_ |
6 #define CONTENT_COMMON_GPU_GPU_CHANNEL_H_ | 6 #define CONTENT_COMMON_GPU_GPU_CHANNEL_H_ |
7 | 7 |
8 #include <deque> | 8 #include <deque> |
9 #include <string> | 9 #include <string> |
10 | 10 |
(...skipping 160 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
171 | 171 |
172 void HandleUpdateValueState(unsigned int target, | 172 void HandleUpdateValueState(unsigned int target, |
173 const gpu::ValueState& state); | 173 const gpu::ValueState& state); |
174 | 174 |
175 // Visible for testing. | 175 // Visible for testing. |
176 const gpu::ValueStateMap* pending_valuebuffer_state() const { | 176 const gpu::ValueStateMap* pending_valuebuffer_state() const { |
177 return pending_valuebuffer_state_.get(); | 177 return pending_valuebuffer_state_.get(); |
178 } | 178 } |
179 | 179 |
180 // base::trace_event::MemoryDumpProvider implementation. | 180 // base::trace_event::MemoryDumpProvider implementation. |
181 bool OnMemoryDump(base::trace_event::ProcessMemoryDump* pmd) override; | 181 bool OnMemoryDump(const base::trace_event::MemoryDumpArgs& args, |
| 182 base::trace_event::ProcessMemoryDump* pmd) override; |
182 | 183 |
183 private: | 184 private: |
184 friend class GpuChannelMessageFilter; | 185 friend class GpuChannelMessageFilter; |
185 | 186 |
186 void OnDestroy(); | 187 void OnDestroy(); |
187 | 188 |
188 bool OnControlMessageReceived(const IPC::Message& msg); | 189 bool OnControlMessageReceived(const IPC::Message& msg); |
189 | 190 |
190 void HandleMessage(); | 191 void HandleMessage(); |
191 | 192 |
(...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
265 // that any WeakPtrs to Controller are invalidated before its members | 266 // that any WeakPtrs to Controller are invalidated before its members |
266 // variable's destructors are executed, rendering them invalid. | 267 // variable's destructors are executed, rendering them invalid. |
267 base::WeakPtrFactory<GpuChannel> weak_factory_; | 268 base::WeakPtrFactory<GpuChannel> weak_factory_; |
268 | 269 |
269 DISALLOW_COPY_AND_ASSIGN(GpuChannel); | 270 DISALLOW_COPY_AND_ASSIGN(GpuChannel); |
270 }; | 271 }; |
271 | 272 |
272 } // namespace content | 273 } // namespace content |
273 | 274 |
274 #endif // CONTENT_COMMON_GPU_GPU_CHANNEL_H_ | 275 #endif // CONTENT_COMMON_GPU_GPU_CHANNEL_H_ |
OLD | NEW |