| 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 UI_ANDROID_RESOURCES_CRUSHED_SPRITE_RESOURCE_H_ | 5 #ifndef UI_ANDROID_RESOURCES_CRUSHED_SPRITE_RESOURCE_H_ |
| 6 #define UI_ANDROID_RESOURCES_CRUSHED_SPRITE_RESOURCE_H_ | 6 #define UI_ANDROID_RESOURCES_CRUSHED_SPRITE_RESOURCE_H_ |
| 7 | 7 |
| 8 #include <memory> |
| 8 #include <utility> | 9 #include <utility> |
| 9 #include <vector> | 10 #include <vector> |
| 10 | 11 |
| 11 #include "base/macros.h" | 12 #include "base/macros.h" |
| 12 #include "base/memory/scoped_ptr.h" | |
| 13 #include "third_party/skia/include/core/SkBitmap.h" | 13 #include "third_party/skia/include/core/SkBitmap.h" |
| 14 #include "ui/android/ui_android_export.h" | 14 #include "ui/android/ui_android_export.h" |
| 15 #include "ui/gfx/geometry/rect.h" | 15 #include "ui/gfx/geometry/rect.h" |
| 16 | 16 |
| 17 namespace cc { | 17 namespace cc { |
| 18 class LayerTreeHost; | 18 class LayerTreeHost; |
| 19 class ScopedUIResource; | 19 class ScopedUIResource; |
| 20 typedef int UIResourceId; | 20 typedef int UIResourceId; |
| 21 } | 21 } |
| 22 | 22 |
| (...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 66 gfx::Size GetUnscaledSpriteSize(); | 66 gfx::Size GetUnscaledSpriteSize(); |
| 67 | 67 |
| 68 // Returns the scaled size of an individual sprite. | 68 // Returns the scaled size of an individual sprite. |
| 69 gfx::Size GetScaledSpriteSize(); | 69 gfx::Size GetScaledSpriteSize(); |
| 70 | 70 |
| 71 // Returns the total number of frames in the sprite animation. | 71 // Returns the total number of frames in the sprite animation. |
| 72 int GetFrameCount(); | 72 int GetFrameCount(); |
| 73 | 73 |
| 74 private: | 74 private: |
| 75 SkBitmap bitmap_; | 75 SkBitmap bitmap_; |
| 76 scoped_ptr<cc::ScopedUIResource> last_frame_resource_; | 76 std::unique_ptr<cc::ScopedUIResource> last_frame_resource_; |
| 77 SrcDstRects src_dst_rects_; | 77 SrcDstRects src_dst_rects_; |
| 78 gfx::Size unscaled_sprite_size_; | 78 gfx::Size unscaled_sprite_size_; |
| 79 gfx::Size scaled_sprite_size_; | 79 gfx::Size scaled_sprite_size_; |
| 80 | 80 |
| 81 DISALLOW_COPY_AND_ASSIGN(CrushedSpriteResource); | 81 DISALLOW_COPY_AND_ASSIGN(CrushedSpriteResource); |
| 82 }; | 82 }; |
| 83 | 83 |
| 84 } // namespace ui | 84 } // namespace ui |
| 85 | 85 |
| 86 #endif // UI_ANDROID_RESOURCES_CRUSHED_SPRITE_RESOURCE_H_ | 86 #endif // UI_ANDROID_RESOURCES_CRUSHED_SPRITE_RESOURCE_H_ |
| OLD | NEW |