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

Side by Side Diff: content/browser/renderer_host/context_provider_factory_impl_android.h

Issue 2684933003: Move frame_sink_id management to framesink_manager.cc/h from (Closed)
Patch Set: Created 3 years, 10 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 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 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_RENDERER_HOST_CONTEXT_PROVIDER_FACTORY_IMPL_ANDROID_H_ 5 #ifndef CONTENT_BROWSER_RENDERER_HOST_CONTEXT_PROVIDER_FACTORY_IMPL_ANDROID_H_
6 #define CONTENT_BROWSER_RENDERER_HOST_CONTEXT_PROVIDER_FACTORY_IMPL_ANDROID_H_ 6 #define CONTENT_BROWSER_RENDERER_HOST_CONTEXT_PROVIDER_FACTORY_IMPL_ANDROID_H_
7 7
8 #include <queue> 8 #include <queue>
9 9
10 #include "base/macros.h" 10 #include "base/macros.h"
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after
55 void RequestGpuChannelHost(GpuChannelHostCallback callback) override; 55 void RequestGpuChannelHost(GpuChannelHostCallback callback) override;
56 scoped_refptr<cc::ContextProvider> CreateOffscreenContextProvider( 56 scoped_refptr<cc::ContextProvider> CreateOffscreenContextProvider(
57 ContextType context_type, 57 ContextType context_type,
58 gpu::SharedMemoryLimits shared_memory_limits, 58 gpu::SharedMemoryLimits shared_memory_limits,
59 gpu::gles2::ContextCreationAttribHelper attributes, 59 gpu::gles2::ContextCreationAttribHelper attributes,
60 bool support_locking, 60 bool support_locking,
61 bool automatic_flushes, 61 bool automatic_flushes,
62 cc::ContextProvider* shared_context_provider, 62 cc::ContextProvider* shared_context_provider,
63 scoped_refptr<gpu::GpuChannelHost> gpu_channel_host) override; 63 scoped_refptr<gpu::GpuChannelHost> gpu_channel_host) override;
64 cc::SurfaceManager* GetSurfaceManager() override; 64 cc::SurfaceManager* GetSurfaceManager() override;
65 cc::FrameSinkManager* GetFrameSinkManager() override;
65 cc::FrameSinkId AllocateFrameSinkId() override; 66 cc::FrameSinkId AllocateFrameSinkId() override;
66 gpu::GpuMemoryBufferManager* GetGpuMemoryBufferManager() override; 67 gpu::GpuMemoryBufferManager* GetGpuMemoryBufferManager() override;
67 68
68 private: 69 private:
69 ContextProviderFactoryImpl( 70 ContextProviderFactoryImpl(
70 gpu::GpuChannelEstablishFactory* gpu_channel_factory); 71 gpu::GpuChannelEstablishFactory* gpu_channel_factory);
71 72
72 scoped_refptr<cc::ContextProvider> CreateContextProviderInternal( 73 scoped_refptr<cc::ContextProvider> CreateContextProviderInternal(
73 ui::command_buffer_metrics::ContextType context_type, 74 ui::command_buffer_metrics::ContextType context_type,
74 gpu::SurfaceHandle surface_handle, 75 gpu::SurfaceHandle surface_handle,
(...skipping 22 matching lines...) Expand all
97 98
98 scoped_refptr<cc::VulkanContextProvider> shared_vulkan_context_provider_; 99 scoped_refptr<cc::VulkanContextProvider> shared_vulkan_context_provider_;
99 100
100 bool in_handle_pending_requests_; 101 bool in_handle_pending_requests_;
101 102
102 bool in_shutdown_; 103 bool in_shutdown_;
103 104
104 base::OneShotTimer establish_gpu_channel_timeout_; 105 base::OneShotTimer establish_gpu_channel_timeout_;
105 106
106 std::unique_ptr<cc::SurfaceManager> surface_manager_; 107 std::unique_ptr<cc::SurfaceManager> surface_manager_;
108 std::unique_ptr<cc::FrameSinkManager> framesink_manager_;
107 uint32_t next_sink_id_; 109 uint32_t next_sink_id_;
108 110
109 base::WeakPtrFactory<ContextProviderFactoryImpl> weak_factory_; 111 base::WeakPtrFactory<ContextProviderFactoryImpl> weak_factory_;
110 112
111 DISALLOW_COPY_AND_ASSIGN(ContextProviderFactoryImpl); 113 DISALLOW_COPY_AND_ASSIGN(ContextProviderFactoryImpl);
112 }; 114 };
113 115
114 } // namespace content 116 } // namespace content
115 117
116 #endif // CONTENT_BROWSER_RENDERER_HOST_CONTEXT_PROVIDER_FACTORY_IMPL_ANDROID_H _ 118 #endif // CONTENT_BROWSER_RENDERER_HOST_CONTEXT_PROVIDER_FACTORY_IMPL_ANDROID_H _
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698