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

Side by Side Diff: Source/core/rendering/svg/SVGRootInlineBox.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/svg/SVGInlineTextBox.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/rendering/svg/RenderSVGInlineText.h" 28 #include "core/rendering/svg/RenderSVGInlineText.h"
28 #include "core/rendering/svg/RenderSVGText.h" 29 #include "core/rendering/svg/RenderSVGText.h"
29 #include "core/rendering/svg/SVGInlineFlowBox.h" 30 #include "core/rendering/svg/SVGInlineFlowBox.h"
30 #include "core/rendering/svg/SVGInlineTextBox.h" 31 #include "core/rendering/svg/SVGInlineTextBox.h"
31 #include "core/rendering/svg/SVGRenderingContext.h" 32 #include "core/rendering/svg/SVGRenderingContext.h"
32 33
33 namespace blink { 34 namespace blink {
34 35
35 void SVGRootInlineBox::paint(PaintInfo& paintInfo, const LayoutPoint& paintOffse t, LayoutUnit, LayoutUnit) 36 void SVGRootInlineBox::paint(PaintInfo& paintInfo, const LayoutPoint& paintOffse t, LayoutUnit, LayoutUnit)
36 { 37 {
37 ASSERT(paintInfo.phase == PaintPhaseForeground || paintInfo.phase == PaintPh aseSelection); 38 ASSERT(paintInfo.phase == PaintPhaseForeground || paintInfo.phase == PaintPh aseSelection);
38 39
39 bool isPrinting = renderer().document().printing(); 40 bool isPrinting = renderer().document().printing();
40 bool hasSelection = !isPrinting && selectionState() != RenderObject::Selecti onNone; 41 bool hasSelection = !isPrinting && selectionState() != RenderObject::Selecti onNone;
41 42
42 PaintInfo childPaintInfo(paintInfo); 43 PaintInfo childPaintInfo(paintInfo);
43 if (hasSelection) { 44 if (hasSelection) {
44 for (InlineBox* child = firstChild(); child; child = child->nextOnLine() ) { 45 for (InlineBox* child = firstChild(); child; child = child->nextOnLine() ) {
45 if (child->isSVGInlineTextBox()) 46 if (child->isSVGInlineTextBox())
46 toSVGInlineTextBox(child)->paintSelectionBackground(childPaintIn fo); 47 SVGInlineTextBoxPainter(*toSVGInlineTextBox(child)).paintSelecti onBackground(childPaintInfo);
47 else if (child->isSVGInlineFlowBox()) 48 else if (child->isSVGInlineFlowBox())
48 toSVGInlineFlowBox(child)->paintSelectionBackground(childPaintIn fo); 49 toSVGInlineFlowBox(child)->paintSelectionBackground(childPaintIn fo);
49 } 50 }
50 } 51 }
51 52
52 GraphicsContextStateSaver stateSaver(*paintInfo.context); 53 GraphicsContextStateSaver stateSaver(*paintInfo.context);
53 SVGRenderingContext renderingContext(&renderer(), paintInfo); 54 SVGRenderingContext renderingContext(&renderer(), paintInfo);
54 if (renderingContext.isRenderingPrepared()) { 55 if (renderingContext.isRenderingPrepared()) {
55 for (InlineBox* child = firstChild(); child; child = child->nextOnLine() ) 56 for (InlineBox* child = firstChild(); child; child = child->nextOnLine() )
56 child->paint(paintInfo, paintOffset, 0, 0); 57 child->paint(paintInfo, paintOffset, 0, 0);
(...skipping 219 matching lines...) Expand 10 before | Expand all | Expand 10 after
276 } 277 }
277 } 278 }
278 279
279 void SVGRootInlineBox::reorderValueLists(Vector<SVGTextLayoutAttributes*>& attri butes) 280 void SVGRootInlineBox::reorderValueLists(Vector<SVGTextLayoutAttributes*>& attri butes)
280 { 281 {
281 Vector<InlineBox*> leafBoxesInLogicalOrder; 282 Vector<InlineBox*> leafBoxesInLogicalOrder;
282 collectLeafBoxesInLogicalOrder(leafBoxesInLogicalOrder, reverseInlineBoxRang eAndValueListsIfNeeded, &attributes); 283 collectLeafBoxesInLogicalOrder(leafBoxesInLogicalOrder, reverseInlineBoxRang eAndValueListsIfNeeded, &attributes);
283 } 284 }
284 285
285 } // namespace blink 286 } // namespace blink
OLDNEW
« no previous file with comments | « Source/core/rendering/svg/SVGInlineTextBox.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698