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" | |
22 #include "core/layout/LayoutTextCombine.h" | 21 #include "core/layout/LayoutTextCombine.h" |
23 | 22 |
24 #include "core/layout/TextRunConstructor.h" | 23 #include "core/layout/TextRunConstructor.h" |
25 #include "platform/graphics/GraphicsContext.h" | 24 #include "platform/graphics/GraphicsContext.h" |
26 | 25 |
27 namespace blink { | 26 namespace blink { |
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 LayoutTextCombine::LayoutTextCombine(Node* node, PassRefPtr<StringImpl> string) | 30 LayoutTextCombine::LayoutTextCombine(Node* node, PassRefPtr<StringImpl> string) |
(...skipping 123 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
155 } else { | 154 } else { |
156 m_scaleX = 1.0f; | 155 m_scaleX = 1.0f; |
157 } | 156 } |
158 } | 157 } |
159 | 158 |
160 if (shouldUpdateFont) | 159 if (shouldUpdateFont) |
161 style()->font().update(fontSelector); | 160 style()->font().update(fontSelector); |
162 } | 161 } |
163 | 162 |
164 } // namespace blink | 163 } // namespace blink |
OLD | NEW |