| 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 38 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 49 ui::Compositor* source, | 49 ui::Compositor* source, |
| 50 ui::Layer* target) override; | 50 ui::Layer* target) override; |
| 51 virtual void RemoveReflector( | 51 virtual void RemoveReflector( |
| 52 scoped_refptr<ui::Reflector> reflector) override; | 52 scoped_refptr<ui::Reflector> reflector) override; |
| 53 virtual void RemoveCompositor(ui::Compositor* compositor) override; | 53 virtual void RemoveCompositor(ui::Compositor* compositor) override; |
| 54 virtual scoped_refptr<cc::ContextProvider> | 54 virtual scoped_refptr<cc::ContextProvider> |
| 55 SharedMainThreadContextProvider() override; | 55 SharedMainThreadContextProvider() override; |
| 56 virtual bool DoesCreateTestContexts() override; | 56 virtual bool DoesCreateTestContexts() override; |
| 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 virtual scoped_ptr<cc::SurfaceIdAllocator> CreateSurfaceIdAllocator() |
| 60 override; |
| 59 | 61 |
| 60 // ImageTransportFactory implementation. | 62 // ImageTransportFactory implementation. |
| 61 virtual ui::ContextFactory* GetContextFactory() override; | 63 virtual ui::ContextFactory* GetContextFactory() override; |
| 62 virtual gfx::GLSurfaceHandle GetSharedSurfaceHandle() override; | 64 virtual gfx::GLSurfaceHandle GetSharedSurfaceHandle() override; |
| 63 virtual scoped_ptr<cc::SurfaceIdAllocator> CreateSurfaceIdAllocator() | |
| 64 override; | |
| 65 virtual cc::SurfaceManager* GetSurfaceManager() override; | 65 virtual cc::SurfaceManager* GetSurfaceManager() override; |
| 66 virtual GLHelper* GetGLHelper() override; | 66 virtual GLHelper* GetGLHelper() override; |
| 67 virtual void AddObserver(ImageTransportFactoryObserver* observer) override; | 67 virtual void AddObserver(ImageTransportFactoryObserver* observer) override; |
| 68 virtual void RemoveObserver( | 68 virtual void RemoveObserver( |
| 69 ImageTransportFactoryObserver* observer) override; | 69 ImageTransportFactoryObserver* observer) override; |
| 70 #if defined(OS_MACOSX) | 70 #if defined(OS_MACOSX) |
| 71 virtual void OnSurfaceDisplayed(int surface_id) override; | 71 virtual void OnSurfaceDisplayed(int surface_id) override; |
| 72 #endif | 72 #endif |
| 73 | 73 |
| 74 private: | 74 private: |
| (...skipping 22 matching lines...) Expand all Loading... |
| 97 scoped_refptr<BrowserCompositorOutputSurfaceProxy> output_surface_proxy_; | 97 scoped_refptr<BrowserCompositorOutputSurfaceProxy> output_surface_proxy_; |
| 98 | 98 |
| 99 base::WeakPtrFactory<GpuProcessTransportFactory> callback_factory_; | 99 base::WeakPtrFactory<GpuProcessTransportFactory> callback_factory_; |
| 100 | 100 |
| 101 DISALLOW_COPY_AND_ASSIGN(GpuProcessTransportFactory); | 101 DISALLOW_COPY_AND_ASSIGN(GpuProcessTransportFactory); |
| 102 }; | 102 }; |
| 103 | 103 |
| 104 } // namespace content | 104 } // namespace content |
| 105 | 105 |
| 106 #endif // CONTENT_BROWSER_COMPOSITOR_GPU_PROCESS_TRANSPORT_FACTORY_H_ | 106 #endif // CONTENT_BROWSER_COMPOSITOR_GPU_PROCESS_TRANSPORT_FACTORY_H_ |
| OLD | NEW |