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

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

Issue 1151943003: Revert of Add PERSISTENT_MAP usage for GpuMemoryBuffers. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 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
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 <map> 8 #include <map>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 11 matching lines...) Expand all
22 public GpuMemoryBufferFactoryHost { 22 public GpuMemoryBufferFactoryHost {
23 public: 23 public:
24 static void Initialize(bool establish_gpu_channel); 24 static void Initialize(bool establish_gpu_channel);
25 static void Terminate(); 25 static void Terminate();
26 static BrowserGpuChannelHostFactory* instance() { return instance_; } 26 static BrowserGpuChannelHostFactory* instance() { return instance_; }
27 27
28 static void EnableGpuMemoryBufferFactoryUsage( 28 static void EnableGpuMemoryBufferFactoryUsage(
29 gfx::GpuMemoryBuffer::Usage usage); 29 gfx::GpuMemoryBuffer::Usage usage);
30 static bool IsGpuMemoryBufferFactoryUsageEnabled( 30 static bool IsGpuMemoryBufferFactoryUsageEnabled(
31 gfx::GpuMemoryBuffer::Usage usage); 31 gfx::GpuMemoryBuffer::Usage usage);
32 static uint32 GetImageTextureTarget(gfx::GpuMemoryBuffer::Format format, 32 static uint32 GetImageTextureTarget();
33 gfx::GpuMemoryBuffer::Usage usage);
34 33
35 // Overridden from GpuChannelHostFactory: 34 // Overridden from GpuChannelHostFactory:
36 bool IsMainThread() override; 35 bool IsMainThread() override;
37 scoped_refptr<base::SingleThreadTaskRunner> GetIOThreadTaskRunner() override; 36 scoped_refptr<base::SingleThreadTaskRunner> GetIOThreadTaskRunner() override;
38 scoped_ptr<base::SharedMemory> AllocateSharedMemory(size_t size) override; 37 scoped_ptr<base::SharedMemory> AllocateSharedMemory(size_t size) override;
39 CreateCommandBufferResult CreateViewCommandBuffer( 38 CreateCommandBufferResult CreateViewCommandBuffer(
40 int32 surface_id, 39 int32 surface_id,
41 const GPUCreateCommandBufferConfig& init_params, 40 const GPUCreateCommandBufferConfig& init_params,
42 int32 route_id) override; 41 int32 route_id) override;
43 42
(...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after
105 CreateGpuMemoryBufferCallbackMap create_gpu_memory_buffer_requests_; 104 CreateGpuMemoryBufferCallbackMap create_gpu_memory_buffer_requests_;
106 105
107 static BrowserGpuChannelHostFactory* instance_; 106 static BrowserGpuChannelHostFactory* instance_;
108 107
109 DISALLOW_COPY_AND_ASSIGN(BrowserGpuChannelHostFactory); 108 DISALLOW_COPY_AND_ASSIGN(BrowserGpuChannelHostFactory);
110 }; 109 };
111 110
112 } // namespace content 111 } // namespace content
113 112
114 #endif // CONTENT_BROWSER_GPU_BROWSER_GPU_CHANNEL_HOST_FACTORY_H_ 113 #endif // CONTENT_BROWSER_GPU_BROWSER_GPU_CHANNEL_HOST_FACTORY_H_
OLDNEW
« no previous file with comments | « content/browser/compositor/gpu_process_transport_factory.cc ('k') | content/browser/gpu/browser_gpu_channel_host_factory.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698