OLD | NEW |
1 /* | 1 /* |
2 * Copyright (C) 2011 Google Inc. All rights reserved. | 2 * Copyright (C) 2011 Google Inc. All rights reserved. |
3 * | 3 * |
4 * Redistribution and use in source and binary forms, with or without | 4 * Redistribution and use in source and binary forms, with or without |
5 * modification, are permitted provided that the following conditions are | 5 * modification, are permitted provided that the following conditions are |
6 * met: | 6 * met: |
7 * | 7 * |
8 * * Redistributions of source code must retain the above copyright | 8 * * Redistributions of source code must retain the above copyright |
9 * notice, this list of conditions and the following disclaimer. | 9 * notice, this list of conditions and the following disclaimer. |
10 * * Redistributions in binary form must reproduce the above | 10 * * Redistributions in binary form must reproduce the above |
(...skipping 16 matching lines...) Expand all Loading... |
27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | 27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE |
28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
29 */ | 29 */ |
30 | 30 |
31 #ifndef WebIconURL_h | 31 #ifndef WebIconURL_h |
32 #define WebIconURL_h | 32 #define WebIconURL_h |
33 | 33 |
34 #if BLINK_IMPLEMENTATION | 34 #if BLINK_IMPLEMENTATION |
35 #include "core/dom/IconURL.h" | 35 #include "core/dom/IconURL.h" |
36 #endif | 36 #endif |
37 #include "../platform/WebURL.h" | 37 #include "public/platform/WebSize.h" |
| 38 #include "public/platform/WebURL.h" |
| 39 #include "public/platform/WebVector.h" |
38 | 40 |
39 namespace blink { | 41 namespace blink { |
40 | 42 |
41 class WebIconURL { | 43 class WebIconURL { |
42 public: | 44 public: |
43 enum Type { | 45 enum Type { |
44 TypeInvalid = 0, | 46 TypeInvalid = 0, |
45 TypeFavicon = 1 << 0, | 47 TypeFavicon = 1 << 0, |
46 TypeTouch = 1 << 1, | 48 TypeTouch = 1 << 1, |
47 TypeTouchPrecomposed = 1 << 2 | 49 TypeTouchPrecomposed = 1 << 2 |
(...skipping 13 matching lines...) Expand all Loading... |
61 Type iconType() const | 63 Type iconType() const |
62 { | 64 { |
63 return m_iconType; | 65 return m_iconType; |
64 } | 66 } |
65 | 67 |
66 const WebURL& iconURL() const | 68 const WebURL& iconURL() const |
67 { | 69 { |
68 return m_iconURL; | 70 return m_iconURL; |
69 } | 71 } |
70 | 72 |
| 73 const WebVector<WebSize>& sizes() const |
| 74 { |
| 75 return m_sizes; |
| 76 } |
| 77 |
71 #if BLINK_IMPLEMENTATION | 78 #if BLINK_IMPLEMENTATION |
72 WebIconURL(const WebCore::IconURL& iconURL) | 79 WebIconURL(const WebCore::IconURL& iconURL) |
73 : m_iconType(static_cast<Type>(iconURL.m_iconType)) | 80 : m_iconType(static_cast<Type>(iconURL.m_iconType)) |
74 , m_iconURL(iconURL.m_iconURL) | 81 , m_iconURL(iconURL.m_iconURL) |
| 82 , m_sizes(iconURL.m_sizes) |
75 { | 83 { |
76 } | 84 } |
77 #endif | 85 #endif |
78 | 86 |
79 private: | 87 private: |
80 Type m_iconType; | 88 Type m_iconType; |
81 WebURL m_iconURL; | 89 WebURL m_iconURL; |
| 90 WebVector<WebSize> m_sizes; |
82 }; | 91 }; |
83 | 92 |
84 } | 93 } |
85 | 94 |
86 #endif // WebIconURL_h | 95 #endif // WebIconURL_h |
OLD | NEW |