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 22 matching lines...) Expand all Loading... | |
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; |
38 unsigned anUnsigned; | 38 unsigned anUnsigned; |
39 bool b; | 39 bool b; |
40 RefPtr<TextRun::RenderingContext> renderingContext; | 40 RefPtr<TextRun::RenderingContext> renderingContext; |
41 }; | 41 }; |
42 | 42 |
43 COMPILE_ASSERT(sizeof(TextRun) == sizeof(ExpectedTextRunSize), TextRun_is_not_of _expected_size); | 43 static_assert(sizeof(TextRun) == sizeof(ExpectedTextRunSize), "TextRun has expec ted_size"); |
Nico
2014/12/17 23:24:43
s/has/should have/?
s/expected_size/expected size/
Mostyn Bramley-Moore
2014/12/17 23:33:54
Done.
| |
44 | 44 |
45 void TextRun::setText(const String& string) | 45 void TextRun::setText(const String& string) |
46 { | 46 { |
47 m_len = string.length(); | 47 m_len = string.length(); |
48 if (!m_len) { | 48 if (!m_len) { |
49 m_data.characters8 = 0; | 49 m_data.characters8 = 0; |
50 m_is8Bit = true; | 50 m_is8Bit = true; |
51 return; | 51 return; |
52 } | 52 } |
53 m_is8Bit = string.is8Bit(); | 53 m_is8Bit = string.is8Bit(); |
54 if (m_is8Bit) | 54 if (m_is8Bit) |
55 m_data.characters8 = string.characters8(); | 55 m_data.characters8 = string.characters8(); |
56 else | 56 else |
57 m_data.characters16 = string.characters16(); | 57 m_data.characters16 = string.characters16(); |
58 } | 58 } |
59 | 59 |
60 } | 60 } |
OLD | NEW |