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

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

Issue 329853006: Move RenderTextInfo and WordMeasurement into their own headers. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 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) 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 *
11 * This library is distributed in the hope that it will be useful, 11 * This library is distributed in the hope that it will be useful,
12 * but WITHOUT ANY WARRANTY; without even the implied warranty of 12 * but WITHOUT ANY WARRANTY; without even the implied warranty of
13 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU 13 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
14 * Library General Public License for more details. 14 * Library General Public License for more details.
15 * 15 *
16 * You should have received a copy of the GNU Library General Public License 16 * You should have received a copy of the GNU Library General Public License
17 * along with this library; see the file COPYING.LIB. If not, write to 17 * along with this library; see the file COPYING.LIB. If not, write to
18 * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, 18 * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
19 * Boston, MA 02110-1301, USA. 19 * Boston, MA 02110-1301, USA.
20 * 20 *
21 */ 21 */
22 22
23 #ifndef LineBreaker_h 23 #ifndef LineBreaker_h
24 #define LineBreaker_h 24 #define LineBreaker_h
25 25
26 #include "core/rendering/InlineIterator.h" 26 #include "core/rendering/InlineIterator.h"
27 #include "core/rendering/line/LineInfo.h" 27 #include "core/rendering/line/LineInfo.h"
28 #include "platform/text/TextBreakIterator.h"
29 #include "wtf/Vector.h" 28 #include "wtf/Vector.h"
30 29
31 namespace WebCore { 30 namespace WebCore {
32 31
33 enum WhitespacePosition { LeadingWhitespace, TrailingWhitespace }; 32 enum WhitespacePosition { LeadingWhitespace, TrailingWhitespace };
34 33
35 class RenderText; 34 struct RenderTextInfo;
36
37 struct RenderTextInfo {
38 RenderTextInfo();
39 ~RenderTextInfo();
40
41 RenderText* m_text;
42 LazyLineBreakIterator m_lineBreakIterator;
43 const Font* m_font;
44 };
45 35
46 class LineBreaker { 36 class LineBreaker {
47 public: 37 public:
48 friend class BreakingContext; 38 friend class BreakingContext;
49 LineBreaker(RenderBlockFlow* block) 39 LineBreaker(RenderBlockFlow* block)
50 : m_block(block) 40 : m_block(block)
51 { 41 {
52 reset(); 42 reset();
53 } 43 }
54 44
55 InlineIterator nextLineBreak(InlineBidiResolver&, LineInfo&, RenderTextInfo& , FloatingObject* lastFloatFromPreviousLine, unsigned consecutiveHyphenatedLines , WordMeasurements&); 45 InlineIterator nextLineBreak(InlineBidiResolver&, LineInfo&, RenderTextInfo& , FloatingObject* lastFloatFromPreviousLine, unsigned consecutiveHyphenatedLines , WordMeasurements&);
56 46
57 bool lineWasHyphenated() { return m_hyphenated; } 47 bool lineWasHyphenated() { return m_hyphenated; }
58 const Vector<RenderBox*>& positionedObjects() { return m_positionedObjects; } 48 const Vector<RenderBox*>& positionedObjects() { return m_positionedObjects; }
59 EClear clear() { return m_clear; } 49 EClear clear() { return m_clear; }
60 private: 50 private:
61 void reset(); 51 void reset();
62 52
63 void skipLeadingWhitespace(InlineBidiResolver&, LineInfo&, FloatingObject* l astFloatFromPreviousLine, LineWidth&); 53 void skipLeadingWhitespace(InlineBidiResolver&, LineInfo&, FloatingObject* l astFloatFromPreviousLine, LineWidth&);
64 54
65 RenderBlockFlow* m_block; 55 RenderBlockFlow* m_block;
66 bool m_hyphenated; 56 bool m_hyphenated;
67 EClear m_clear; 57 EClear m_clear;
68 Vector<RenderBox*> m_positionedObjects; 58 Vector<RenderBox*> m_positionedObjects;
69 }; 59 };
70 60
71 } 61 }
72 62
73 #endif // LineBreaker_h 63 #endif // LineBreaker_h
OLDNEW
« no previous file with comments | « Source/core/rendering/line/BreakingContextInlineHeaders.h ('k') | Source/core/rendering/line/RenderTextInfo.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698