| 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_OUTPUT_DEVICE_MAC_H_ | 5 #ifndef CONTENT_BROWSER_COMPOSITOR_SOFTWARE_OUTPUT_DEVICE_MAC_H_ |
| 6 #define CONTENT_BROWSER_COMPOSITOR_SOFTWARE_OUTPUT_DEVICE_MAC_H_ | 6 #define CONTENT_BROWSER_COMPOSITOR_SOFTWARE_OUTPUT_DEVICE_MAC_H_ |
| 7 | 7 |
| 8 #include <IOSurface/IOSurface.h> | 8 #include <IOSurface/IOSurface.h> |
| 9 | 9 |
| 10 #include "base/mac/scoped_cftyperef.h" | 10 #include "base/mac/scoped_cftyperef.h" |
| 11 #include "base/macros.h" | 11 #include "base/macros.h" |
| 12 #include "cc/output/software_output_device.h" | 12 #include "cc/output/software_output_device.h" |
| 13 #include "third_party/skia/include/core/SkRefCnt.h" | 13 #include "third_party/skia/include/core/SkRefCnt.h" |
| 14 #include "third_party/skia/include/core/SkRegion.h" | 14 #include "third_party/skia/include/core/SkRegion.h" |
| 15 #include "ui/gfx/vsync_provider.h" | 15 #include "ui/gfx/vsync_provider.h" |
| 16 | 16 |
| 17 class SkCanvas; | 17 class SkCanvas; |
| 18 | 18 |
| 19 namespace gfx { | |
| 20 class Canvas; | |
| 21 } | |
| 22 | |
| 23 namespace ui { | 19 namespace ui { |
| 24 class Compositor; | 20 class Compositor; |
| 25 } | 21 } |
| 26 | 22 |
| 27 namespace content { | 23 namespace content { |
| 28 | 24 |
| 29 class SoftwareOutputDeviceMac : | 25 class SoftwareOutputDeviceMac : |
| 30 public cc::SoftwareOutputDevice, | 26 public cc::SoftwareOutputDevice, |
| 31 public gfx::VSyncProvider { | 27 public gfx::VSyncProvider { |
| 32 public: | 28 public: |
| (...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 69 std::unique_ptr<SkCanvas> canvas_; | 65 std::unique_ptr<SkCanvas> canvas_; |
| 70 | 66 |
| 71 gfx::VSyncProvider::UpdateVSyncCallback update_vsync_callback_; | 67 gfx::VSyncProvider::UpdateVSyncCallback update_vsync_callback_; |
| 72 | 68 |
| 73 DISALLOW_COPY_AND_ASSIGN(SoftwareOutputDeviceMac); | 69 DISALLOW_COPY_AND_ASSIGN(SoftwareOutputDeviceMac); |
| 74 }; | 70 }; |
| 75 | 71 |
| 76 } // namespace content | 72 } // namespace content |
| 77 | 73 |
| 78 #endif // CONTENT_BROWSER_COMPOSITOR_SOFTWARE_OUTPUT_DEVICE_MAC_H_ | 74 #endif // CONTENT_BROWSER_COMPOSITOR_SOFTWARE_OUTPUT_DEVICE_MAC_H_ |
| OLD | NEW |