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

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

Issue 270813003: Reland r172943 "Make CSSFontFace::willUseFontData() load fonts with unicode-range" (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 7 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
« no previous file with comments | « Source/core/css/CSSFontFace.cpp ('k') | Source/core/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, 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 66 matching lines...) Expand 10 before | Expand all | Expand 10 after
77 public: 77 public:
78 static PassRefPtrWillBeRawPtr<CSSFontSelector> create(Document* document) 78 static PassRefPtrWillBeRawPtr<CSSFontSelector> create(Document* document)
79 { 79 {
80 return adoptRefWillBeNoop(new CSSFontSelector(document)); 80 return adoptRefWillBeNoop(new CSSFontSelector(document));
81 } 81 }
82 virtual ~CSSFontSelector(); 82 virtual ~CSSFontSelector();
83 83
84 virtual unsigned version() const OVERRIDE { return m_fontFaceCache.version() ; } 84 virtual unsigned version() const OVERRIDE { return m_fontFaceCache.version() ; }
85 85
86 virtual PassRefPtr<FontData> getFontData(const FontDescription&, const Atomi cString&) OVERRIDE; 86 virtual PassRefPtr<FontData> getFontData(const FontDescription&, const Atomi cString&) OVERRIDE;
87 virtual void willUseFontData(const FontDescription&, const AtomicString& fam ily) OVERRIDE; 87 virtual void willUseFontData(const FontDescription&, const AtomicString& fam ily, UChar32) OVERRIDE;
88 88
89 #if !ENABLE(OILPAN) 89 #if !ENABLE(OILPAN)
90 void clearDocument(); 90 void clearDocument();
91 #endif 91 #endif
92 92
93 void fontLoaded(); 93 void fontLoaded();
94 94
95 // FontCacheClient implementation 95 // FontCacheClient implementation
96 virtual void fontCacheInvalidated() OVERRIDE; 96 virtual void fontCacheInvalidated() OVERRIDE;
97 97
(...skipping 23 matching lines...) Expand all
121 FontFaceCache m_fontFaceCache; 121 FontFaceCache m_fontFaceCache;
122 WillBeHeapHashSet<RawPtrWillBeWeakMember<CSSFontSelectorClient> > m_clients; 122 WillBeHeapHashSet<RawPtrWillBeWeakMember<CSSFontSelectorClient> > m_clients;
123 123
124 FontLoader m_fontLoader; 124 FontLoader m_fontLoader;
125 GenericFontFamilySettings m_genericFontFamilySettings; 125 GenericFontFamilySettings m_genericFontFamilySettings;
126 }; 126 };
127 127
128 } // namespace WebCore 128 } // namespace WebCore
129 129
130 #endif // CSSFontSelector_h 130 #endif // CSSFontSelector_h
OLDNEW
« no previous file with comments | « Source/core/css/CSSFontFace.cpp ('k') | Source/core/css/CSSFontSelector.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698