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) Research In Motion Limited 2010. All rights reserved. | 5 * Copyright (C) Research In Motion Limited 2010. All rights reserved. |
6 * | 6 * |
7 * This library is free software; you can redistribute it and/or | 7 * This library is free software; you can redistribute it and/or |
8 * modify it under the terms of the GNU Library General Public | 8 * modify it under the terms of the GNU Library General Public |
9 * License as published by the Free Software Foundation; either | 9 * License as published by the Free Software Foundation; either |
10 * version 2 of the License, or (at your option) any later version. | 10 * version 2 of the License, or (at your option) any later version. |
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
68 child->paint(childPaintInfo, IntPoint(), 0, 0); | 68 child->paint(childPaintInfo, IntPoint(), 0, 0); |
69 } | 69 } |
70 } | 70 } |
71 | 71 |
72 SVGRenderSupport::finishRenderSVGContent(boxRenderer, childPaintInfo, paintI
nfo.context); | 72 SVGRenderSupport::finishRenderSVGContent(boxRenderer, childPaintInfo, paintI
nfo.context); |
73 } | 73 } |
74 | 74 |
75 IntRect SVGInlineFlowBox::calculateBoundaries() const | 75 IntRect SVGInlineFlowBox::calculateBoundaries() const |
76 { | 76 { |
77 IntRect childRect; | 77 IntRect childRect; |
78 for (InlineBox* child = firstChild(); child; child = child->nextOnLine()) | 78 for (InlineBox* child = firstChild(); child; child = child->nextOnLine()) { |
| 79 if (!child->isSVGInlineTextBox() && !child->isSVGInlineFlowBox()) |
| 80 continue; |
79 childRect.unite(child->calculateBoundaries()); | 81 childRect.unite(child->calculateBoundaries()); |
| 82 } |
80 return childRect; | 83 return childRect; |
81 } | 84 } |
82 | 85 |
83 void SVGInlineFlowBox::computeTextMatchMarkerRectForRenderer(RenderSVGInlineText
* textRenderer) | 86 void SVGInlineFlowBox::computeTextMatchMarkerRectForRenderer(RenderSVGInlineText
* textRenderer) |
84 { | 87 { |
85 ASSERT(textRenderer); | 88 ASSERT(textRenderer); |
86 | 89 |
87 Node* node = textRenderer->node(); | 90 Node* node = textRenderer->node(); |
88 if (!node || !node->inDocument()) | 91 if (!node || !node->inDocument()) |
89 return; | 92 return; |
(...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
138 } | 141 } |
139 } | 142 } |
140 | 143 |
141 toRenderedDocumentMarker(marker)->setRenderedRect(textRenderer->localToA
bsoluteQuad(markerRect).enclosingBoundingBox()); | 144 toRenderedDocumentMarker(marker)->setRenderedRect(textRenderer->localToA
bsoluteQuad(markerRect).enclosingBoundingBox()); |
142 } | 145 } |
143 } | 146 } |
144 | 147 |
145 } // namespace WebCore | 148 } // namespace WebCore |
146 | 149 |
147 #endif // ENABLE(SVG) | 150 #endif // ENABLE(SVG) |
OLD | NEW |