OLD | NEW |
1 /* | 1 /* |
2 * Copyright (c) 2009, Google Inc. All rights reserved. | 2 * Copyright (c) 2009, 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 101 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
112 hasher.AddCharacters( | 112 hasher.AddCharacters( |
113 reinterpret_cast<const LChar*>(&fontconfig_interface_id_), | 113 reinterpret_cast<const LChar*>(&fontconfig_interface_id_), |
114 sizeof(fontconfig_interface_id_)); | 114 sizeof(fontconfig_interface_id_)); |
115 return hasher.GetHash(); | 115 return hasher.GetHash(); |
116 } | 116 } |
117 return CaseFoldingHash::GetHash(family_.IsEmpty() ? "" : family_); | 117 return CaseFoldingHash::GetHash(family_.IsEmpty() ? "" : family_); |
118 } | 118 } |
119 | 119 |
120 bool operator==(const FontFaceCreationParams& other) const { | 120 bool operator==(const FontFaceCreationParams& other) const { |
121 return creation_type_ == other.creation_type_ && | 121 return creation_type_ == other.creation_type_ && |
122 EqualIgnoringCase(family_, other.family_) && | 122 DeprecatedEqualIgnoringCase(family_, other.family_) && |
123 filename_ == other.filename_ && | 123 filename_ == other.filename_ && |
124 fontconfig_interface_id_ == other.fontconfig_interface_id_ && | 124 fontconfig_interface_id_ == other.fontconfig_interface_id_ && |
125 ttc_index_ == other.ttc_index_; | 125 ttc_index_ == other.ttc_index_; |
126 } | 126 } |
127 | 127 |
128 private: | 128 private: |
129 FontFaceCreationType creation_type_; | 129 FontFaceCreationType creation_type_; |
130 AtomicString family_; | 130 AtomicString family_; |
131 CString filename_; | 131 CString filename_; |
132 int fontconfig_interface_id_; | 132 int fontconfig_interface_id_; |
133 int ttc_index_; | 133 int ttc_index_; |
134 }; | 134 }; |
135 | 135 |
136 } // namespace blink | 136 } // namespace blink |
137 | 137 |
138 #endif // FontFaceCreationParams_h | 138 #endif // FontFaceCreationParams_h |
OLD | NEW |