| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) Research In Motion Limited 2010-2012. All rights reserved. | 2 * Copyright (C) Research In Motion Limited 2010-2012. 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 #include "config.h" | 20 #include "config.h" |
| 21 | 21 |
| 22 #include "core/layout/svg/SVGTextMetrics.h" | 22 #include "core/layout/svg/SVGTextMetrics.h" |
| 23 | 23 |
| 24 #include "core/layout/svg/LayoutSVGInlineText.h" | 24 #include "core/layout/svg/LayoutSVGInlineText.h" |
| 25 #include "platform/fonts/FontOrientation.h" |
| 25 | 26 |
| 26 namespace blink { | 27 namespace blink { |
| 27 | 28 |
| 28 SVGTextMetrics::SVGTextMetrics() | 29 SVGTextMetrics::SVGTextMetrics() |
| 29 : m_width(0) | 30 : m_width(0) |
| 30 , m_height(0) | 31 , m_height(0) |
| 31 , m_length(0) | 32 , m_length(0) |
| 32 { | 33 { |
| 33 } | 34 } |
| 34 | 35 |
| (...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 96 | 97 |
| 97 float scalingFactor = text->scalingFactor(); | 98 float scalingFactor = text->scalingFactor(); |
| 98 ASSERT(scalingFactor); | 99 ASSERT(scalingFactor); |
| 99 | 100 |
| 100 m_width = width / scalingFactor; | 101 m_width = width / scalingFactor; |
| 101 m_height = text->scaledFont().fontMetrics().floatHeight() / scalingFactor; | 102 m_height = text->scaledFont().fontMetrics().floatHeight() / scalingFactor; |
| 102 | 103 |
| 103 m_length = length; | 104 m_length = length; |
| 104 } | 105 } |
| 105 | 106 |
| 107 float SVGTextMetrics::advance(FontOrientation orientation) const |
| 108 { |
| 109 switch (orientation) { |
| 110 case FontOrientation::Horizontal: |
| 111 case FontOrientation::VerticalRotated: |
| 112 return width(); |
| 113 case FontOrientation::VerticalUpright: |
| 114 return height(); |
| 115 default: |
| 116 ASSERT_NOT_REACHED(); |
| 117 return width(); |
| 118 } |
| 106 } | 119 } |
| 120 |
| 121 } |
| OLD | NEW |