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

Side by Side Diff: Source/platform/fonts/FontDescription.cpp

Issue 1317143005: [WIP] do something :-) (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 5 years, 3 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 | « Source/platform/Length.cpp ('k') | Source/platform/graphics/paint/DisplayItem.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 Nicholas Shanks <contact@nickshanks.com> 2 * Copyright (C) 2007 Nicholas Shanks <contact@nickshanks.com>
3 * Copyright (C) 2008 Apple Inc. All rights reserved. 3 * Copyright (C) 2008 Apple Inc. All rights reserved.
4 * 4 *
5 * Redistribution and use in source and binary forms, with or without 5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions 6 * modification, are permitted provided that the following conditions
7 * are met: 7 * are met:
8 * 8 *
9 * 1. Redistributions of source code must retain the above copyright 9 * 1. Redistributions of source code must retain the above copyright
10 * notice, this list of conditions and the following disclaimer. 10 * notice, this list of conditions and the following disclaimer.
(...skipping 13 matching lines...) Expand all
24 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND 24 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
25 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 25 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
26 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF 26 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
27 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 27 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
28 */ 28 */
29 29
30 #include "config.h" 30 #include "config.h"
31 #include "platform/fonts/FontDescription.h" 31 #include "platform/fonts/FontDescription.h"
32 32
33 #include "platform/RuntimeEnabledFeatures.h" 33 #include "platform/RuntimeEnabledFeatures.h"
34 #include "wtf/SizeAssertions.h"
34 #include "wtf/text/AtomicStringHash.h" 35 #include "wtf/text/AtomicStringHash.h"
35 #include "wtf/text/StringHash.h" 36 #include "wtf/text/StringHash.h"
36 37
37 namespace blink { 38 namespace blink {
38 39
39 struct SameSizeAsFontDescription { 40 ASSERT_SIZE(FontDescription, 48, 64);
40 FontFamily familyList;
41 RefPtr<FontFeatureSettings> m_featureSettings;
42 AtomicString locale;
43 float sizes[6];
44 // FXIME: Make them fit into one word.
45 uint32_t bitfields;
46 uint32_t bitfields2 : 7;
47 };
48
49 static_assert(sizeof(FontDescription) == sizeof(SameSizeAsFontDescription), "Fon tDescription should stay small");
50 41
51 TypesettingFeatures FontDescription::s_defaultTypesettingFeatures = 0; 42 TypesettingFeatures FontDescription::s_defaultTypesettingFeatures = 0;
52 43
53 bool FontDescription::s_useSubpixelTextPositioning = false; 44 bool FontDescription::s_useSubpixelTextPositioning = false;
54 45
55 FontWeight FontDescription::lighterWeight(FontWeight weight) 46 FontWeight FontDescription::lighterWeight(FontWeight weight)
56 { 47 {
57 switch (weight) { 48 switch (weight) {
58 case FontWeight100: 49 case FontWeight100:
59 case FontWeight200: 50 case FontWeight200:
(...skipping 174 matching lines...) Expand 10 before | Expand all | Expand 10 after
234 225
235 if (discretionaryLigaturesState() == FontDescription::EnabledLigaturesSt ate 226 if (discretionaryLigaturesState() == FontDescription::EnabledLigaturesSt ate
236 || historicalLigaturesState() == FontDescription::EnabledLigaturesSt ate 227 || historicalLigaturesState() == FontDescription::EnabledLigaturesSt ate
237 || contextualLigaturesState() == FontDescription::EnabledLigaturesSt ate) { 228 || contextualLigaturesState() == FontDescription::EnabledLigaturesSt ate) {
238 m_typesettingFeatures |= blink::Ligatures; 229 m_typesettingFeatures |= blink::Ligatures;
239 } 230 }
240 } 231 }
241 } 232 }
242 233
243 } // namespace blink 234 } // namespace blink
OLDNEW
« no previous file with comments | « Source/platform/Length.cpp ('k') | Source/platform/graphics/paint/DisplayItem.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698