OLD | NEW |
---|---|
1 /* | 1 /* |
2 * Copyright (C) 2011 Apple Inc. All rights reserved. | 2 * Copyright (C) 2011 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 16 matching lines...) Expand all Loading... | |
27 #include "platform/text/TextRun.h" | 27 #include "platform/text/TextRun.h" |
28 | 28 |
29 namespace blink { | 29 namespace blink { |
30 | 30 |
31 struct ExpectedTextRunSize { | 31 struct ExpectedTextRunSize { |
32 const void* pointer; | 32 const void* pointer; |
33 int integers[2]; | 33 int integers[2]; |
34 float float1; | 34 float float1; |
35 float float2; | 35 float float2; |
36 float float3; | 36 float float3; |
37 uint32_t bitfields : 10; | 37 uint32_t bitfields : 10; |
leviw_travelin_and_unemployed
2014/08/11 17:34:46
It looks like we're only actually using 8 right no
dw.im
2014/08/12 02:47:09
If we pack m_textJustify into two bits, it become
| |
38 unsigned anUnsigned; | 38 unsigned anUnsigned; |
39 RefPtr<TextRun::RenderingContext> renderingContext; | 39 RefPtr<TextRun::RenderingContext> renderingContext; |
40 ETextJustify m_textJustify; | |
40 }; | 41 }; |
41 | 42 |
42 COMPILE_ASSERT(sizeof(TextRun) == sizeof(ExpectedTextRunSize), TextRun_is_not_of _expected_size); | 43 COMPILE_ASSERT(sizeof(TextRun) == sizeof(ExpectedTextRunSize), TextRun_is_not_of _expected_size); |
43 | 44 |
44 void TextRun::setText(const String& string) | 45 void TextRun::setText(const String& string) |
45 { | 46 { |
46 m_len = string.length(); | 47 m_len = string.length(); |
47 if (!m_len) { | 48 if (!m_len) { |
48 m_data.characters8 = 0; | 49 m_data.characters8 = 0; |
49 m_is8Bit = true; | 50 m_is8Bit = true; |
50 return; | 51 return; |
51 } | 52 } |
52 m_is8Bit = string.is8Bit(); | 53 m_is8Bit = string.is8Bit(); |
53 if (m_is8Bit) | 54 if (m_is8Bit) |
54 m_data.characters8 = string.characters8(); | 55 m_data.characters8 = string.characters8(); |
55 else | 56 else |
56 m_data.characters16 = string.characters16(); | 57 m_data.characters16 = string.characters16(); |
57 } | 58 } |
58 | 59 |
59 } | 60 } |
OLD | NEW |