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

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

Issue 627773002: Move painting code from SVGInlineTextBox to SVGInlineTextBoxPainter. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Fix debug build. 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
« no previous file with comments | « Source/core/rendering/InlineTextBox.cpp ('k') | Source/core/rendering/svg/SVGInlineTextBox.h » ('j') | 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/rendering/svg/RenderSVGInlineText.h" 27 #include "core/rendering/svg/RenderSVGInlineText.h"
27 #include "core/rendering/svg/SVGInlineTextBox.h" 28 #include "core/rendering/svg/SVGInlineTextBox.h"
28 #include "core/rendering/svg/SVGRenderingContext.h" 29 #include "core/rendering/svg/SVGRenderingContext.h"
29 30
30 namespace blink { 31 namespace blink {
31 32
32 void SVGInlineFlowBox::paintSelectionBackground(PaintInfo& paintInfo) 33 void SVGInlineFlowBox::paintSelectionBackground(PaintInfo& paintInfo)
33 { 34 {
34 ASSERT(paintInfo.phase == PaintPhaseForeground || paintInfo.phase == PaintPh aseSelection); 35 ASSERT(paintInfo.phase == PaintPhaseForeground || paintInfo.phase == PaintPh aseSelection);
35 36
36 PaintInfo childPaintInfo(paintInfo); 37 PaintInfo childPaintInfo(paintInfo);
37 for (InlineBox* child = firstChild(); child; child = child->nextOnLine()) { 38 for (InlineBox* child = firstChild(); child; child = child->nextOnLine()) {
38 if (child->isSVGInlineTextBox()) 39 if (child->isSVGInlineTextBox())
39 toSVGInlineTextBox(child)->paintSelectionBackground(childPaintInfo); 40 SVGInlineTextBoxPainter(*toSVGInlineTextBox(child)).paintSelectionBa ckground(childPaintInfo);
40 else if (child->isSVGInlineFlowBox()) 41 else if (child->isSVGInlineFlowBox())
41 toSVGInlineFlowBox(child)->paintSelectionBackground(childPaintInfo); 42 toSVGInlineFlowBox(child)->paintSelectionBackground(childPaintInfo);
42 } 43 }
43 } 44 }
44 45
45 void SVGInlineFlowBox::paint(PaintInfo& paintInfo, const LayoutPoint& paintOffse t, LayoutUnit, LayoutUnit) 46 void SVGInlineFlowBox::paint(PaintInfo& paintInfo, const LayoutPoint& paintOffse t, LayoutUnit, LayoutUnit)
46 { 47 {
47 ASSERT(paintInfo.phase == PaintPhaseForeground || paintInfo.phase == PaintPh aseSelection); 48 ASSERT(paintInfo.phase == PaintPhaseForeground || paintInfo.phase == PaintPh aseSelection);
48 49
49 GraphicsContextStateSaver stateSaver(*paintInfo.context); 50 GraphicsContextStateSaver stateSaver(*paintInfo.context);
50 SVGRenderingContext renderingContext(&renderer(), paintInfo); 51 SVGRenderingContext renderingContext(&renderer(), paintInfo);
51 if (renderingContext.isRenderingPrepared()) { 52 if (renderingContext.isRenderingPrepared()) {
52 for (InlineBox* child = firstChild(); child; child = child->nextOnLine() ) 53 for (InlineBox* child = firstChild(); child; child = child->nextOnLine() )
53 child->paint(paintInfo, paintOffset, 0, 0); 54 child->paint(paintInfo, paintOffset, 0, 0);
54 } 55 }
55 } 56 }
56 57
57 FloatRect SVGInlineFlowBox::calculateBoundaries() const 58 FloatRect SVGInlineFlowBox::calculateBoundaries() const
58 { 59 {
59 FloatRect childRect; 60 FloatRect childRect;
60 for (InlineBox* child = firstChild(); child; child = child->nextOnLine()) { 61 for (InlineBox* child = firstChild(); child; child = child->nextOnLine()) {
61 if (!child->isSVGInlineTextBox() && !child->isSVGInlineFlowBox()) 62 if (!child->isSVGInlineTextBox() && !child->isSVGInlineFlowBox())
62 continue; 63 continue;
63 childRect.unite(child->calculateBoundaries()); 64 childRect.unite(child->calculateBoundaries());
64 } 65 }
65 return childRect; 66 return childRect;
66 } 67 }
67 68
68 } // namespace blink 69 } // namespace blink
OLDNEW
« no previous file with comments | « Source/core/rendering/InlineTextBox.cpp ('k') | Source/core/rendering/svg/SVGInlineTextBox.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698