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

Side by Side Diff: Source/core/css/FontLoader.h

Issue 457273002: Webfonts should not block load event for more than one frame (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 4 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 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef FontLoader_h 5 #ifndef FontLoader_h
6 #define FontLoader_h 6 #define FontLoader_h
7 7
8 #include "core/fetch/ResourceLoader.h" 8 #include "core/fetch/ResourceLoader.h"
9 #include "core/fetch/ResourcePtr.h" 9 #include "core/fetch/ResourcePtr.h"
10 #include "platform/Timer.h" 10 #include "platform/Timer.h"
(...skipping 19 matching lines...) Expand all
30 30
31 #if !ENABLE(OILPAN) 31 #if !ENABLE(OILPAN)
32 void clearResourceFetcherAndFontSelector(); 32 void clearResourceFetcherAndFontSelector();
33 #endif 33 #endif
34 34
35 void trace(Visitor*); 35 void trace(Visitor*);
36 36
37 private: 37 private:
38 FontLoader(CSSFontSelector*, ResourceFetcher*); 38 FontLoader(CSSFontSelector*, ResourceFetcher*);
39 void beginLoadTimerFired(Timer<FontLoader>*); 39 void beginLoadTimerFired(Timer<FontLoader>*);
40 void clearPendingFonts();
40 41
41 Timer<FontLoader> m_beginLoadingTimer; 42 Timer<FontLoader> m_beginLoadingTimer;
42 43
43 typedef Vector<std::pair<ResourcePtr<FontResource>, ResourceLoader::RequestC ountTracker> > FontsToLoadVector; 44 typedef Vector<std::pair<ResourcePtr<FontResource>, ResourceLoader::RequestC ountTracker> > FontsToLoadVector;
44 FontsToLoadVector m_fontsToBeginLoading; 45 FontsToLoadVector m_fontsToBeginLoading;
45 RawPtrWillBeMember<CSSFontSelector> m_fontSelector; 46 RawPtrWillBeMember<CSSFontSelector> m_fontSelector;
46 RawPtrWillBeWeakMember<ResourceFetcher> m_resourceFetcher; 47 RawPtrWillBeWeakMember<ResourceFetcher> m_resourceFetcher;
47 }; 48 };
48 49
49 } // namespace blink 50 } // namespace blink
50 51
51 #endif // FontLoader_h 52 #endif // FontLoader_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698