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

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

Issue 230383003: Webfont CORS-enabled fetching with fallback (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Rebase & reverse the enum values Created 6 years, 8 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 | « no previous file | Source/core/css/CSSFontFace.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 47 matching lines...) Expand 10 before | Expand all | Expand 10 after
58 58
59 FontFace* fontFace() const { return m_fontFace; } 59 FontFace* fontFace() const { return m_fontFace; }
60 60
61 UnicodeRangeSet& ranges() { return m_ranges; } 61 UnicodeRangeSet& ranges() { return m_ranges; }
62 62
63 void setSegmentedFontFace(CSSSegmentedFontFace*); 63 void setSegmentedFontFace(CSSSegmentedFontFace*);
64 void clearSegmentedFontFace() { m_segmentedFontFace = 0; } 64 void clearSegmentedFontFace() { m_segmentedFontFace = 0; }
65 65
66 bool isValid() const { return !m_sources.isEmpty(); } 66 bool isValid() const { return !m_sources.isEmpty(); }
67 67
68 // FIXME: Should not be exposed (used by tentative CORS fallback code).
69 CSSFontSelector* fontSelector() const;
70
68 void addSource(PassOwnPtr<CSSFontFaceSource>); 71 void addSource(PassOwnPtr<CSSFontFaceSource>);
69 72
70 void beginLoadIfNeeded(CSSFontFaceSource*, CSSFontSelector* = 0); 73 void beginLoadIfNeeded(CSSFontFaceSource*, CSSFontSelector* = 0);
71 void fontLoaded(RemoteFontFaceSource*); 74 void fontLoaded(RemoteFontFaceSource*);
72 void fontLoadWaitLimitExceeded(RemoteFontFaceSource*); 75 void fontLoadWaitLimitExceeded(RemoteFontFaceSource*);
73 76
74 PassRefPtr<SimpleFontData> getFontData(const FontDescription&); 77 PassRefPtr<SimpleFontData> getFontData(const FontDescription&);
75 78
76 struct UnicodeRange { 79 struct UnicodeRange {
77 UnicodeRange(UChar32 from, UChar32 to) 80 UnicodeRange(UChar32 from, UChar32 to)
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
115 // FIXME: Oilpan: Make m_segmentedFontFace a RawPtrWillBeMember when moving 118 // FIXME: Oilpan: Make m_segmentedFontFace a RawPtrWillBeMember when moving
116 // CSSFontFace to the heap. 119 // CSSFontFace to the heap.
117 CSSSegmentedFontFace* m_segmentedFontFace; 120 CSSSegmentedFontFace* m_segmentedFontFace;
118 Deque<OwnPtr<CSSFontFaceSource> > m_sources; 121 Deque<OwnPtr<CSSFontFaceSource> > m_sources;
119 FontFace* m_fontFace; 122 FontFace* m_fontFace;
120 }; 123 };
121 124
122 } 125 }
123 126
124 #endif 127 #endif
OLDNEW
« no previous file with comments | « no previous file | Source/core/css/CSSFontFace.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698