| 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 |
| (...skipping 79 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 90 } | 90 } |
| 91 | 91 |
| 92 SVGTextMetricsCalculator::~SVGTextMetricsCalculator() | 92 SVGTextMetricsCalculator::~SVGTextMetricsCalculator() |
| 93 { | 93 { |
| 94 if (m_bidiRun) | 94 if (m_bidiRun) |
| 95 m_bidiResolver.runs().deleteRuns(); | 95 m_bidiResolver.runs().deleteRuns(); |
| 96 } | 96 } |
| 97 | 97 |
| 98 void SVGTextMetricsCalculator::setupBidiRuns() | 98 void SVGTextMetricsCalculator::setupBidiRuns() |
| 99 { | 99 { |
| 100 const LayoutStyle& style = m_text->styleRef(); | 100 const ComputedStyle& style = m_text->styleRef(); |
| 101 m_textDirection = style.direction(); | 101 m_textDirection = style.direction(); |
| 102 if (isOverride(style.unicodeBidi())) | 102 if (isOverride(style.unicodeBidi())) |
| 103 return; | 103 return; |
| 104 | 104 |
| 105 BidiStatus status(LTR, false); | 105 BidiStatus status(LTR, false); |
| 106 status.last = status.lastStrong = WTF::Unicode::OtherNeutral; | 106 status.last = status.lastStrong = WTF::Unicode::OtherNeutral; |
| 107 m_bidiResolver.setStatus(status); | 107 m_bidiResolver.setStatus(status); |
| 108 m_bidiResolver.setPositionIgnoringNestedIsolates(TextRunIterator(&m_run, 0))
; | 108 m_bidiResolver.setPositionIgnoringNestedIsolates(TextRunIterator(&m_run, 0))
; |
| 109 const bool hardLineBreak = false; | 109 const bool hardLineBreak = false; |
| 110 const bool reorderRuns = false; | 110 const bool reorderRuns = false; |
| (...skipping 157 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 268 } | 268 } |
| 269 | 269 |
| 270 void SVGTextMetricsBuilder::buildMetricsAndLayoutAttributes(LayoutSVGText* textR
oot, LayoutSVGInlineText* stopAtLeaf, SVGCharacterDataMap& allCharactersMap) | 270 void SVGTextMetricsBuilder::buildMetricsAndLayoutAttributes(LayoutSVGText* textR
oot, LayoutSVGInlineText* stopAtLeaf, SVGCharacterDataMap& allCharactersMap) |
| 271 { | 271 { |
| 272 ASSERT(textRoot); | 272 ASSERT(textRoot); |
| 273 MeasureTextData data(&allCharactersMap); | 273 MeasureTextData data(&allCharactersMap); |
| 274 walkTree(textRoot, stopAtLeaf, &data); | 274 walkTree(textRoot, stopAtLeaf, &data); |
| 275 } | 275 } |
| 276 | 276 |
| 277 } | 277 } |
| OLD | NEW |