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 * This library is free software; you can redistribute it and/or | 4 * This library is free software; you can redistribute it and/or |
5 * modify it under the terms of the GNU Library General Public | 5 * modify it under the terms of the GNU Library General Public |
6 * License as published by the Free Software Foundation; either | 6 * License as published by the Free Software Foundation; either |
7 * version 2 of the License, or (at your option) any later version. | 7 * version 2 of the License, or (at your option) any later version. |
8 * | 8 * |
9 * This library is distributed in the hope that it will be useful, | 9 * This library is distributed in the hope that it will be useful, |
10 * but WITHOUT ANY WARRANTY; without even the implied warranty of | 10 * but WITHOUT ANY WARRANTY; without even the implied warranty of |
11 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | 11 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
12 * Library General Public License for more details. | 12 * Library General Public License for more details. |
13 * | 13 * |
14 * You should have received a copy of the GNU Library General Public License | 14 * You should have received a copy of the GNU Library General Public License |
15 * along with this library; see the file COPYING.LIB. If not, write to | 15 * along with this library; see the file COPYING.LIB. If not, write to |
16 * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, | 16 * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, |
17 * Boston, MA 02110-1301, USA. | 17 * Boston, MA 02110-1301, USA. |
18 * | 18 * |
19 */ | 19 */ |
20 | 20 |
21 #include "config.h" | 21 #include "config.h" |
22 #include "core/rendering/RenderCombineText.h" | 22 #include "core/rendering/RenderCombineText.h" |
23 | 23 |
24 #include "core/rendering/RenderBlock.h" | 24 #include "core/rendering/RenderBlock.h" |
25 #include "core/rendering/style/StyleInheritedData.h" | |
26 | 25 |
27 namespace WebCore { | 26 namespace WebCore { |
28 | 27 |
29 const float textCombineMargin = 1.1f; // Allow em + 10% margin | 28 const float textCombineMargin = 1.1f; // Allow em + 10% margin |
30 | 29 |
31 RenderCombineText::RenderCombineText(Node* node, PassRefPtr<StringImpl> string) | 30 RenderCombineText::RenderCombineText(Node* node, PassRefPtr<StringImpl> string) |
32 : RenderText(node, string) | 31 : RenderText(node, string) |
33 , m_combinedTextWidth(0) | 32 , m_combinedTextWidth(0) |
34 , m_isCombined(false) | 33 , m_isCombined(false) |
35 , m_needsFontUpdate(false) | 34 , m_needsFontUpdate(false) |
(...skipping 100 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
136 if (shouldUpdateFont) | 135 if (shouldUpdateFont) |
137 style()->font().update(fontSelector); | 136 style()->font().update(fontSelector); |
138 | 137 |
139 if (m_isCombined) { | 138 if (m_isCombined) { |
140 DEFINE_STATIC_LOCAL(String, objectReplacementCharacterString, (&objectRe
placementCharacter, 1)); | 139 DEFINE_STATIC_LOCAL(String, objectReplacementCharacterString, (&objectRe
placementCharacter, 1)); |
141 RenderText::setTextInternal(objectReplacementCharacterString.impl()); | 140 RenderText::setTextInternal(objectReplacementCharacterString.impl()); |
142 } | 141 } |
143 } | 142 } |
144 | 143 |
145 } // namespace WebCore | 144 } // namespace WebCore |
OLD | NEW |