| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2007, 2008, 2011 Apple Inc. All rights reserved. | 2 * Copyright (C) 2007, 2008, 2011 Apple Inc. All rights reserved. |
| 3 * Copyright (C) 2013 Google Inc. All rights reserved. | 3 * Copyright (C) 2013 Google Inc. All rights reserved. |
| 4 * | 4 * |
| 5 * Redistribution and use in source and binary forms, with or without | 5 * Redistribution and use in source and binary forms, with or without |
| 6 * modification, are permitted provided that the following conditions | 6 * modification, are permitted provided that the following conditions |
| 7 * are met: | 7 * are met: |
| 8 * 1. Redistributions of source code must retain the above copyright | 8 * 1. 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 * 2. Redistributions in binary form must reproduce the above copyright | 10 * 2. Redistributions in binary form must reproduce the above copyright |
| (...skipping 208 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 219 continue; | 219 continue; |
| 220 if (traits.variant() == FontVariantNormal && candidateTraits.variant
() != FontVariantNormal) | 220 if (traits.variant() == FontVariantNormal && candidateTraits.variant
() != FontVariantNormal) |
| 221 continue; | 221 continue; |
| 222 if (!faceResult.storedValue->value || compareFontFaces(candidate, fa
ceResult.storedValue->value.get(), traits)) | 222 if (!faceResult.storedValue->value || compareFontFaces(candidate, fa
ceResult.storedValue->value.get(), traits)) |
| 223 faceResult.storedValue->value = candidate; | 223 faceResult.storedValue->value = candidate; |
| 224 } | 224 } |
| 225 } | 225 } |
| 226 return faceResult.storedValue->value.get(); | 226 return faceResult.storedValue->value.get(); |
| 227 } | 227 } |
| 228 | 228 |
| 229 void FontFaceCache::trace(Visitor* visitor) | |
| 230 { | |
| 231 #if ENABLE(OILPAN) | |
| 232 visitor->trace(m_fontFaces); | |
| 233 visitor->trace(m_fonts); | |
| 234 visitor->trace(m_styleRuleToFontFace); | |
| 235 visitor->trace(m_cssConnectedFontFaces); | |
| 236 #endif | |
| 237 } | 229 } |
| 238 | |
| 239 } | |
| OLD | NEW |