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

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

Issue 542083002: content: Move all GpuMemoryBuffer allocation to IO thread. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: address review feedback Created 6 years, 3 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/browser_gpu_channel_host_factory.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_BROWSER_GPU_CHANNEL_HOST_FACTORY_H_ 5 #ifndef CONTENT_BROWSER_GPU_BROWSER_GPU_CHANNEL_HOST_FACTORY_H_
6 #define CONTENT_BROWSER_GPU_BROWSER_GPU_CHANNEL_HOST_FACTORY_H_ 6 #define CONTENT_BROWSER_GPU_BROWSER_GPU_CHANNEL_HOST_FACTORY_H_
7 7
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/memory/ref_counted.h" 10 #include "base/memory/ref_counted.h"
(...skipping 21 matching lines...) Expand all
32 virtual CreateCommandBufferResult CreateViewCommandBuffer( 32 virtual CreateCommandBufferResult CreateViewCommandBuffer(
33 int32 surface_id, 33 int32 surface_id,
34 const GPUCreateCommandBufferConfig& init_params, 34 const GPUCreateCommandBufferConfig& init_params,
35 int32 route_id) OVERRIDE; 35 int32 route_id) OVERRIDE;
36 virtual scoped_ptr<gfx::GpuMemoryBuffer> AllocateGpuMemoryBuffer( 36 virtual scoped_ptr<gfx::GpuMemoryBuffer> AllocateGpuMemoryBuffer(
37 size_t width, 37 size_t width,
38 size_t height, 38 size_t height,
39 unsigned internalformat, 39 unsigned internalformat,
40 unsigned usage) OVERRIDE; 40 unsigned usage) OVERRIDE;
41 virtual void DeleteGpuMemoryBuffer( 41 virtual void DeleteGpuMemoryBuffer(
42 scoped_ptr<gfx::GpuMemoryBuffer> buffer) OVERRIDE {} 42 scoped_ptr<gfx::GpuMemoryBuffer> buffer) OVERRIDE;
43 43
44 // GpuMemoryBufferFactoryHost implementation. 44 // GpuMemoryBufferFactoryHost implementation.
45 virtual void CreateGpuMemoryBuffer( 45 virtual void CreateGpuMemoryBuffer(
46 const gfx::GpuMemoryBufferHandle& handle, 46 const gfx::GpuMemoryBufferHandle& handle,
47 const gfx::Size& size, 47 const gfx::Size& size,
48 unsigned internalformat, 48 unsigned internalformat,
49 unsigned usage, 49 unsigned usage,
50 const CreateGpuMemoryBufferCallback& callback) OVERRIDE; 50 const CreateGpuMemoryBufferCallback& callback) OVERRIDE;
51 virtual void DestroyGpuMemoryBuffer(const gfx::GpuMemoryBufferHandle& handle, 51 virtual void DestroyGpuMemoryBuffer(const gfx::GpuMemoryBufferHandle& handle,
52 int32 sync_point) OVERRIDE; 52 int32 sync_point) OVERRIDE;
(...skipping 12 matching lines...) Expand all
65 void EstablishGpuChannel(CauseForGpuLaunch cause_for_gpu_launch, 65 void EstablishGpuChannel(CauseForGpuLaunch cause_for_gpu_launch,
66 const base::Closure& callback); 66 const base::Closure& callback);
67 GpuChannelHost* GetGpuChannel(); 67 GpuChannelHost* GetGpuChannel();
68 int GetGpuChannelId() { return gpu_client_id_; } 68 int GetGpuChannelId() { return gpu_client_id_; }
69 69
70 // Used to skip GpuChannelHost tests when there can be no GPU process. 70 // Used to skip GpuChannelHost tests when there can be no GPU process.
71 static bool CanUseForTesting(); 71 static bool CanUseForTesting();
72 72
73 private: 73 private:
74 struct CreateRequest; 74 struct CreateRequest;
75 struct AllocateGpuMemoryBufferRequest;
75 class EstablishRequest; 76 class EstablishRequest;
76 77
77 BrowserGpuChannelHostFactory(); 78 BrowserGpuChannelHostFactory();
78 virtual ~BrowserGpuChannelHostFactory(); 79 virtual ~BrowserGpuChannelHostFactory();
79 80
80 void GpuChannelEstablished(); 81 void GpuChannelEstablished();
81 void CreateViewCommandBufferOnIO( 82 void CreateViewCommandBufferOnIO(
82 CreateRequest* request, 83 CreateRequest* request,
83 int32 surface_id, 84 int32 surface_id,
84 const GPUCreateCommandBufferConfig& init_params); 85 const GPUCreateCommandBufferConfig& init_params);
85 static void CommandBufferCreatedOnIO(CreateRequest* request, 86 static void CommandBufferCreatedOnIO(CreateRequest* request,
86 CreateCommandBufferResult result); 87 CreateCommandBufferResult result);
87 static void AddFilterOnIO(int gpu_host_id, 88 static void AddFilterOnIO(int gpu_host_id,
88 scoped_refptr<IPC::MessageFilter> filter); 89 scoped_refptr<IPC::MessageFilter> filter);
89 90 static void AllocateGpuMemoryBufferOnIO(
90 void CreateGpuMemoryBufferOnIO(const gfx::GpuMemoryBufferHandle& handle, 91 AllocateGpuMemoryBufferRequest* request);
91 const gfx::Size& size, 92 static void DeleteGpuMemoryBufferOnIO(
92 unsigned internalformat, 93 scoped_ptr<gfx::GpuMemoryBuffer> buffer);
93 unsigned usage, 94 void OnGpuMemoryBufferCreated(uint32 request_id,
94 uint32 request_id); 95 const gfx::GpuMemoryBufferHandle& handle);
95 void GpuMemoryBufferCreatedOnIO(
96 uint32 request_id,
97 const gfx::GpuMemoryBufferHandle& handle);
98 void OnGpuMemoryBufferCreated(
99 uint32 request_id,
100 const gfx::GpuMemoryBufferHandle& handle);
101 void DestroyGpuMemoryBufferOnIO(const gfx::GpuMemoryBufferHandle& handle,
102 int32 sync_point);
103 96
104 const int gpu_client_id_; 97 const int gpu_client_id_;
105 scoped_ptr<base::WaitableEvent> shutdown_event_; 98 scoped_ptr<base::WaitableEvent> shutdown_event_;
106 scoped_refptr<GpuChannelHost> gpu_channel_; 99 scoped_refptr<GpuChannelHost> gpu_channel_;
107 int gpu_host_id_; 100 int gpu_host_id_;
108 scoped_refptr<EstablishRequest> pending_request_; 101 scoped_refptr<EstablishRequest> pending_request_;
109 std::vector<base::Closure> established_callbacks_; 102 std::vector<base::Closure> established_callbacks_;
110
111 uint32 next_create_gpu_memory_buffer_request_id_; 103 uint32 next_create_gpu_memory_buffer_request_id_;
112 typedef std::map<uint32, CreateGpuMemoryBufferCallback> 104 typedef std::map<uint32, CreateGpuMemoryBufferCallback>
113 CreateGpuMemoryBufferCallbackMap; 105 CreateGpuMemoryBufferCallbackMap;
114 CreateGpuMemoryBufferCallbackMap create_gpu_memory_buffer_requests_; 106 CreateGpuMemoryBufferCallbackMap create_gpu_memory_buffer_requests_;
115 107
116 static BrowserGpuChannelHostFactory* instance_; 108 static BrowserGpuChannelHostFactory* instance_;
117 109
118 DISALLOW_COPY_AND_ASSIGN(BrowserGpuChannelHostFactory); 110 DISALLOW_COPY_AND_ASSIGN(BrowserGpuChannelHostFactory);
119 }; 111 };
120 112
121 } // namespace content 113 } // namespace content
122 114
123 #endif // CONTENT_BROWSER_GPU_BROWSER_GPU_CHANNEL_HOST_FACTORY_H_ 115 #endif // CONTENT_BROWSER_GPU_BROWSER_GPU_CHANNEL_HOST_FACTORY_H_
OLDNEW
« no previous file with comments | « no previous file | content/browser/gpu/browser_gpu_channel_host_factory.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698