OLD | NEW |
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 17 matching lines...) Expand all Loading... |
28 */ | 28 */ |
29 | 29 |
30 #include "config.h" | 30 #include "config.h" |
31 #include "core/platform/graphics/FontDescription.h" | 31 #include "core/platform/graphics/FontDescription.h" |
32 | 32 |
33 namespace WebCore { | 33 namespace WebCore { |
34 | 34 |
35 struct SameSizeAsFontDescription { | 35 struct SameSizeAsFontDescription { |
36 FontFamily familyList; | 36 FontFamily familyList; |
37 RefPtr<FontFeatureSettings> m_featureSettings; | 37 RefPtr<FontFeatureSettings> m_featureSettings; |
| 38 AtomicString m_locale; |
38 float sizes[2]; | 39 float sizes[2]; |
39 // FXIME: Make them fit into one word. | |
40 uint32_t bitfields; | 40 uint32_t bitfields; |
41 uint32_t bitfields2 : 8; | |
42 }; | 41 }; |
43 | 42 |
44 COMPILE_ASSERT(sizeof(FontDescription) == sizeof(SameSizeAsFontDescription), Fon
tDescription_should_stay_small); | 43 COMPILE_ASSERT(sizeof(FontDescription) == sizeof(SameSizeAsFontDescription), Fon
tDescription_should_stay_small); |
45 | 44 |
46 FontWeight FontDescription::lighterWeight(void) const | 45 FontWeight FontDescription::lighterWeight(void) const |
47 { | 46 { |
48 switch (m_weight) { | 47 switch (m_weight) { |
49 case FontWeight100: | 48 case FontWeight100: |
50 case FontWeight200: | 49 case FontWeight200: |
51 case FontWeight300: | 50 case FontWeight300: |
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
96 } | 95 } |
97 | 96 |
98 FontDescription FontDescription::makeNormalFeatureSettings() const | 97 FontDescription FontDescription::makeNormalFeatureSettings() const |
99 { | 98 { |
100 FontDescription normalDescription(*this); | 99 FontDescription normalDescription(*this); |
101 normalDescription.setFeatureSettings(0); | 100 normalDescription.setFeatureSettings(0); |
102 return normalDescription; | 101 return normalDescription; |
103 } | 102 } |
104 | 103 |
105 } // namespace WebCore | 104 } // namespace WebCore |
OLD | NEW |