| 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 51 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 62 void ResizeDisplay(ui::Compositor* compositor, | 62 void ResizeDisplay(ui::Compositor* compositor, |
| 63 const gfx::Size& size) override; | 63 const gfx::Size& size) override; |
| 64 | 64 |
| 65 // ImageTransportFactory implementation. | 65 // ImageTransportFactory implementation. |
| 66 ui::ContextFactory* GetContextFactory() override; | 66 ui::ContextFactory* GetContextFactory() override; |
| 67 cc::SurfaceManager* GetSurfaceManager() override; | 67 cc::SurfaceManager* GetSurfaceManager() override; |
| 68 GLHelper* GetGLHelper() override; | 68 GLHelper* GetGLHelper() override; |
| 69 void AddObserver(ImageTransportFactoryObserver* observer) override; | 69 void AddObserver(ImageTransportFactoryObserver* observer) override; |
| 70 void RemoveObserver(ImageTransportFactoryObserver* observer) override; | 70 void RemoveObserver(ImageTransportFactoryObserver* observer) override; |
| 71 #if defined(OS_MACOSX) | 71 #if defined(OS_MACOSX) |
| 72 void OnSurfaceDisplayed(int surface_id) override; | 72 void OnGpuSwapBuffersCompleted( |
| 73 int surface_id, |
| 74 const std::vector<ui::LatencyInfo>& latency_info, |
| 75 gfx::SwapResult result) override; |
| 73 void SetCompositorSuspendedForRecycle(ui::Compositor* compositor, | 76 void SetCompositorSuspendedForRecycle(ui::Compositor* compositor, |
| 74 bool suspended) override; | 77 bool suspended) override; |
| 75 bool SurfaceShouldNotShowFramesAfterSuspendForRecycle( | 78 bool SurfaceShouldNotShowFramesAfterSuspendForRecycle( |
| 76 int surface_id) const override; | 79 int surface_id) const override; |
| 77 #endif | 80 #endif |
| 78 | 81 |
| 79 private: | 82 private: |
| 80 struct PerCompositorData; | 83 struct PerCompositorData; |
| 81 | 84 |
| 82 PerCompositorData* CreatePerCompositorData(ui::Compositor* compositor); | 85 PerCompositorData* CreatePerCompositorData(ui::Compositor* compositor); |
| (...skipping 29 matching lines...) Expand all Loading... |
| 112 IDMap<BrowserCompositorOutputSurface> output_surface_map_; | 115 IDMap<BrowserCompositorOutputSurface> output_surface_map_; |
| 113 | 116 |
| 114 base::WeakPtrFactory<GpuProcessTransportFactory> callback_factory_; | 117 base::WeakPtrFactory<GpuProcessTransportFactory> callback_factory_; |
| 115 | 118 |
| 116 DISALLOW_COPY_AND_ASSIGN(GpuProcessTransportFactory); | 119 DISALLOW_COPY_AND_ASSIGN(GpuProcessTransportFactory); |
| 117 }; | 120 }; |
| 118 | 121 |
| 119 } // namespace content | 122 } // namespace content |
| 120 | 123 |
| 121 #endif // CONTENT_BROWSER_COMPOSITOR_GPU_PROCESS_TRANSPORT_FACTORY_H_ | 124 #endif // CONTENT_BROWSER_COMPOSITOR_GPU_PROCESS_TRANSPORT_FACTORY_H_ |
| OLD | NEW |