Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(143)

Side by Side Diff: Source/core/css/CSSSegmentedFontFace.cpp

Issue 171823002: Make text visible when font loading takes longer than 3 seconds (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
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 69 matching lines...) Expand 10 before | Expand all | Expand 10 after
80 m_callbacks.swap(callbacks); 80 m_callbacks.swap(callbacks);
81 for (size_t index = 0; index < callbacks.size(); ++index) { 81 for (size_t index = 0; index < callbacks.size(); ++index) {
82 if (isLoaded()) 82 if (isLoaded())
83 callbacks[index]->notifyLoaded(this); 83 callbacks[index]->notifyLoaded(this);
84 else 84 else
85 callbacks[index]->notifyError(this); 85 callbacks[index]->notifyError(this);
86 } 86 }
87 } 87 }
88 } 88 }
89 89
90 void CSSSegmentedFontFace::fontLoadWaitLimitExceeded(CSSFontFace*)
91 {
92 m_fontSelector->fontLoaded();
93 pruneTable();
94 }
95
90 void CSSSegmentedFontFace::addFontFace(PassRefPtr<FontFace> prpFontFace, bool cs sConnected) 96 void CSSSegmentedFontFace::addFontFace(PassRefPtr<FontFace> prpFontFace, bool cs sConnected)
91 { 97 {
92 RefPtr<FontFace> fontFace = prpFontFace; 98 RefPtr<FontFace> fontFace = prpFontFace;
93 pruneTable(); 99 pruneTable();
94 fontFace->cssFontFace()->setSegmentedFontFace(this); 100 fontFace->cssFontFace()->setSegmentedFontFace(this);
95 if (cssConnected) { 101 if (cssConnected) {
96 m_fontFaces.insertBefore(m_firstNonCssConnectedFace, fontFace); 102 m_fontFaces.insertBefore(m_firstNonCssConnectedFace, fontFace);
97 } else { 103 } else {
98 // This is the only place in Blink that is using addReturnIterator. 104 // This is the only place in Blink that is using addReturnIterator.
99 FontFaceList::iterator iterator = m_fontFaces.addReturnIterator(fontFace ); 105 FontFaceList::iterator iterator = m_fontFaces.addReturnIterator(fontFace );
(...skipping 115 matching lines...) Expand 10 before | Expand all | Expand 10 after
215 if (isLoading()) 221 if (isLoading())
216 m_callbacks.append(callback); 222 m_callbacks.append(callback);
217 else if (isLoaded()) 223 else if (isLoaded())
218 callback->notifyLoaded(this); 224 callback->notifyLoaded(this);
219 else 225 else
220 callback->notifyError(this); 226 callback->notifyError(this);
221 } 227 }
222 } 228 }
223 229
224 } 230 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698