OLD | NEW |
1 /* | 1 /* |
2 * Copyright (C) 2006 Oliver Hunt <ojh16@student.canterbury.ac.nz> | 2 * Copyright (C) 2006 Oliver Hunt <ojh16@student.canterbury.ac.nz> |
3 * Copyright (C) 2006 Apple Computer Inc. | 3 * Copyright (C) 2006 Apple Computer Inc. |
4 * Copyright (C) 2007 Nikolas Zimmermann <zimmermann@kde.org> | 4 * Copyright (C) 2007 Nikolas Zimmermann <zimmermann@kde.org> |
5 * Copyright (C) 2008 Rob Buis <buis@kde.org> | 5 * Copyright (C) 2008 Rob Buis <buis@kde.org> |
6 * Copyright (C) Research In Motion Limited 2010. All rights reserved. | 6 * Copyright (C) Research In Motion Limited 2010. All rights reserved. |
7 * | 7 * |
8 * This library is free software; you can redistribute it and/or | 8 * This library is free software; you can redistribute it and/or |
9 * modify it under the terms of the GNU Library General Public | 9 * modify it under the terms of the GNU Library General Public |
10 * License as published by the Free Software Foundation; either | 10 * License as published by the Free Software Foundation; either |
11 * version 2 of the License, or (at your option) any later version. | 11 * version 2 of the License, or (at your option) any later version. |
12 * | 12 * |
13 * This library is distributed in the hope that it will be useful, | 13 * This library is distributed in the hope that it will be useful, |
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of | 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of |
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
16 * Library General Public License for more details. | 16 * Library General Public License for more details. |
17 * | 17 * |
18 * You should have received a copy of the GNU Library General Public License | 18 * You should have received a copy of the GNU Library General Public License |
19 * along with this library; see the file COPYING.LIB. If not, write to | 19 * along with this library; see the file COPYING.LIB. If not, write to |
20 * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, | 20 * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, |
21 * Boston, MA 02110-1301, USA. | 21 * Boston, MA 02110-1301, USA. |
22 */ | 22 */ |
23 | 23 |
24 #include "config.h" | 24 #include "config.h" |
25 | 25 |
26 #include "core/rendering/svg/RenderSVGInlineText.h" | 26 #include "core/rendering/svg/RenderSVGInlineText.h" |
27 | 27 |
28 #include "core/css/CSSFontSelector.h" | 28 #include "core/css/CSSFontSelector.h" |
29 #include "core/css/FontSize.h" | 29 #include "core/css/FontSize.h" |
30 #include "core/css/resolver/StyleResolver.h" | |
31 #include "core/editing/VisiblePosition.h" | 30 #include "core/editing/VisiblePosition.h" |
32 #include "core/rendering/svg/RenderSVGText.h" | 31 #include "core/rendering/svg/RenderSVGText.h" |
33 #include "core/rendering/svg/SVGInlineTextBox.h" | 32 #include "core/rendering/svg/SVGInlineTextBox.h" |
34 #include "core/rendering/svg/SVGRenderingContext.h" | 33 #include "core/rendering/svg/SVGRenderingContext.h" |
35 | 34 |
36 namespace WebCore { | 35 namespace WebCore { |
37 | 36 |
38 static PassRefPtr<StringImpl> applySVGWhitespaceRules(PassRefPtr<StringImpl> str
ing, bool preserveWhiteSpace) | 37 static PassRefPtr<StringImpl> applySVGWhitespaceRules(PassRefPtr<StringImpl> str
ing, bool preserveWhiteSpace) |
39 { | 38 { |
40 if (preserveWhiteSpace) { | 39 if (preserveWhiteSpace) { |
(...skipping 189 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
230 if (style->fontDescription().textRenderingMode() == GeometricPrecision) | 229 if (style->fontDescription().textRenderingMode() == GeometricPrecision) |
231 scalingFactor = 1; | 230 scalingFactor = 1; |
232 | 231 |
233 FontDescription fontDescription(style->fontDescription()); | 232 FontDescription fontDescription(style->fontDescription()); |
234 | 233 |
235 Document& document = renderer->document(); | 234 Document& document = renderer->document(); |
236 // FIXME: We need to better handle the case when we compute very small fonts
below (below 1pt). | 235 // FIXME: We need to better handle the case when we compute very small fonts
below (below 1pt). |
237 fontDescription.setComputedSize(FontSize::getComputedSizeFromSpecifiedSize(&
document, scalingFactor, fontDescription.isAbsoluteSize(), fontDescription.speci
fiedSize(), DoNotUseSmartMinimumForFontSize)); | 236 fontDescription.setComputedSize(FontSize::getComputedSizeFromSpecifiedSize(&
document, scalingFactor, fontDescription.isAbsoluteSize(), fontDescription.speci
fiedSize(), DoNotUseSmartMinimumForFontSize)); |
238 | 237 |
239 scaledFont = Font(fontDescription, 0, 0); | 238 scaledFont = Font(fontDescription, 0, 0); |
240 scaledFont.update(document.ensureStyleResolver().fontSelector()); | 239 scaledFont.update(document.styleEngine()->fontSelector()); |
241 } | 240 } |
242 | 241 |
243 } | 242 } |
OLD | NEW |