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

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

Issue 1429713004: Implement CSS font-display (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 1 month 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 52 matching lines...) Expand 10 before | Expand all | Expand 10 after
63 63
64 void setSegmentedFontFace(CSSSegmentedFontFace*); 64 void setSegmentedFontFace(CSSSegmentedFontFace*);
65 void clearSegmentedFontFace() { m_segmentedFontFace = nullptr; } 65 void clearSegmentedFontFace() { m_segmentedFontFace = nullptr; }
66 66
67 bool isValid() const { return !m_sources.isEmpty(); } 67 bool isValid() const { return !m_sources.isEmpty(); }
68 68
69 void addSource(PassOwnPtrWillBeRawPtr<CSSFontFaceSource>); 69 void addSource(PassOwnPtrWillBeRawPtr<CSSFontFaceSource>);
70 70
71 void didBeginLoad(); 71 void didBeginLoad();
72 void fontLoaded(RemoteFontFaceSource*); 72 void fontLoaded(RemoteFontFaceSource*);
73 void fontLoadWaitLimitExceeded(RemoteFontFaceSource*); 73 void fontDataInvalidated(RemoteFontFaceSource*);
kinuko 2015/11/05 05:17:36 This is not directly related to your CL, but it'd
Kunihiko Sakamoto 2015/11/05 08:41:27 Since this is called from only single place, I ren
74 74
75 PassRefPtr<SimpleFontData> getFontData(const FontDescription&); 75 PassRefPtr<SimpleFontData> getFontData(const FontDescription&);
76 76
77 struct UnicodeRange { 77 struct UnicodeRange {
78 ALLOW_ONLY_INLINE_ALLOCATION(); 78 ALLOW_ONLY_INLINE_ALLOCATION();
79 UnicodeRange(UChar32 from, UChar32 to) 79 UnicodeRange(UChar32 from, UChar32 to)
80 : m_from(from) 80 : m_from(from)
81 , m_to(to) 81 , m_to(to)
82 { 82 {
83 } 83 }
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
123 123
124 UnicodeRangeSet m_ranges; 124 UnicodeRangeSet m_ranges;
125 RawPtrWillBeMember<CSSSegmentedFontFace> m_segmentedFontFace; 125 RawPtrWillBeMember<CSSSegmentedFontFace> m_segmentedFontFace;
126 WillBeHeapDeque<OwnPtrWillBeMember<CSSFontFaceSource>> m_sources; 126 WillBeHeapDeque<OwnPtrWillBeMember<CSSFontFaceSource>> m_sources;
127 RawPtrWillBeMember<FontFace> m_fontFace; 127 RawPtrWillBeMember<FontFace> m_fontFace;
128 }; 128 };
129 129
130 } 130 }
131 131
132 #endif 132 #endif
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698