Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(71)

Side by Side Diff: Source/core/rendering/svg/SVGInlineFlowBox.cpp

Issue 671943004: Move SVG inline flow box paint code to SVGInlineFlowBoxPainter (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « Source/core/paint/SVGRootInlineBoxPainter.cpp ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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.
11 * 11 *
12 * This library is distributed in the hope that it will be useful, 12 * This library is distributed in the hope that it will be useful,
13 * but WITHOUT ANY WARRANTY; without even the implied warranty of 13 * but WITHOUT ANY WARRANTY; without even the implied warranty of
14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU 14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
15 * Library General Public License for more details. 15 * Library General Public License for more details.
16 * 16 *
17 * You should have received a copy of the GNU Library General Public License 17 * You should have received a copy of the GNU Library General Public License
18 * along with this library; see the file COPYING.LIB. If not, write to 18 * along with this library; see the file COPYING.LIB. If not, write to
19 * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, 19 * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
20 * Boston, MA 02110-1301, USA. 20 * Boston, MA 02110-1301, USA.
21 */ 21 */
22 22
23 #include "config.h" 23 #include "config.h"
24 #include "core/rendering/svg/SVGInlineFlowBox.h" 24 #include "core/rendering/svg/SVGInlineFlowBox.h"
25 25
26 #include "core/paint/SVGInlineTextBoxPainter.h" 26 #include "core/paint/SVGInlineFlowBoxPainter.h"
27 #include "core/rendering/svg/RenderSVGInlineText.h"
28 #include "core/rendering/svg/SVGInlineTextBox.h" 27 #include "core/rendering/svg/SVGInlineTextBox.h"
29 #include "core/rendering/svg/SVGRenderingContext.h"
30 28
31 namespace blink { 29 namespace blink {
32 30
33 void SVGInlineFlowBox::paintSelectionBackground(PaintInfo& paintInfo) 31 void SVGInlineFlowBox::paintSelectionBackground(PaintInfo& paintInfo)
34 { 32 {
35 ASSERT(paintInfo.phase == PaintPhaseForeground || paintInfo.phase == PaintPh aseSelection); 33 SVGInlineFlowBoxPainter(*this).paintSelectionBackground(paintInfo);
36
37 PaintInfo childPaintInfo(paintInfo);
38 for (InlineBox* child = firstChild(); child; child = child->nextOnLine()) {
39 if (child->isSVGInlineTextBox())
40 SVGInlineTextBoxPainter(*toSVGInlineTextBox(child)).paintSelectionBa ckground(childPaintInfo);
41 else if (child->isSVGInlineFlowBox())
42 toSVGInlineFlowBox(child)->paintSelectionBackground(childPaintInfo);
43 }
44 } 34 }
45 35
46 void SVGInlineFlowBox::paint(PaintInfo& paintInfo, const LayoutPoint& paintOffse t, LayoutUnit, LayoutUnit) 36 void SVGInlineFlowBox::paint(PaintInfo& paintInfo, const LayoutPoint& paintOffse t, LayoutUnit, LayoutUnit)
47 { 37 {
48 ASSERT(paintInfo.phase == PaintPhaseForeground || paintInfo.phase == PaintPh aseSelection); 38 SVGInlineFlowBoxPainter(*this).paint(paintInfo, paintOffset);
49
50 GraphicsContextStateSaver stateSaver(*paintInfo.context);
51 SVGRenderingContext renderingContext(&renderer(), paintInfo);
52 if (renderingContext.isRenderingPrepared()) {
53 for (InlineBox* child = firstChild(); child; child = child->nextOnLine() )
54 child->paint(paintInfo, paintOffset, 0, 0);
55 }
56 } 39 }
57 40
58 FloatRect SVGInlineFlowBox::calculateBoundaries() const 41 FloatRect SVGInlineFlowBox::calculateBoundaries() const
59 { 42 {
60 FloatRect childRect; 43 FloatRect childRect;
61 for (InlineBox* child = firstChild(); child; child = child->nextOnLine()) { 44 for (InlineBox* child = firstChild(); child; child = child->nextOnLine()) {
62 if (!child->isSVGInlineTextBox() && !child->isSVGInlineFlowBox()) 45 if (!child->isSVGInlineTextBox() && !child->isSVGInlineFlowBox())
63 continue; 46 continue;
64 childRect.unite(child->calculateBoundaries()); 47 childRect.unite(child->calculateBoundaries());
65 } 48 }
66 return childRect; 49 return childRect;
67 } 50 }
68 51
69 } // namespace blink 52 } // namespace blink
OLDNEW
« no previous file with comments | « Source/core/paint/SVGRootInlineBoxPainter.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698