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

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

Issue 157853002: Revert of Use removeFontFace to avoid resetting fontSelector. (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) 2007, 2008, 2011 Apple Inc. All rights reserved. 2 * Copyright (C) 2007, 2008, 2011 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 72 matching lines...) Expand 10 before | Expand all | Expand 10 after
83 // FontCacheClient implementation 83 // FontCacheClient implementation
84 virtual void fontCacheInvalidated() OVERRIDE; 84 virtual void fontCacheInvalidated() OVERRIDE;
85 85
86 void registerForInvalidationCallbacks(CSSFontSelectorClient*); 86 void registerForInvalidationCallbacks(CSSFontSelectorClient*);
87 void unregisterForInvalidationCallbacks(CSSFontSelectorClient*); 87 void unregisterForInvalidationCallbacks(CSSFontSelectorClient*);
88 88
89 Document* document() const { return m_document; } 89 Document* document() const { return m_document; }
90 FontFaceCache* fontFaceCache() { return &m_fontFaceCache; } 90 FontFaceCache* fontFaceCache() { return &m_fontFaceCache; }
91 91
92 const GenericFontFamilySettings& genericFontFamilySettings() const { return m_genericFontFamilySettings; } 92 const GenericFontFamilySettings& genericFontFamilySettings() const { return m_genericFontFamilySettings; }
93 void updateGenericFontFamilySettings(Document&);
94 93
95 void beginLoadingFontSoon(FontResource*); 94 void beginLoadingFontSoon(FontResource*);
96 void loadPendingFonts(); 95 void loadPendingFonts();
97 96
98 private: 97 private:
99 explicit CSSFontSelector(Document*); 98 explicit CSSFontSelector(Document*);
100 99
101 void dispatchInvalidationCallbacks(); 100 void dispatchInvalidationCallbacks();
102 101
103 Document* m_document; 102 Document* m_document;
104 // FIXME: Move to Document or StyleEngine. 103 // FIXME: Move to Document or StyleEngine.
105 FontFaceCache m_fontFaceCache; 104 FontFaceCache m_fontFaceCache;
106 HashSet<CSSFontSelectorClient*> m_clients; 105 HashSet<CSSFontSelectorClient*> m_clients;
107 106
108 FontLoader m_fontLoader; 107 FontLoader m_fontLoader;
109 GenericFontFamilySettings m_genericFontFamilySettings; 108 GenericFontFamilySettings m_genericFontFamilySettings;
110 }; 109 };
111 110
112 } // namespace WebCore 111 } // namespace WebCore
113 112
114 #endif // CSSFontSelector_h 113 #endif // CSSFontSelector_h
OLDNEW
« no previous file with comments | « LayoutTests/fast/css/font-face-insertBefore-expected.html ('k') | Source/core/css/CSSFontSelector.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698