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

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

Issue 9595009: Merge 108574 - REGRESSION (r104060): Web font is not loaded if specified by link element dynamicall… (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1025/
Patch Set: Created 8 years, 9 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 | « LayoutTests/fast/css/resources/ahem.css ('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, 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 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
44 class Document; 44 class Document;
45 class FontDescription; 45 class FontDescription;
46 46
47 class CSSFontSelector : public FontSelector { 47 class CSSFontSelector : public FontSelector {
48 public: 48 public:
49 static PassRefPtr<CSSFontSelector> create(Document* document) 49 static PassRefPtr<CSSFontSelector> create(Document* document)
50 { 50 {
51 return adoptRef(new CSSFontSelector(document)); 51 return adoptRef(new CSSFontSelector(document));
52 } 52 }
53 virtual ~CSSFontSelector(); 53 virtual ~CSSFontSelector();
54
55 virtual unsigned version() const OVERRIDE { return m_version; }
54 56
55 virtual FontData* getFontData(const FontDescription& fontDescription, const AtomicString& familyName); 57 virtual FontData* getFontData(const FontDescription& fontDescription, const AtomicString& familyName);
56 58
57 void clearDocument(); 59 void clearDocument();
58 60
59 void addFontFaceRule(const CSSFontFaceRule*); 61 void addFontFaceRule(const CSSFontFaceRule*);
60 62
61 void fontLoaded(); 63 void fontLoaded();
62 virtual void fontCacheInvalidated(); 64 virtual void fontCacheInvalidated();
63 65
(...skipping 14 matching lines...) Expand all
78 void beginLoadTimerFired(Timer<CSSFontSelector>*); 80 void beginLoadTimerFired(Timer<CSSFontSelector>*);
79 81
80 Document* m_document; 82 Document* m_document;
81 HashMap<String, OwnPtr<Vector<RefPtr<CSSFontFace> > >, CaseFoldingHash> m_fo ntFaces; 83 HashMap<String, OwnPtr<Vector<RefPtr<CSSFontFace> > >, CaseFoldingHash> m_fo ntFaces;
82 HashMap<String, OwnPtr<Vector<RefPtr<CSSFontFace> > >, CaseFoldingHash> m_lo callyInstalledFontFaces; 84 HashMap<String, OwnPtr<Vector<RefPtr<CSSFontFace> > >, CaseFoldingHash> m_lo callyInstalledFontFaces;
83 HashMap<String, OwnPtr<HashMap<unsigned, RefPtr<CSSSegmentedFontFace> > >, C aseFoldingHash> m_fonts; 85 HashMap<String, OwnPtr<HashMap<unsigned, RefPtr<CSSSegmentedFontFace> > >, C aseFoldingHash> m_fonts;
84 HashSet<FontSelectorClient*> m_clients; 86 HashSet<FontSelectorClient*> m_clients;
85 87
86 Vector<CachedResourceHandle<CachedFont> > m_fontsToBeginLoading; 88 Vector<CachedResourceHandle<CachedFont> > m_fontsToBeginLoading;
87 Timer<CSSFontSelector> m_beginLoadingTimer; 89 Timer<CSSFontSelector> m_beginLoadingTimer;
90
91 unsigned m_version;
88 }; 92 };
89 93
90 } // namespace WebCore 94 } // namespace WebCore
91 95
92 #endif // CSSFontSelector_h 96 #endif // CSSFontSelector_h
OLDNEW
« no previous file with comments | « LayoutTests/fast/css/resources/ahem.css ('k') | Source/WebCore/css/CSSFontSelector.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698