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_SOFTWARE_BROWSER_COMPOSITOR_OUTPUT_SURFACE_H_ | 5 #ifndef CONTENT_BROWSER_COMPOSITOR_SOFTWARE_BROWSER_COMPOSITOR_OUTPUT_SURFACE_H_ |
6 #define CONTENT_BROWSER_COMPOSITOR_SOFTWARE_BROWSER_COMPOSITOR_OUTPUT_SURFACE_H_ | 6 #define CONTENT_BROWSER_COMPOSITOR_SOFTWARE_BROWSER_COMPOSITOR_OUTPUT_SURFACE_H_ |
7 | 7 |
8 #include "base/memory/weak_ptr.h" | 8 #include "base/memory/weak_ptr.h" |
9 #include "content/browser/compositor/browser_compositor_output_surface.h" | 9 #include "content/browser/compositor/browser_compositor_output_surface.h" |
10 #include "content/common/content_export.h" | 10 #include "content/common/content_export.h" |
(...skipping 12 matching lines...) Expand all Loading... |
23 : public BrowserCompositorOutputSurface { | 23 : public BrowserCompositorOutputSurface { |
24 public: | 24 public: |
25 SoftwareBrowserCompositorOutputSurface( | 25 SoftwareBrowserCompositorOutputSurface( |
26 scoped_ptr<cc::SoftwareOutputDevice> software_device, | 26 scoped_ptr<cc::SoftwareOutputDevice> software_device, |
27 const scoped_refptr<ui::CompositorVSyncManager>& vsync_manager); | 27 const scoped_refptr<ui::CompositorVSyncManager>& vsync_manager); |
28 | 28 |
29 ~SoftwareBrowserCompositorOutputSurface() override; | 29 ~SoftwareBrowserCompositorOutputSurface() override; |
30 | 30 |
31 private: | 31 private: |
32 void SwapBuffers(cc::CompositorFrame* frame) override; | 32 void SwapBuffers(cc::CompositorFrame* frame) override; |
| 33 void OnGpuSwapBuffersCompleted( |
| 34 const std::vector<ui::LatencyInfo>& latency_info, |
| 35 gfx::SwapResult result) override; |
33 | 36 |
34 #if defined(OS_MACOSX) | 37 #if defined(OS_MACOSX) |
35 void OnSurfaceDisplayed() override; | |
36 void SetSurfaceSuspendedForRecycle(bool suspended) override; | 38 void SetSurfaceSuspendedForRecycle(bool suspended) override; |
37 bool SurfaceShouldNotShowFramesAfterSuspendForRecycle() const override; | 39 bool SurfaceShouldNotShowFramesAfterSuspendForRecycle() const override; |
38 #endif | 40 #endif |
39 | 41 |
40 base::WeakPtrFactory<SoftwareBrowserCompositorOutputSurface> weak_factory_; | 42 base::WeakPtrFactory<SoftwareBrowserCompositorOutputSurface> weak_factory_; |
41 | 43 |
42 DISALLOW_COPY_AND_ASSIGN(SoftwareBrowserCompositorOutputSurface); | 44 DISALLOW_COPY_AND_ASSIGN(SoftwareBrowserCompositorOutputSurface); |
43 }; | 45 }; |
44 | 46 |
45 } // namespace content | 47 } // namespace content |
46 | 48 |
47 #endif // CONTENT_BROWSER_COMPOSITOR_SOFTWARE_BROWSER_COMPOSITOR_OUTPUT_SURFACE
_H_ | 49 #endif // CONTENT_BROWSER_COMPOSITOR_SOFTWARE_BROWSER_COMPOSITOR_OUTPUT_SURFACE
_H_ |
OLD | NEW |