| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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_GFX_IMAGE_IMAGE_FAMILY_H_ | 5 #ifndef UI_GFX_IMAGE_IMAGE_FAMILY_H_ |
| 6 #define UI_GFX_IMAGE_IMAGE_FAMILY_H_ | 6 #define UI_GFX_IMAGE_IMAGE_FAMILY_H_ |
| 7 | 7 |
| 8 #include <iterator> | 8 #include <iterator> |
| 9 #include <map> | 9 #include <map> |
| 10 #include <utility> | 10 #include <utility> |
| (...skipping 30 matching lines...) Expand all Loading... |
| 41 public: | 41 public: |
| 42 // Type for iterating over all images in the family, in order. | 42 // Type for iterating over all images in the family, in order. |
| 43 // Dereferencing this iterator returns a gfx::Image. | 43 // Dereferencing this iterator returns a gfx::Image. |
| 44 class GFX_EXPORT const_iterator : | 44 class GFX_EXPORT const_iterator : |
| 45 std::iterator<std::bidirectional_iterator_tag, const gfx::Image> { | 45 std::iterator<std::bidirectional_iterator_tag, const gfx::Image> { |
| 46 public: | 46 public: |
| 47 const_iterator(); | 47 const_iterator(); |
| 48 | 48 |
| 49 const_iterator(const const_iterator& other); | 49 const_iterator(const const_iterator& other); |
| 50 | 50 |
| 51 ~const_iterator(); |
| 52 |
| 51 const_iterator& operator++() { | 53 const_iterator& operator++() { |
| 52 ++map_iterator_; | 54 ++map_iterator_; |
| 53 return *this; | 55 return *this; |
| 54 } | 56 } |
| 55 | 57 |
| 56 const_iterator operator++(int /*unused*/) { | 58 const_iterator operator++(int /*unused*/) { |
| 57 const_iterator result(*this); | 59 const_iterator result(*this); |
| 58 ++(*this); | 60 ++(*this); |
| 59 return result; | 61 return result; |
| 60 } | 62 } |
| (...skipping 86 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 147 // |map_| of aspect ratio |aspect|. | 149 // |map_| of aspect ratio |aspect|. |
| 148 const gfx::Image* GetWithExactAspect(float aspect, int width) const; | 150 const gfx::Image* GetWithExactAspect(float aspect, int width) const; |
| 149 | 151 |
| 150 // Map from (aspect ratio, width) to image. | 152 // Map from (aspect ratio, width) to image. |
| 151 std::map<MapKey, gfx::Image> map_; | 153 std::map<MapKey, gfx::Image> map_; |
| 152 }; | 154 }; |
| 153 | 155 |
| 154 } // namespace gfx | 156 } // namespace gfx |
| 155 | 157 |
| 156 #endif // UI_GFX_IMAGE_IMAGE_FAMILY_H_ | 158 #endif // UI_GFX_IMAGE_IMAGE_FAMILY_H_ |
| OLD | NEW |