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

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

Issue 276573010: Adding Locale (language attribute) information to font and using the (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Comment fix Created 6 years, 7 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 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 25 matching lines...) Expand all
36 36
37 namespace WebCore { 37 namespace WebCore {
38 38
39 struct SameSizeAsFontDescription { 39 struct SameSizeAsFontDescription {
40 FontFamily familyList; 40 FontFamily familyList;
41 RefPtr<FontFeatureSettings> m_featureSettings; 41 RefPtr<FontFeatureSettings> m_featureSettings;
42 float sizes[4]; 42 float sizes[4];
43 // FXIME: Make them fit into one word. 43 // FXIME: Make them fit into one word.
44 uint32_t bitfields; 44 uint32_t bitfields;
45 uint32_t bitfields2 : 7; 45 uint32_t bitfields2 : 7;
46 hb_language_t locale;
Inactive 2014/05/22 13:52:02 Ditto, please move this up after the RefPtr.
46 }; 47 };
47 48
48 COMPILE_ASSERT(sizeof(FontDescription) == sizeof(SameSizeAsFontDescription), Fon tDescription_should_stay_small); 49 COMPILE_ASSERT(sizeof(FontDescription) == sizeof(SameSizeAsFontDescription), Fon tDescription_should_stay_small);
49 50
50 TypesettingFeatures FontDescription::s_defaultTypesettingFeatures = 0; 51 TypesettingFeatures FontDescription::s_defaultTypesettingFeatures = 0;
51 52
52 bool FontDescription::s_useSubpixelTextPositioning = false; 53 bool FontDescription::s_useSubpixelTextPositioning = false;
53 54
54 FontWeight FontDescription::lighterWeight(void) const 55 FontWeight FontDescription::lighterWeight(void) const
55 { 56 {
(...skipping 138 matching lines...) Expand 10 before | Expand all | Expand 10 after
194 } 195 }
195 196
196 if (discretionaryLigaturesState() == FontDescription::EnabledLigaturesState 197 if (discretionaryLigaturesState() == FontDescription::EnabledLigaturesState
197 || historicalLigaturesState() == FontDescription::EnabledLigaturesState 198 || historicalLigaturesState() == FontDescription::EnabledLigaturesState
198 || contextualLigaturesState() == FontDescription::EnabledLigaturesState) { 199 || contextualLigaturesState() == FontDescription::EnabledLigaturesState) {
199 m_typesettingFeatures |= WebCore::Ligatures; 200 m_typesettingFeatures |= WebCore::Ligatures;
200 } 201 }
201 } 202 }
202 203
203 } // namespace WebCore 204 } // namespace WebCore
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698