| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2007, 2008, 2010, 2011 Apple Inc. All rights reserved. | 2 * Copyright (C) 2007, 2008, 2010, 2011 Apple 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 | 5 * modification, are permitted provided that the following conditions |
| 6 * are met: | 6 * are met: |
| 7 * 1. Redistributions of source code must retain the above copyright | 7 * 1. Redistributions of source code must retain the above copyright |
| 8 * notice, this list of conditions and the following disclaimer. | 8 * notice, this list of conditions and the following disclaimer. |
| 9 * 2. Redistributions in binary form must reproduce the above copyright | 9 * 2. Redistributions in binary form must reproduce the above copyright |
| 10 * notice, this list of conditions and the following disclaimer in the | 10 * notice, this list of conditions and the following disclaimer in the |
| (...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 48 // If the font hasn't loaded or an error occurred, then we've got nothing. | 48 // If the font hasn't loaded or an error occurred, then we've got nothing. |
| 49 if (!isValid()) | 49 if (!isValid()) |
| 50 return nullptr; | 50 return nullptr; |
| 51 | 51 |
| 52 if (isLocal()) { | 52 if (isLocal()) { |
| 53 // We're local. Just return a SimpleFontData from the normal cache. | 53 // We're local. Just return a SimpleFontData from the normal cache. |
| 54 return createFontData(fontDescription); | 54 return createFontData(fontDescription); |
| 55 } | 55 } |
| 56 | 56 |
| 57 // See if we have a mapping in our FontData cache. | 57 // See if we have a mapping in our FontData cache. |
| 58 // TODO(drott): Check whether losing traits information here is problematic.
crbug.com/516677 |
| 58 FontCacheKey key = fontDescription.cacheKey(FontFaceCreationParams()); | 59 FontCacheKey key = fontDescription.cacheKey(FontFaceCreationParams()); |
| 59 | 60 |
| 60 RefPtr<SimpleFontData>& fontData = m_fontDataTable.add(key.hash(), nullptr).
storedValue->value; | 61 RefPtr<SimpleFontData>& fontData = m_fontDataTable.add(key.hash(), nullptr).
storedValue->value; |
| 61 if (!fontData) | 62 if (!fontData) |
| 62 fontData = createFontData(fontDescription); | 63 fontData = createFontData(fontDescription); |
| 63 return fontData; // No release, because fontData is a reference to a RefPtr
that is held in the m_fontDataTable. | 64 return fontData; // No release, because fontData is a reference to a RefPtr
that is held in the m_fontDataTable. |
| 64 } | 65 } |
| 65 | 66 |
| 66 DEFINE_TRACE(CSSFontFaceSource) | 67 DEFINE_TRACE(CSSFontFaceSource) |
| 67 { | 68 { |
| 68 visitor->trace(m_face); | 69 visitor->trace(m_face); |
| 69 } | 70 } |
| 70 | 71 |
| 71 } | 72 } |
| OLD | NEW |