| 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 198 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 209 continue; | 209 continue; |
| 210 if (!faceResult.storedValue->value || compareFontFaces(candidate, fa
ceResult.storedValue->value.get(), traits)) | 210 if (!faceResult.storedValue->value || compareFontFaces(candidate, fa
ceResult.storedValue->value.get(), traits)) |
| 211 faceResult.storedValue->value = candidate; | 211 faceResult.storedValue->value = candidate; |
| 212 } | 212 } |
| 213 } | 213 } |
| 214 return faceResult.storedValue->value.get(); | 214 return faceResult.storedValue->value.get(); |
| 215 } | 215 } |
| 216 | 216 |
| 217 void FontFaceCache::trace(Visitor* visitor) | 217 void FontFaceCache::trace(Visitor* visitor) |
| 218 { | 218 { |
| 219 #if ENABLE(OILPAN) |
| 219 visitor->trace(m_fontFaces); | 220 visitor->trace(m_fontFaces); |
| 220 visitor->trace(m_fonts); | 221 visitor->trace(m_fonts); |
| 221 visitor->trace(m_styleRuleToFontFace); | 222 visitor->trace(m_styleRuleToFontFace); |
| 222 visitor->trace(m_cssConnectedFontFaces); | 223 visitor->trace(m_cssConnectedFontFaces); |
| 224 #endif |
| 223 } | 225 } |
| 224 | 226 |
| 225 } | 227 } |
| OLD | NEW |