| OLD | NEW |
| 1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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_SURFACE_UTILS_H_ | 5 #ifndef CONTENT_BROWSER_COMPOSITOR_SURFACE_UTILS_H_ |
| 6 #define CONTENT_BROWSER_COMPOSITOR_SURFACE_UTILS_H_ | 6 #define CONTENT_BROWSER_COMPOSITOR_SURFACE_UTILS_H_ |
| 7 | 7 |
| 8 #include "base/memory/scoped_ptr.h" | 8 #include <memory> |
| 9 |
| 9 #include "content/common/content_export.h" | 10 #include "content/common/content_export.h" |
| 10 #include "content/public/browser/readback_types.h" | 11 #include "content/public/browser/readback_types.h" |
| 11 #include "third_party/skia/include/core/SkImageInfo.h" | 12 #include "third_party/skia/include/core/SkImageInfo.h" |
| 12 #include "ui/gfx/geometry/size.h" | 13 #include "ui/gfx/geometry/size.h" |
| 13 | 14 |
| 14 namespace cc { | 15 namespace cc { |
| 15 class CopyOutputResult; | 16 class CopyOutputResult; |
| 16 class SurfaceIdAllocator; | 17 class SurfaceIdAllocator; |
| 17 class SurfaceManager; | 18 class SurfaceManager; |
| 18 } // namespace cc | 19 } // namespace cc |
| 19 | 20 |
| 20 namespace content { | 21 namespace content { |
| 21 | 22 |
| 22 scoped_ptr<cc::SurfaceIdAllocator> CreateSurfaceIdAllocator(); | 23 std::unique_ptr<cc::SurfaceIdAllocator> CreateSurfaceIdAllocator(); |
| 23 | 24 |
| 24 CONTENT_EXPORT | 25 CONTENT_EXPORT |
| 25 cc::SurfaceManager* GetSurfaceManager(); | 26 cc::SurfaceManager* GetSurfaceManager(); |
| 26 | 27 |
| 27 void CopyFromCompositingSurfaceHasResult( | 28 void CopyFromCompositingSurfaceHasResult( |
| 28 const gfx::Size& dst_size_in_pixel, | 29 const gfx::Size& dst_size_in_pixel, |
| 29 const SkColorType color_type, | 30 const SkColorType color_type, |
| 30 const ReadbackRequestCallback& callback, | 31 const ReadbackRequestCallback& callback, |
| 31 scoped_ptr<cc::CopyOutputResult> result); | 32 std::unique_ptr<cc::CopyOutputResult> result); |
| 32 | 33 |
| 33 } // namespace content | 34 } // namespace content |
| 34 | 35 |
| 35 #endif // CONTENT_BROWSER_COMPOSITOR_SURFACE_UTILS_H_ | 36 #endif // CONTENT_BROWSER_COMPOSITOR_SURFACE_UTILS_H_ |
| OLD | NEW |