| 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 |
| (...skipping 82 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 93 if (diff != StyleDifferenceLayout) | 93 if (diff != StyleDifferenceLayout) |
| 94 return; | 94 return; |
| 95 | 95 |
| 96 // The text metrics may be influenced by style changes. | 96 // The text metrics may be influenced by style changes. |
| 97 if (RenderSVGText* textRenderer = RenderSVGText::locateRenderSVGTextAncestor
(this)) | 97 if (RenderSVGText* textRenderer = RenderSVGText::locateRenderSVGTextAncestor
(this)) |
| 98 textRenderer->subtreeStyleDidChange(this); | 98 textRenderer->subtreeStyleDidChange(this); |
| 99 } | 99 } |
| 100 | 100 |
| 101 InlineTextBox* RenderSVGInlineText::createTextBox() | 101 InlineTextBox* RenderSVGInlineText::createTextBox() |
| 102 { | 102 { |
| 103 InlineTextBox* box = new (renderArena()) SVGInlineTextBox(this); | 103 InlineTextBox* box = new SVGInlineTextBox(this); |
| 104 box->setHasVirtualLogicalHeight(); | 104 box->setHasVirtualLogicalHeight(); |
| 105 return box; | 105 return box; |
| 106 } | 106 } |
| 107 | 107 |
| 108 LayoutRect RenderSVGInlineText::localCaretRect(InlineBox* box, int caretOffset,
LayoutUnit*) | 108 LayoutRect RenderSVGInlineText::localCaretRect(InlineBox* box, int caretOffset,
LayoutUnit*) |
| 109 { | 109 { |
| 110 if (!box || !box->isInlineTextBox()) | 110 if (!box || !box->isInlineTextBox()) |
| 111 return LayoutRect(); | 111 return LayoutRect(); |
| 112 | 112 |
| 113 InlineTextBox* textBox = static_cast<InlineTextBox*>(box); | 113 InlineTextBox* textBox = static_cast<InlineTextBox*>(box); |
| (...skipping 125 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 239 FontDescription fontDescription(style->fontDescription()); | 239 FontDescription fontDescription(style->fontDescription()); |
| 240 | 240 |
| 241 // FIXME: We need to better handle the case when we compute very small fonts
below (below 1pt). | 241 // FIXME: We need to better handle the case when we compute very small fonts
below (below 1pt). |
| 242 fontDescription.setComputedSize(FontSize::getComputedSizeFromSpecifiedSize(d
ocument, scalingFactor, fontDescription.isAbsoluteSize(), fontDescription.specif
iedSize(), DoNotUseSmartMinimumForFontSize)); | 242 fontDescription.setComputedSize(FontSize::getComputedSizeFromSpecifiedSize(d
ocument, scalingFactor, fontDescription.isAbsoluteSize(), fontDescription.specif
iedSize(), DoNotUseSmartMinimumForFontSize)); |
| 243 | 243 |
| 244 scaledFont = Font(fontDescription, 0, 0); | 244 scaledFont = Font(fontDescription, 0, 0); |
| 245 scaledFont.update(styleResolver->fontSelector()); | 245 scaledFont.update(styleResolver->fontSelector()); |
| 246 } | 246 } |
| 247 | 247 |
| 248 } | 248 } |
| OLD | NEW |