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

Side by Side Diff: sky/engine/core/rendering/line/LineBreaker.cpp

Issue 700703002: Remove more float machinery. (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 6 years, 1 month 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 30 matching lines...) Expand all
41 } 41 }
42 resolver.position().increment(&resolver); 42 resolver.position().increment(&resolver);
43 } 43 }
44 resolver.commitExplicitEmbedding(resolver.runs()); 44 resolver.commitExplicitEmbedding(resolver.runs());
45 } 45 }
46 46
47 void LineBreaker::reset() 47 void LineBreaker::reset()
48 { 48 {
49 m_positionedObjects.clear(); 49 m_positionedObjects.clear();
50 m_hyphenated = false; 50 m_hyphenated = false;
51 m_clear = CNONE;
52 } 51 }
53 52
54 InlineIterator LineBreaker::nextLineBreak(InlineBidiResolver& resolver, LineInfo & lineInfo, 53 InlineIterator LineBreaker::nextLineBreak(InlineBidiResolver& resolver, LineInfo & lineInfo,
55 RenderTextInfo& renderTextInfo, FloatingObject* lastFloatFromPreviousLine, 54 RenderTextInfo& renderTextInfo, FloatingObject* lastFloatFromPreviousLine,
56 WordMeasurements& wordMeasurements) 55 WordMeasurements& wordMeasurements)
57 { 56 {
58 reset(); 57 reset();
59 58
60 ASSERT(resolver.position().root() == m_block); 59 ASSERT(resolver.position().root() == m_block);
61 60
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
97 96
98 context.increment(); 97 context.increment();
99 } 98 }
100 99
101 context.clearLineBreakIfFitsOnLine(); 100 context.clearLineBreakIfFitsOnLine();
102 101
103 return context.handleEndOfLine(); 102 return context.handleEndOfLine();
104 } 103 }
105 104
106 } 105 }
OLDNEW
« no previous file with comments | « sky/engine/core/rendering/line/LineBreaker.h ('k') | sky/engine/core/rendering/shapes/ShapeOutsideInfo.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698