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

Side by Side Diff: Source/WebCore/css/CSSFontSelector.h

Issue 8273018: Merge 97402 - Source/WebCore: Register custom fonts at their creation time, rather than at retire... (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/874/
Patch Set: Created 9 years, 2 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
« no previous file with comments | « Source/WebCore/css/CSSFontFaceSource.cpp ('k') | Source/WebCore/css/CSSFontSelector.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2007, 2008 Apple Inc. All rights reserved. 2 * Copyright (C) 2007, 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 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
52 52
53 virtual FontData* getFontData(const FontDescription& fontDescription, const AtomicString& familyName); 53 virtual FontData* getFontData(const FontDescription& fontDescription, const AtomicString& familyName);
54 54
55 void clearDocument() { m_document = 0; } 55 void clearDocument() { m_document = 0; }
56 56
57 void addFontFaceRule(const CSSFontFaceRule*); 57 void addFontFaceRule(const CSSFontFaceRule*);
58 58
59 void fontLoaded(); 59 void fontLoaded();
60 virtual void fontCacheInvalidated(); 60 virtual void fontCacheInvalidated();
61 61
62 void retireCustomFont(FontData*);
63
64 bool isEmpty() const; 62 bool isEmpty() const;
65 63
66 CachedResourceLoader* cachedResourceLoader() const; 64 CachedResourceLoader* cachedResourceLoader() const;
67 65
68 virtual void registerForInvalidationCallbacks(FontSelectorClient*); 66 virtual void registerForInvalidationCallbacks(FontSelectorClient*);
69 virtual void unregisterForInvalidationCallbacks(FontSelectorClient*); 67 virtual void unregisterForInvalidationCallbacks(FontSelectorClient*);
70 68
71 Document* document() const { return m_document; } 69 Document* document() const { return m_document; }
72 70
73 private: 71 private:
74 CSSFontSelector(Document*); 72 CSSFontSelector(Document*);
75 73
76 void dispatchInvalidationCallbacks(); 74 void dispatchInvalidationCallbacks();
77 75
78 Document* m_document; 76 Document* m_document;
79 HashMap<String, Vector<RefPtr<CSSFontFace> >*, CaseFoldingHash> m_fontFaces; 77 HashMap<String, Vector<RefPtr<CSSFontFace> >*, CaseFoldingHash> m_fontFaces;
80 HashMap<String, Vector<RefPtr<CSSFontFace> >*, CaseFoldingHash> m_locallyIns talledFontFaces; 78 HashMap<String, Vector<RefPtr<CSSFontFace> >*, CaseFoldingHash> m_locallyIns talledFontFaces;
81 HashMap<String, HashMap<unsigned, RefPtr<CSSSegmentedFontFace> >*, CaseFoldi ngHash> m_fonts; 79 HashMap<String, HashMap<unsigned, RefPtr<CSSSegmentedFontFace> >*, CaseFoldi ngHash> m_fonts;
82 HashSet<FontSelectorClient*> m_clients; 80 HashSet<FontSelectorClient*> m_clients;
83 }; 81 };
84 82
85 } // namespace WebCore 83 } // namespace WebCore
86 84
87 #endif // CSSFontSelector_h 85 #endif // CSSFontSelector_h
OLDNEW
« no previous file with comments | « Source/WebCore/css/CSSFontFaceSource.cpp ('k') | Source/WebCore/css/CSSFontSelector.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698