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

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

Issue 1899193007: Remove special-code for paginating floats followed by lines of text. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 8 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
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 27 matching lines...) Expand all
38 class LineBreaker { 38 class LineBreaker {
39 STACK_ALLOCATED(); 39 STACK_ALLOCATED();
40 public: 40 public:
41 friend class BreakingContext; 41 friend class BreakingContext;
42 LineBreaker(LineLayoutBlockFlow block) 42 LineBreaker(LineLayoutBlockFlow block)
43 : m_block(block) 43 : m_block(block)
44 { 44 {
45 reset(); 45 reset();
46 } 46 }
47 47
48 InlineIterator nextLineBreak(InlineBidiResolver&, LineInfo&, LayoutTextInfo& , 48 InlineIterator nextLineBreak(InlineBidiResolver&, LineInfo&, LayoutTextInfo& , WordMeasurements&);
49 FloatingObject* lastFloatFromPreviousLine, WordMeasurements&);
50 49
51 bool lineWasHyphenated() { return m_hyphenated; } 50 bool lineWasHyphenated() { return m_hyphenated; }
52 const Vector<LineLayoutBox>& positionedObjects() { return m_positionedObject s; } 51 const Vector<LineLayoutBox>& positionedObjects() { return m_positionedObject s; }
53 EClear clear() { return m_clear; } 52 EClear clear() { return m_clear; }
54 private: 53 private:
55 void reset(); 54 void reset();
56 55
57 void skipLeadingWhitespace(InlineBidiResolver&, LineInfo&, FloatingObject* l astFloatFromPreviousLine, LineWidth&); 56 void skipLeadingWhitespace(InlineBidiResolver&, LineInfo&, LineWidth&);
58 57
59 LineLayoutBlockFlow m_block; 58 LineLayoutBlockFlow m_block;
60 bool m_hyphenated; 59 bool m_hyphenated;
61 EClear m_clear; 60 EClear m_clear;
62 Vector<LineLayoutBox> m_positionedObjects; 61 Vector<LineLayoutBox> m_positionedObjects;
63 }; 62 };
64 63
65 } // namespace blink 64 } // namespace blink
66 65
67 #endif // LineBreaker_h 66 #endif // LineBreaker_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698