OLD | NEW |
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 46 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
57 virtual cc::SharedBitmapManager* GetSharedBitmapManager() OVERRIDE; | 57 virtual cc::SharedBitmapManager* GetSharedBitmapManager() OVERRIDE; |
58 virtual base::MessageLoopProxy* GetCompositorMessageLoop() OVERRIDE; | 58 virtual base::MessageLoopProxy* GetCompositorMessageLoop() OVERRIDE; |
59 | 59 |
60 // ImageTransportFactory implementation. | 60 // ImageTransportFactory implementation. |
61 virtual ui::ContextFactory* GetContextFactory() OVERRIDE; | 61 virtual ui::ContextFactory* GetContextFactory() OVERRIDE; |
62 virtual gfx::GLSurfaceHandle GetSharedSurfaceHandle() OVERRIDE; | 62 virtual gfx::GLSurfaceHandle GetSharedSurfaceHandle() OVERRIDE; |
63 virtual GLHelper* GetGLHelper() OVERRIDE; | 63 virtual GLHelper* GetGLHelper() OVERRIDE; |
64 virtual void AddObserver(ImageTransportFactoryObserver* observer) OVERRIDE; | 64 virtual void AddObserver(ImageTransportFactoryObserver* observer) OVERRIDE; |
65 virtual void RemoveObserver( | 65 virtual void RemoveObserver( |
66 ImageTransportFactoryObserver* observer) OVERRIDE; | 66 ImageTransportFactoryObserver* observer) OVERRIDE; |
| 67 #if defined(OS_MACOSX) |
| 68 virtual void OnSurfaceDisplayed(int surface_id) OVERRIDE; |
| 69 #endif |
67 | 70 |
68 private: | 71 private: |
69 struct PerCompositorData; | 72 struct PerCompositorData; |
70 | 73 |
71 PerCompositorData* CreatePerCompositorData(ui::Compositor* compositor); | 74 PerCompositorData* CreatePerCompositorData(ui::Compositor* compositor); |
72 scoped_ptr<WebGraphicsContext3DCommandBufferImpl> | 75 scoped_ptr<WebGraphicsContext3DCommandBufferImpl> |
73 CreateContextCommon(int surface_id); | 76 CreateContextCommon(int surface_id); |
74 | 77 |
75 void OnLostMainThreadSharedContextInsideCallback(); | 78 void OnLostMainThreadSharedContextInsideCallback(); |
76 void OnLostMainThreadSharedContext(); | 79 void OnLostMainThreadSharedContext(); |
(...skipping 12 matching lines...) Expand all Loading... |
89 IDMap<BrowserCompositorOutputSurface> output_surface_map_; | 92 IDMap<BrowserCompositorOutputSurface> output_surface_map_; |
90 | 93 |
91 scoped_refptr<BrowserCompositorOutputSurfaceProxy> output_surface_proxy_; | 94 scoped_refptr<BrowserCompositorOutputSurfaceProxy> output_surface_proxy_; |
92 | 95 |
93 DISALLOW_COPY_AND_ASSIGN(GpuProcessTransportFactory); | 96 DISALLOW_COPY_AND_ASSIGN(GpuProcessTransportFactory); |
94 }; | 97 }; |
95 | 98 |
96 } // namespace content | 99 } // namespace content |
97 | 100 |
98 #endif // CONTENT_BROWSER_COMPOSITOR_GPU_PROCESS_TRANSPORT_FACTORY_H_ | 101 #endif // CONTENT_BROWSER_COMPOSITOR_GPU_PROCESS_TRANSPORT_FACTORY_H_ |
OLD | NEW |