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

Side by Side Diff: content/browser/compositor/gpu_process_transport_factory.h

Issue 943763004: cc: Remove the unused compositor thread variable and interface. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: compositorthread: . Created 5 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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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_COMPOSITOR_GPU_PROCESS_TRANSPORT_FACTORY_H_ 5 #ifndef CONTENT_BROWSER_COMPOSITOR_GPU_PROCESS_TRANSPORT_FACTORY_H_
6 #define CONTENT_BROWSER_COMPOSITOR_GPU_PROCESS_TRANSPORT_FACTORY_H_ 6 #define CONTENT_BROWSER_COMPOSITOR_GPU_PROCESS_TRANSPORT_FACTORY_H_
7 7
8 #include <map> 8 #include <map>
9 9
10 #include "base/id_map.h" 10 #include "base/id_map.h"
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
47 void CreateOutputSurface(base::WeakPtr<ui::Compositor> compositor, 47 void CreateOutputSurface(base::WeakPtr<ui::Compositor> compositor,
48 bool software_fallback) override; 48 bool software_fallback) override;
49 scoped_refptr<ui::Reflector> CreateReflector(ui::Compositor* source, 49 scoped_refptr<ui::Reflector> CreateReflector(ui::Compositor* source,
50 ui::Layer* target) override; 50 ui::Layer* target) override;
51 void RemoveReflector(scoped_refptr<ui::Reflector> reflector) override; 51 void RemoveReflector(scoped_refptr<ui::Reflector> reflector) override;
52 void RemoveCompositor(ui::Compositor* compositor) override; 52 void RemoveCompositor(ui::Compositor* compositor) override;
53 scoped_refptr<cc::ContextProvider> SharedMainThreadContextProvider() override; 53 scoped_refptr<cc::ContextProvider> SharedMainThreadContextProvider() override;
54 bool DoesCreateTestContexts() override; 54 bool DoesCreateTestContexts() override;
55 cc::SharedBitmapManager* GetSharedBitmapManager() override; 55 cc::SharedBitmapManager* GetSharedBitmapManager() override;
56 gpu::GpuMemoryBufferManager* GetGpuMemoryBufferManager() override; 56 gpu::GpuMemoryBufferManager* GetGpuMemoryBufferManager() override;
57 base::MessageLoopProxy* GetCompositorMessageLoop() override;
58 scoped_ptr<cc::SurfaceIdAllocator> CreateSurfaceIdAllocator() override; 57 scoped_ptr<cc::SurfaceIdAllocator> CreateSurfaceIdAllocator() override;
59 void ResizeDisplay(ui::Compositor* compositor, 58 void ResizeDisplay(ui::Compositor* compositor,
60 const gfx::Size& size) override; 59 const gfx::Size& size) override;
61 60
62 // ImageTransportFactory implementation. 61 // ImageTransportFactory implementation.
63 ui::ContextFactory* GetContextFactory() override; 62 ui::ContextFactory* GetContextFactory() override;
64 gfx::GLSurfaceHandle GetSharedSurfaceHandle() override; 63 gfx::GLSurfaceHandle GetSharedSurfaceHandle() override;
65 cc::SurfaceManager* GetSurfaceManager() override; 64 cc::SurfaceManager* GetSurfaceManager() override;
66 GLHelper* GetGLHelper() override; 65 GLHelper* GetGLHelper() override;
67 void AddObserver(ImageTransportFactoryObserver* observer) override; 66 void AddObserver(ImageTransportFactoryObserver* observer) override;
(...skipping 11 matching lines...) Expand all
79 void EstablishedGpuChannel(base::WeakPtr<ui::Compositor> compositor, 78 void EstablishedGpuChannel(base::WeakPtr<ui::Compositor> compositor,
80 bool create_software_renderer); 79 bool create_software_renderer);
81 scoped_ptr<WebGraphicsContext3DCommandBufferImpl> CreateContextCommon( 80 scoped_ptr<WebGraphicsContext3DCommandBufferImpl> CreateContextCommon(
82 scoped_refptr<GpuChannelHost> gpu_channel_host, 81 scoped_refptr<GpuChannelHost> gpu_channel_host,
83 int surface_id); 82 int surface_id);
84 83
85 void OnLostMainThreadSharedContextInsideCallback(); 84 void OnLostMainThreadSharedContextInsideCallback();
86 void OnLostMainThreadSharedContext(); 85 void OnLostMainThreadSharedContext();
87 86
88 typedef std::map<ui::Compositor*, PerCompositorData*> PerCompositorDataMap; 87 typedef std::map<ui::Compositor*, PerCompositorData*> PerCompositorDataMap;
89 scoped_ptr<base::Thread> compositor_thread_;
90 PerCompositorDataMap per_compositor_data_; 88 PerCompositorDataMap per_compositor_data_;
91 scoped_refptr<ContextProviderCommandBuffer> shared_main_thread_contexts_; 89 scoped_refptr<ContextProviderCommandBuffer> shared_main_thread_contexts_;
92 scoped_ptr<GLHelper> gl_helper_; 90 scoped_ptr<GLHelper> gl_helper_;
93 ObserverList<ImageTransportFactoryObserver> observer_list_; 91 ObserverList<ImageTransportFactoryObserver> observer_list_;
94 scoped_ptr<cc::SurfaceManager> surface_manager_; 92 scoped_ptr<cc::SurfaceManager> surface_manager_;
95 uint32_t next_surface_id_namespace_; 93 uint32_t next_surface_id_namespace_;
96 94
97 // The contents of this map and its methods may only be used on the compositor 95 // The contents of this map and its methods may only be used on the compositor
98 // thread. 96 // thread.
99 IDMap<BrowserCompositorOutputSurface> output_surface_map_; 97 IDMap<BrowserCompositorOutputSurface> output_surface_map_;
100 98
101 scoped_refptr<BrowserCompositorOutputSurfaceProxy> output_surface_proxy_; 99 scoped_refptr<BrowserCompositorOutputSurfaceProxy> output_surface_proxy_;
102 100
103 base::WeakPtrFactory<GpuProcessTransportFactory> callback_factory_; 101 base::WeakPtrFactory<GpuProcessTransportFactory> callback_factory_;
104 102
105 DISALLOW_COPY_AND_ASSIGN(GpuProcessTransportFactory); 103 DISALLOW_COPY_AND_ASSIGN(GpuProcessTransportFactory);
106 }; 104 };
107 105
108 } // namespace content 106 } // namespace content
109 107
110 #endif // CONTENT_BROWSER_COMPOSITOR_GPU_PROCESS_TRANSPORT_FACTORY_H_ 108 #endif // CONTENT_BROWSER_COMPOSITOR_GPU_PROCESS_TRANSPORT_FACTORY_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698