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

Side by Side Diff: content/browser/gpu/gpu_process_host.h

Issue 2879723003: Revert of gpu: guarantee to match pending GBM buffer request to actual GBM handle (Closed)
Patch Set: Created 3 years, 7 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 | « no previous file | content/browser/gpu/gpu_process_host.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_BROWSER_GPU_GPU_PROCESS_HOST_H_ 5 #ifndef CONTENT_BROWSER_GPU_GPU_PROCESS_HOST_H_
6 #define CONTENT_BROWSER_GPU_GPU_PROCESS_HOST_H_ 6 #define CONTENT_BROWSER_GPU_GPU_PROCESS_HOST_H_
7 7
8 #include <stdint.h> 8 #include <stdint.h>
9 9
10 #include <map> 10 #include <map>
(...skipping 213 matching lines...) Expand 10 before | Expand all | Expand 10 after
224 std::string GetShaderPrefixKey(const std::string& shader); 224 std::string GetShaderPrefixKey(const std::string& shader);
225 225
226 // The serial number of the GpuProcessHost / GpuProcessHostUIShim pair. 226 // The serial number of the GpuProcessHost / GpuProcessHostUIShim pair.
227 int host_id_; 227 int host_id_;
228 228
229 // These are the channel requests that we have already sent to 229 // These are the channel requests that we have already sent to
230 // the GPU process, but haven't heard back about yet. 230 // the GPU process, but haven't heard back about yet.
231 std::queue<EstablishChannelCallback> channel_requests_; 231 std::queue<EstablishChannelCallback> channel_requests_;
232 232
233 // The pending create gpu memory buffer requests we need to reply to. 233 // The pending create gpu memory buffer requests we need to reply to.
234 base::flat_map<gfx::GpuMemoryBufferId, CreateGpuMemoryBufferCallback> 234 std::queue<CreateGpuMemoryBufferCallback> create_gpu_memory_buffer_requests_;
235 create_gpu_memory_buffer_requests_;
236 235
237 // A callback to signal the completion of a SendDestroyingVideoSurface call. 236 // A callback to signal the completion of a SendDestroyingVideoSurface call.
238 base::Closure send_destroying_video_surface_done_cb_; 237 base::Closure send_destroying_video_surface_done_cb_;
239 238
240 // Qeueud messages to send when the process launches. 239 // Qeueud messages to send when the process launches.
241 std::queue<IPC::Message*> queued_messages_; 240 std::queue<IPC::Message*> queued_messages_;
242 241
243 // Whether the GPU process is valid, set to false after Send() failed. 242 // Whether the GPU process is valid, set to false after Send() failed.
244 bool valid_; 243 bool valid_;
245 244
(...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after
298 gpu::GpuProcessHostActivityFlags activity_flags_; 297 gpu::GpuProcessHostActivityFlags activity_flags_;
299 298
300 base::WeakPtrFactory<GpuProcessHost> weak_ptr_factory_; 299 base::WeakPtrFactory<GpuProcessHost> weak_ptr_factory_;
301 300
302 DISALLOW_COPY_AND_ASSIGN(GpuProcessHost); 301 DISALLOW_COPY_AND_ASSIGN(GpuProcessHost);
303 }; 302 };
304 303
305 } // namespace content 304 } // namespace content
306 305
307 #endif // CONTENT_BROWSER_GPU_GPU_PROCESS_HOST_H_ 306 #endif // CONTENT_BROWSER_GPU_GPU_PROCESS_HOST_H_
OLDNEW
« no previous file with comments | « no previous file | content/browser/gpu/gpu_process_host.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698