| 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 COMPONENTS_FAVICON_BASE_FAVICON_TYPES_H_ | 5 #ifndef COMPONENTS_FAVICON_BASE_FAVICON_TYPES_H_ |
| 6 #define COMPONENTS_FAVICON_BASE_FAVICON_TYPES_H_ | 6 #define COMPONENTS_FAVICON_BASE_FAVICON_TYPES_H_ |
| 7 | 7 |
| 8 #include "base/memory/ref_counted_memory.h" | 8 #include "base/memory/ref_counted_memory.h" |
| 9 #include "ui/gfx/image/image.h" | 9 #include "ui/gfx/image/image.h" |
| 10 #include "ui/gfx/size.h" | 10 #include "ui/gfx/size.h" |
| (...skipping 27 matching lines...) Expand all Loading... |
| 38 // The URL of the favicon which contains all of the image representations of | 38 // The URL of the favicon which contains all of the image representations of |
| 39 // |image|. | 39 // |image|. |
| 40 // TODO(pkotwicz): Return multiple |icon_urls| to allow |image| to have | 40 // TODO(pkotwicz): Return multiple |icon_urls| to allow |image| to have |
| 41 // representations from several favicons once content::FaviconStatus supports | 41 // representations from several favicons once content::FaviconStatus supports |
| 42 // multiple URLs. | 42 // multiple URLs. |
| 43 GURL icon_url; | 43 GURL icon_url; |
| 44 }; | 44 }; |
| 45 | 45 |
| 46 // Defines a favicon bitmap which best matches the desired DIP size and one of | 46 // Defines a favicon bitmap which best matches the desired DIP size and one of |
| 47 // the desired scale factors. | 47 // the desired scale factors. |
| 48 struct FaviconBitmapResult { | 48 struct FaviconRawBitmapResult { |
| 49 FaviconBitmapResult(); | 49 FaviconRawBitmapResult(); |
| 50 ~FaviconBitmapResult(); | 50 ~FaviconRawBitmapResult(); |
| 51 | 51 |
| 52 // Returns true if |bitmap_data| contains a valid bitmap. | 52 // Returns true if |bitmap_data| contains a valid bitmap. |
| 53 bool is_valid() const { return bitmap_data.get() && bitmap_data->size(); } | 53 bool is_valid() const { return bitmap_data.get() && bitmap_data->size(); } |
| 54 | 54 |
| 55 // Indicates whether |bitmap_data| is expired. | 55 // Indicates whether |bitmap_data| is expired. |
| 56 bool expired; | 56 bool expired; |
| 57 | 57 |
| 58 // The bits of the bitmap. | 58 // The bits of the bitmap. |
| 59 scoped_refptr<base::RefCountedMemory> bitmap_data; | 59 scoped_refptr<base::RefCountedMemory> bitmap_data; |
| 60 | 60 |
| 61 // The pixel dimensions of |bitmap_data|. | 61 // The pixel dimensions of |bitmap_data|. |
| 62 gfx::Size pixel_size; | 62 gfx::Size pixel_size; |
| 63 | 63 |
| 64 // The URL of the containing favicon. | 64 // The URL of the containing favicon. |
| 65 GURL icon_url; | 65 GURL icon_url; |
| 66 | 66 |
| 67 // The icon type of the containing favicon. | 67 // The icon type of the containing favicon. |
| 68 IconType icon_type; | 68 IconType icon_type; |
| 69 }; | 69 }; |
| 70 | 70 |
| 71 // Define type with same structure as FaviconBitmapResult for passing data to | 71 // Define type with same structure as FaviconRawBitmapResult for passing data to |
| 72 // HistoryBackend::SetFavicons(). | 72 // HistoryBackend::SetFavicons(). |
| 73 typedef FaviconBitmapResult FaviconBitmapData; | 73 typedef FaviconRawBitmapResult FaviconRawBitmapData; |
| 74 | 74 |
| 75 } // namespace favicon_base | 75 } // namespace favicon_base |
| 76 | 76 |
| 77 #endif // COMPONENTS_FAVICON_BASE_FAVICON_TYPES_H_ | 77 #endif // COMPONENTS_FAVICON_BASE_FAVICON_TYPES_H_ |
| OLD | NEW |