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

Side by Side Diff: Source/core/layout/svg/line/SVGInlineFlowBox.cpp

Issue 1043643002: Switch line layout to LayoutUnit. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: More TestExpectations tweaks Created 5 years, 6 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
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.
(...skipping 15 matching lines...) Expand all
26 #include "core/layout/svg/line/SVGInlineTextBox.h" 26 #include "core/layout/svg/line/SVGInlineTextBox.h"
27 #include "core/paint/SVGInlineFlowBoxPainter.h" 27 #include "core/paint/SVGInlineFlowBoxPainter.h"
28 28
29 namespace blink { 29 namespace blink {
30 30
31 void SVGInlineFlowBox::paint(const PaintInfo& paintInfo, const LayoutPoint& pain tOffset, LayoutUnit, LayoutUnit) 31 void SVGInlineFlowBox::paint(const PaintInfo& paintInfo, const LayoutPoint& pain tOffset, LayoutUnit, LayoutUnit)
32 { 32 {
33 SVGInlineFlowBoxPainter(*this).paint(paintInfo, paintOffset); 33 SVGInlineFlowBoxPainter(*this).paint(paintInfo, paintOffset);
34 } 34 }
35 35
36 FloatRectWillBeLayoutRect SVGInlineFlowBox::calculateBoundaries() const 36 LayoutRect SVGInlineFlowBox::calculateBoundaries() const
37 { 37 {
38 FloatRectWillBeLayoutRect childRect; 38 LayoutRect childRect;
39 for (InlineBox* child = firstChild(); child; child = child->nextOnLine()) { 39 for (InlineBox* child = firstChild(); child; child = child->nextOnLine()) {
40 if (!child->isSVGInlineTextBox() && !child->isSVGInlineFlowBox()) 40 if (!child->isSVGInlineTextBox() && !child->isSVGInlineFlowBox())
41 continue; 41 continue;
42 childRect.unite(child->calculateBoundaries()); 42 childRect.unite(child->calculateBoundaries());
43 } 43 }
44 return childRect; 44 return childRect;
45 } 45 }
46 46
47 } // namespace blink 47 } // namespace blink
OLDNEW
« no previous file with comments | « Source/core/layout/svg/line/SVGInlineFlowBox.h ('k') | Source/core/layout/svg/line/SVGInlineTextBox.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698