| 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 60 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 71 return false; | 71 return false; |
| 72 } | 72 } |
| 73 | 73 |
| 74 void CSSSegmentedFontFace::fontLoaded(CSSFontFace*) | 74 void CSSSegmentedFontFace::fontLoaded(CSSFontFace*) |
| 75 { | 75 { |
| 76 pruneTable(); | 76 pruneTable(); |
| 77 } | 77 } |
| 78 | 78 |
| 79 void CSSSegmentedFontFace::fontLoadWaitLimitExceeded(CSSFontFace*) | 79 void CSSSegmentedFontFace::fontLoadWaitLimitExceeded(CSSFontFace*) |
| 80 { | 80 { |
| 81 m_fontSelector->fontFaceInvalidated(); | |
| 82 pruneTable(); | 81 pruneTable(); |
| 83 } | 82 } |
| 84 | 83 |
| 85 void CSSSegmentedFontFace::addFontFace(PassRefPtrWillBeRawPtr<FontFace> prpFontF
ace, bool cssConnected) | 84 void CSSSegmentedFontFace::addFontFace(PassRefPtrWillBeRawPtr<FontFace> prpFontF
ace, bool cssConnected) |
| 86 { | 85 { |
| 87 RefPtrWillBeRawPtr<FontFace> fontFace = prpFontFace; | 86 RefPtrWillBeRawPtr<FontFace> fontFace = prpFontFace; |
| 88 pruneTable(); | 87 pruneTable(); |
| 89 fontFace->cssFontFace()->setSegmentedFontFace(this); | 88 fontFace->cssFontFace()->setSegmentedFontFace(this); |
| 90 if (cssConnected) { | 89 if (cssConnected) { |
| 91 m_fontFaces.insertBefore(m_firstNonCssConnectedFace, fontFace); | 90 m_fontFaces.insertBefore(m_firstNonCssConnectedFace, fontFace); |
| (...skipping 119 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 211 } | 210 } |
| 212 } | 211 } |
| 213 | 212 |
| 214 void CSSSegmentedFontFace::trace(Visitor* visitor) | 213 void CSSSegmentedFontFace::trace(Visitor* visitor) |
| 215 { | 214 { |
| 216 visitor->trace(m_fontSelector); | 215 visitor->trace(m_fontSelector); |
| 217 visitor->trace(m_fontFaces); | 216 visitor->trace(m_fontFaces); |
| 218 } | 217 } |
| 219 | 218 |
| 220 } | 219 } |
| OLD | NEW |