| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2008 Apple Inc. All rights reserved. | 2 * Copyright (C) 2008 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 68 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 79 } | 79 } |
| 80 } | 80 } |
| 81 | 81 |
| 82 void CSSSegmentedFontFace::removeFontFace(FontFace* fontFace) { | 82 void CSSSegmentedFontFace::removeFontFace(FontFace* fontFace) { |
| 83 FontFaceList::iterator it = m_fontFaces.find(fontFace); | 83 FontFaceList::iterator it = m_fontFaces.find(fontFace); |
| 84 if (it == m_fontFaces.end()) | 84 if (it == m_fontFaces.end()) |
| 85 return; | 85 return; |
| 86 | 86 |
| 87 if (it == m_firstNonCssConnectedFace) | 87 if (it == m_firstNonCssConnectedFace) |
| 88 ++m_firstNonCssConnectedFace; | 88 ++m_firstNonCssConnectedFace; |
| 89 m_fontFaces.remove(it); | 89 m_fontFaces.erase(it); |
| 90 | 90 |
| 91 pruneTable(); | 91 pruneTable(); |
| 92 fontFace->cssFontFace()->clearSegmentedFontFace(); | 92 fontFace->cssFontFace()->clearSegmentedFontFace(); |
| 93 } | 93 } |
| 94 | 94 |
| 95 PassRefPtr<FontData> CSSSegmentedFontFace::getFontData( | 95 PassRefPtr<FontData> CSSSegmentedFontFace::getFontData( |
| 96 const FontDescription& fontDescription) { | 96 const FontDescription& fontDescription) { |
| 97 if (!isValid()) | 97 if (!isValid()) |
| 98 return nullptr; | 98 return nullptr; |
| 99 | 99 |
| (...skipping 90 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 190 } | 190 } |
| 191 } | 191 } |
| 192 | 192 |
| 193 DEFINE_TRACE(CSSSegmentedFontFace) { | 193 DEFINE_TRACE(CSSSegmentedFontFace) { |
| 194 visitor->trace(m_fontSelector); | 194 visitor->trace(m_fontSelector); |
| 195 visitor->trace(m_firstNonCssConnectedFace); | 195 visitor->trace(m_firstNonCssConnectedFace); |
| 196 visitor->trace(m_fontFaces); | 196 visitor->trace(m_fontFaces); |
| 197 } | 197 } |
| 198 | 198 |
| 199 } // namespace blink | 199 } // namespace blink |
| OLD | NEW |