| 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/macros.h" |
| 8 #include "base/memory/weak_ptr.h" | 9 #include "base/memory/weak_ptr.h" |
| 10 #include "build/build_config.h" |
| 9 #include "content/browser/compositor/browser_compositor_output_surface.h" | 11 #include "content/browser/compositor/browser_compositor_output_surface.h" |
| 10 #include "content/common/content_export.h" | 12 #include "content/common/content_export.h" |
| 11 | 13 |
| 12 namespace cc { | 14 namespace cc { |
| 13 class SoftwareOutputDevice; | 15 class SoftwareOutputDevice; |
| 14 } | 16 } |
| 15 | 17 |
| 16 namespace ui { | 18 namespace ui { |
| 17 class CompositorVSyncManager; | 19 class CompositorVSyncManager; |
| 18 } | 20 } |
| (...skipping 21 matching lines...) Expand all Loading... |
| 40 #endif | 42 #endif |
| 41 | 43 |
| 42 base::WeakPtrFactory<SoftwareBrowserCompositorOutputSurface> weak_factory_; | 44 base::WeakPtrFactory<SoftwareBrowserCompositorOutputSurface> weak_factory_; |
| 43 | 45 |
| 44 DISALLOW_COPY_AND_ASSIGN(SoftwareBrowserCompositorOutputSurface); | 46 DISALLOW_COPY_AND_ASSIGN(SoftwareBrowserCompositorOutputSurface); |
| 45 }; | 47 }; |
| 46 | 48 |
| 47 } // namespace content | 49 } // namespace content |
| 48 | 50 |
| 49 #endif // CONTENT_BROWSER_COMPOSITOR_SOFTWARE_BROWSER_COMPOSITOR_OUTPUT_SURFACE
_H_ | 51 #endif // CONTENT_BROWSER_COMPOSITOR_SOFTWARE_BROWSER_COMPOSITOR_OUTPUT_SURFACE
_H_ |
| OLD | NEW |