| Index: Source/core/css/FontLoader.h
|
| diff --git a/Source/core/css/FontLoader.h b/Source/core/css/FontLoader.h
|
| index e3fa02a8963d898c3318d5dc19526cc465d80fec..b79eeb21bf90d26e17257a38161b3ae65317ba45 100644
|
| --- a/Source/core/css/FontLoader.h
|
| +++ b/Source/core/css/FontLoader.h
|
| @@ -13,18 +13,20 @@
|
|
|
| namespace WebCore {
|
|
|
| +class CSSFontSelector;
|
| class FontResource;
|
|
|
| class FontLoader : public RefCountedWillBeGarbageCollectedFinalized<FontLoader> {
|
| public:
|
| - static PassRefPtrWillBeRawPtr<FontLoader> create(ResourceFetcher* fetcher)
|
| + static PassRefPtrWillBeRawPtr<FontLoader> create(CSSFontSelector* fontSelector, ResourceFetcher* fetcher)
|
| {
|
| - return adoptRefWillBeNoop(new FontLoader(fetcher));
|
| + return adoptRefWillBeNoop(new FontLoader(fontSelector, fetcher));
|
| }
|
| ~FontLoader();
|
|
|
| void addFontToBeginLoading(FontResource*);
|
| void loadPendingFonts();
|
| + void fontFaceInvalidated();
|
|
|
| #if !ENABLE(OILPAN)
|
| void clearResourceFetcher();
|
| @@ -33,13 +35,14 @@ public:
|
| void trace(Visitor*);
|
|
|
| private:
|
| - explicit FontLoader(ResourceFetcher*);
|
| + FontLoader(CSSFontSelector*, ResourceFetcher*);
|
| void beginLoadTimerFired(Timer<FontLoader>*);
|
|
|
| Timer<FontLoader> m_beginLoadingTimer;
|
|
|
| typedef Vector<std::pair<ResourcePtr<FontResource>, ResourceLoader::RequestCountTracker> > FontsToLoadVector;
|
| FontsToLoadVector m_fontsToBeginLoading;
|
| + RawPtrWillBeMember<CSSFontSelector> m_fontSelector;
|
| RawPtrWillBeMember<ResourceFetcher> m_resourceFetcher;
|
| };
|
|
|
|
|