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

Side by Side Diff: Source/core/layout/line/LineBreaker.h

Issue 926193003: Move rendering/RenderBox to layout/LayoutBox. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 5 years, 10 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/layout/line/InlineFlowBox.cpp ('k') | Source/core/layout/line/LineBreaker.cpp » ('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) 2000 Lars Knoll (knoll@kde.org) 2 * Copyright (C) 2000 Lars Knoll (knoll@kde.org)
3 * Copyright (C) 2003, 2004, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All r ight reserved. 3 * Copyright (C) 2003, 2004, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All r ight reserved.
4 * Copyright (C) 2010 Google Inc. All rights reserved. 4 * Copyright (C) 2010 Google Inc. All rights reserved.
5 * 5 *
6 * This library is free software; you can redistribute it and/or 6 * This library is free software; you can redistribute it and/or
7 * modify it under the terms of the GNU Library General Public 7 * modify it under the terms of the GNU Library General Public
8 * License as published by the Free Software Foundation; either 8 * License as published by the Free Software Foundation; either
9 * version 2 of the License, or (at your option) any later version. 9 * version 2 of the License, or (at your option) any later version.
10 * 10 *
(...skipping 28 matching lines...) Expand all
39 LineBreaker(RenderBlockFlow* block) 39 LineBreaker(RenderBlockFlow* block)
40 : m_block(block) 40 : m_block(block)
41 { 41 {
42 reset(); 42 reset();
43 } 43 }
44 44
45 InlineIterator nextLineBreak(InlineBidiResolver&, LineInfo&, LayoutTextInfo& , 45 InlineIterator nextLineBreak(InlineBidiResolver&, LineInfo&, LayoutTextInfo& ,
46 FloatingObject* lastFloatFromPreviousLine, WordMeasurements&); 46 FloatingObject* lastFloatFromPreviousLine, WordMeasurements&);
47 47
48 bool lineWasHyphenated() { return m_hyphenated; } 48 bool lineWasHyphenated() { return m_hyphenated; }
49 const Vector<RenderBox*>& positionedObjects() { return m_positionedObjects; } 49 const Vector<LayoutBox*>& positionedObjects() { return m_positionedObjects; }
50 EClear clear() { return m_clear; } 50 EClear clear() { return m_clear; }
51 private: 51 private:
52 void reset(); 52 void reset();
53 53
54 void skipLeadingWhitespace(InlineBidiResolver&, LineInfo&, FloatingObject* l astFloatFromPreviousLine, LineWidth&); 54 void skipLeadingWhitespace(InlineBidiResolver&, LineInfo&, FloatingObject* l astFloatFromPreviousLine, LineWidth&);
55 55
56 RenderBlockFlow* m_block; 56 RenderBlockFlow* m_block;
57 bool m_hyphenated; 57 bool m_hyphenated;
58 EClear m_clear; 58 EClear m_clear;
59 Vector<RenderBox*> m_positionedObjects; 59 Vector<LayoutBox*> m_positionedObjects;
60 }; 60 };
61 61
62 } 62 }
63 63
64 #endif // LineBreaker_h 64 #endif // LineBreaker_h
OLDNEW
« no previous file with comments | « Source/core/layout/line/InlineFlowBox.cpp ('k') | Source/core/layout/line/LineBreaker.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698