| 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 13 matching lines...) Expand all Loading... |
| 24 class CONTENT_EXPORT SoftwareBrowserCompositorOutputSurface | 24 class CONTENT_EXPORT SoftwareBrowserCompositorOutputSurface |
| 25 : public BrowserCompositorOutputSurface { | 25 : public BrowserCompositorOutputSurface { |
| 26 public: | 26 public: |
| 27 SoftwareBrowserCompositorOutputSurface( | 27 SoftwareBrowserCompositorOutputSurface( |
| 28 scoped_refptr<BrowserCompositorOutputSurfaceProxy> surface_proxy, | 28 scoped_refptr<BrowserCompositorOutputSurfaceProxy> surface_proxy, |
| 29 scoped_ptr<cc::SoftwareOutputDevice> software_device, | 29 scoped_ptr<cc::SoftwareOutputDevice> software_device, |
| 30 int surface_id, | 30 int surface_id, |
| 31 IDMap<BrowserCompositorOutputSurface>* output_surface_map, | 31 IDMap<BrowserCompositorOutputSurface>* output_surface_map, |
| 32 const scoped_refptr<ui::CompositorVSyncManager>& vsync_manager); | 32 const scoped_refptr<ui::CompositorVSyncManager>& vsync_manager); |
| 33 | 33 |
| 34 virtual ~SoftwareBrowserCompositorOutputSurface(); | 34 ~SoftwareBrowserCompositorOutputSurface() override; |
| 35 | 35 |
| 36 private: | 36 private: |
| 37 virtual void SwapBuffers(cc::CompositorFrame* frame) override; | 37 void SwapBuffers(cc::CompositorFrame* frame) override; |
| 38 | 38 |
| 39 #if defined(OS_MACOSX) | 39 #if defined(OS_MACOSX) |
| 40 virtual void OnSurfaceDisplayed() override; | 40 void OnSurfaceDisplayed() override; |
| 41 #endif | 41 #endif |
| 42 | 42 |
| 43 // On the software path we need to explicitly call the proxy to update the | 43 // On the software path we need to explicitly call the proxy to update the |
| 44 // VSync parameters. | 44 // VSync parameters. |
| 45 scoped_refptr<BrowserCompositorOutputSurfaceProxy> output_surface_proxy_; | 45 scoped_refptr<BrowserCompositorOutputSurfaceProxy> output_surface_proxy_; |
| 46 | 46 |
| 47 DISALLOW_COPY_AND_ASSIGN(SoftwareBrowserCompositorOutputSurface); | 47 DISALLOW_COPY_AND_ASSIGN(SoftwareBrowserCompositorOutputSurface); |
| 48 }; | 48 }; |
| 49 | 49 |
| 50 } // namespace content | 50 } // namespace content |
| 51 | 51 |
| 52 #endif // CONTENT_BROWSER_COMPOSITOR_SOFTWARE_BROWSER_COMPOSITOR_OUTPUT_SURFACE
_H_ | 52 #endif // CONTENT_BROWSER_COMPOSITOR_SOFTWARE_BROWSER_COMPOSITOR_OUTPUT_SURFACE
_H_ |
| OLD | NEW |