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

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

Issue 999173004: cc: Move worker threads to content. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: comment and webview fix Created 5 years, 9 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"
11 #include "base/memory/ref_counted.h" 11 #include "base/memory/ref_counted.h"
12 #include "base/memory/scoped_ptr.h" 12 #include "base/memory/scoped_ptr.h"
13 #include "base/memory/weak_ptr.h" 13 #include "base/memory/weak_ptr.h"
14 #include "base/observer_list.h" 14 #include "base/observer_list.h"
15 #include "content/browser/compositor/image_transport_factory.h" 15 #include "content/browser/compositor/image_transport_factory.h"
16 #include "content/common/gpu/client/gpu_channel_host.h" 16 #include "content/common/gpu/client/gpu_channel_host.h"
17 #include "ui/compositor/compositor.h" 17 #include "ui/compositor/compositor.h"
18 18
19 namespace base { 19 namespace base {
20 class SimpleThread;
20 class Thread; 21 class Thread;
21 } 22 }
22 23
23 namespace cc { 24 namespace cc {
24 class SurfaceManager; 25 class SurfaceManager;
25 } 26 }
26 27
27 namespace content { 28 namespace content {
28 class BrowserCompositorOutputSurface; 29 class BrowserCompositorOutputSurface;
29 class CompositorSwapClient; 30 class CompositorSwapClient;
(...skipping 16 matching lines...) Expand all
46 void CreateOutputSurface(base::WeakPtr<ui::Compositor> compositor) override; 47 void CreateOutputSurface(base::WeakPtr<ui::Compositor> compositor) override;
47 scoped_ptr<ui::Reflector> CreateReflector(ui::Compositor* source, 48 scoped_ptr<ui::Reflector> CreateReflector(ui::Compositor* source,
48 ui::Layer* target) override; 49 ui::Layer* target) override;
49 void RemoveReflector(ui::Reflector* reflector) override; 50 void RemoveReflector(ui::Reflector* reflector) override;
50 void RemoveCompositor(ui::Compositor* compositor) override; 51 void RemoveCompositor(ui::Compositor* compositor) override;
51 scoped_refptr<cc::ContextProvider> SharedMainThreadContextProvider() override; 52 scoped_refptr<cc::ContextProvider> SharedMainThreadContextProvider() override;
52 bool DoesCreateTestContexts() override; 53 bool DoesCreateTestContexts() override;
53 uint32 GetImageTextureTarget() override; 54 uint32 GetImageTextureTarget() override;
54 cc::SharedBitmapManager* GetSharedBitmapManager() override; 55 cc::SharedBitmapManager* GetSharedBitmapManager() override;
55 gpu::GpuMemoryBufferManager* GetGpuMemoryBufferManager() override; 56 gpu::GpuMemoryBufferManager* GetGpuMemoryBufferManager() override;
57 cc::TaskGraphRunner* GetTaskGraphRunner() override;
56 scoped_ptr<cc::SurfaceIdAllocator> CreateSurfaceIdAllocator() override; 58 scoped_ptr<cc::SurfaceIdAllocator> CreateSurfaceIdAllocator() override;
57 void ResizeDisplay(ui::Compositor* compositor, 59 void ResizeDisplay(ui::Compositor* compositor,
58 const gfx::Size& size) override; 60 const gfx::Size& size) override;
59 61
60 // ImageTransportFactory implementation. 62 // ImageTransportFactory implementation.
61 ui::ContextFactory* GetContextFactory() override; 63 ui::ContextFactory* GetContextFactory() override;
62 gfx::GLSurfaceHandle GetSharedSurfaceHandle() override; 64 gfx::GLSurfaceHandle GetSharedSurfaceHandle() override;
63 cc::SurfaceManager* GetSurfaceManager() override; 65 cc::SurfaceManager* GetSurfaceManager() override;
64 GLHelper* GetGLHelper() override; 66 GLHelper* GetGLHelper() override;
65 void AddObserver(ImageTransportFactoryObserver* observer) override; 67 void AddObserver(ImageTransportFactoryObserver* observer) override;
(...skipping 18 matching lines...) Expand all
84 void OnLostMainThreadSharedContextInsideCallback(); 86 void OnLostMainThreadSharedContextInsideCallback();
85 void OnLostMainThreadSharedContext(); 87 void OnLostMainThreadSharedContext();
86 88
87 typedef std::map<ui::Compositor*, PerCompositorData*> PerCompositorDataMap; 89 typedef std::map<ui::Compositor*, PerCompositorData*> PerCompositorDataMap;
88 PerCompositorDataMap per_compositor_data_; 90 PerCompositorDataMap per_compositor_data_;
89 scoped_refptr<ContextProviderCommandBuffer> shared_main_thread_contexts_; 91 scoped_refptr<ContextProviderCommandBuffer> shared_main_thread_contexts_;
90 scoped_ptr<GLHelper> gl_helper_; 92 scoped_ptr<GLHelper> gl_helper_;
91 ObserverList<ImageTransportFactoryObserver> observer_list_; 93 ObserverList<ImageTransportFactoryObserver> observer_list_;
92 scoped_ptr<cc::SurfaceManager> surface_manager_; 94 scoped_ptr<cc::SurfaceManager> surface_manager_;
93 uint32_t next_surface_id_namespace_; 95 uint32_t next_surface_id_namespace_;
96 scoped_ptr<cc::TaskGraphRunner> task_graph_runner_;
97 scoped_ptr<base::SimpleThread> raster_thread_;
94 98
95 // The contents of this map and its methods may only be used on the compositor 99 // The contents of this map and its methods may only be used on the compositor
96 // thread. 100 // thread.
97 IDMap<BrowserCompositorOutputSurface> output_surface_map_; 101 IDMap<BrowserCompositorOutputSurface> output_surface_map_;
98 102
99 base::WeakPtrFactory<GpuProcessTransportFactory> callback_factory_; 103 base::WeakPtrFactory<GpuProcessTransportFactory> callback_factory_;
100 104
101 DISALLOW_COPY_AND_ASSIGN(GpuProcessTransportFactory); 105 DISALLOW_COPY_AND_ASSIGN(GpuProcessTransportFactory);
102 }; 106 };
103 107
104 } // namespace content 108 } // namespace content
105 109
106 #endif // CONTENT_BROWSER_COMPOSITOR_GPU_PROCESS_TRANSPORT_FACTORY_H_ 110 #endif // CONTENT_BROWSER_COMPOSITOR_GPU_PROCESS_TRANSPORT_FACTORY_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698