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

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

Issue 669733011: Factor SVG root inline box paint code into SVGRootInlineBoxPainter (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Rebase for landing 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 * Copyright (C) 2011 Torch Mobile (Beijing) CO. Ltd. All rights reserved. 6 * Copyright (C) 2011 Torch Mobile (Beijing) CO. Ltd. 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
11 * version 2 of the License, or (at your option) any later version. 11 * version 2 of the License, or (at your option) any later version.
12 * 12 *
13 * This library is distributed in the hope that it will be useful, 13 * This library is distributed in the hope that it will be useful,
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
16 * Library General Public License for more details. 16 * Library General Public License for more details.
17 * 17 *
18 * You should have received a copy of the GNU Library General Public License 18 * You should have received a copy of the GNU Library General Public License
19 * along with this library; see the file COPYING.LIB. If not, write to 19 * along with this library; see the file COPYING.LIB. If not, write to
20 * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, 20 * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
21 * Boston, MA 02110-1301, USA. 21 * Boston, MA 02110-1301, USA.
22 */ 22 */
23 23
24 #include "config.h" 24 #include "config.h"
25 #include "core/rendering/svg/SVGRootInlineBox.h" 25 #include "core/rendering/svg/SVGRootInlineBox.h"
26 26
27 #include "core/paint/SVGInlineTextBoxPainter.h" 27 #include "core/paint/SVGRootInlineBoxPainter.h"
28 #include "core/rendering/svg/RenderSVGInlineText.h" 28 #include "core/rendering/svg/RenderSVGInlineText.h"
29 #include "core/rendering/svg/RenderSVGText.h" 29 #include "core/rendering/svg/RenderSVGText.h"
30 #include "core/rendering/svg/SVGInlineFlowBox.h" 30 #include "core/rendering/svg/SVGInlineFlowBox.h"
31 #include "core/rendering/svg/SVGInlineTextBox.h" 31 #include "core/rendering/svg/SVGInlineTextBox.h"
32 #include "core/rendering/svg/SVGRenderingContext.h"
33 32
34 namespace blink { 33 namespace blink {
35 34
36 void SVGRootInlineBox::paint(PaintInfo& paintInfo, const LayoutPoint& paintOffse t, LayoutUnit, LayoutUnit) 35 void SVGRootInlineBox::paint(PaintInfo& paintInfo, const LayoutPoint& paintOffse t, LayoutUnit, LayoutUnit)
37 { 36 {
38 ASSERT(paintInfo.phase == PaintPhaseForeground || paintInfo.phase == PaintPh aseSelection); 37 SVGRootInlineBoxPainter(*this).paint(paintInfo, paintOffset);
39
40 bool isPrinting = renderer().document().printing();
41 bool hasSelection = !isPrinting && selectionState() != RenderObject::Selecti onNone;
42
43 PaintInfo childPaintInfo(paintInfo);
44 if (hasSelection) {
45 for (InlineBox* child = firstChild(); child; child = child->nextOnLine() ) {
46 if (child->isSVGInlineTextBox())
47 SVGInlineTextBoxPainter(*toSVGInlineTextBox(child)).paintSelecti onBackground(childPaintInfo);
48 else if (child->isSVGInlineFlowBox())
49 toSVGInlineFlowBox(child)->paintSelectionBackground(childPaintIn fo);
50 }
51 }
52
53 GraphicsContextStateSaver stateSaver(*paintInfo.context);
54 SVGRenderingContext renderingContext(&renderer(), paintInfo);
55 if (renderingContext.isRenderingPrepared()) {
56 for (InlineBox* child = firstChild(); child; child = child->nextOnLine() )
57 child->paint(paintInfo, paintOffset, 0, 0);
58 }
59 } 38 }
60 39
61 void SVGRootInlineBox::markDirty() 40 void SVGRootInlineBox::markDirty()
62 { 41 {
63 for (InlineBox* child = firstChild(); child; child = child->nextOnLine()) 42 for (InlineBox* child = firstChild(); child; child = child->nextOnLine())
64 child->markDirty(); 43 child->markDirty();
65 RootInlineBox::markDirty(); 44 RootInlineBox::markDirty();
66 } 45 }
67 46
68 void SVGRootInlineBox::computePerCharacterLayoutInformation() 47 void SVGRootInlineBox::computePerCharacterLayoutInformation()
(...skipping 208 matching lines...) Expand 10 before | Expand all | Expand 10 after
277 } 256 }
278 } 257 }
279 258
280 void SVGRootInlineBox::reorderValueLists(Vector<SVGTextLayoutAttributes*>& attri butes) 259 void SVGRootInlineBox::reorderValueLists(Vector<SVGTextLayoutAttributes*>& attri butes)
281 { 260 {
282 Vector<InlineBox*> leafBoxesInLogicalOrder; 261 Vector<InlineBox*> leafBoxesInLogicalOrder;
283 collectLeafBoxesInLogicalOrder(leafBoxesInLogicalOrder, reverseInlineBoxRang eAndValueListsIfNeeded, &attributes); 262 collectLeafBoxesInLogicalOrder(leafBoxesInLogicalOrder, reverseInlineBoxRang eAndValueListsIfNeeded, &attributes);
284 } 263 }
285 264
286 } // namespace blink 265 } // 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