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

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

Issue 316353003: Remove font fetching fallback for CORS failures (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Add/Update tests Created 6 years, 6 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
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 = nullptr; } 64 void clearSegmentedFontFace() { m_segmentedFontFace = nullptr; }
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
71 void addSource(PassOwnPtrWillBeRawPtr<CSSFontFaceSource>); 68 void addSource(PassOwnPtrWillBeRawPtr<CSSFontFaceSource>);
72 69
73 void didBeginLoad(); 70 void didBeginLoad();
74 void fontLoaded(RemoteFontFaceSource*); 71 void fontLoaded(RemoteFontFaceSource*);
75 void fontLoadWaitLimitExceeded(RemoteFontFaceSource*); 72 void fontLoadWaitLimitExceeded(RemoteFontFaceSource*);
76 73
77 PassRefPtr<SimpleFontData> getFontData(const FontDescription&); 74 PassRefPtr<SimpleFontData> getFontData(const FontDescription&);
78 75
79 struct UnicodeRange { 76 struct UnicodeRange {
80 UnicodeRange(UChar32 from, UChar32 to) 77 UnicodeRange(UChar32 from, UChar32 to)
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
120 117
121 UnicodeRangeSet m_ranges; 118 UnicodeRangeSet m_ranges;
122 RawPtrWillBeMember<CSSSegmentedFontFace> m_segmentedFontFace; 119 RawPtrWillBeMember<CSSSegmentedFontFace> m_segmentedFontFace;
123 WillBeHeapDeque<OwnPtrWillBeMember<CSSFontFaceSource> > m_sources; 120 WillBeHeapDeque<OwnPtrWillBeMember<CSSFontFaceSource> > m_sources;
124 RawPtrWillBeMember<FontFace> m_fontFace; 121 RawPtrWillBeMember<FontFace> m_fontFace;
125 }; 122 };
126 123
127 } 124 }
128 125
129 #endif 126 #endif
OLDNEW
« no previous file with comments | « LayoutTests/http/tests/webfont/webfont-cors-expected.html ('k') | Source/core/css/CSSFontFace.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698