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

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

Issue 763173003: Convert RenderBlockFlow code to use FloatingObject references (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: more usage of const with floatingObject 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
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 21 matching lines...) Expand all
32 { 32 {
33 while (!resolver.position().atEnd() && !requiresLineBox(resolver.position(), lineInfo, LeadingWhitespace)) { 33 while (!resolver.position().atEnd() && !requiresLineBox(resolver.position(), lineInfo, LeadingWhitespace)) {
34 LayoutObject* object = resolver.position().object(); 34 LayoutObject* object = resolver.position().object();
35 if (object->isOutOfFlowPositioned()) { 35 if (object->isOutOfFlowPositioned()) {
36 setStaticPositions(m_block, toLayoutBox(object)); 36 setStaticPositions(m_block, toLayoutBox(object));
37 if (object->style()->isOriginalDisplayInlineType()) { 37 if (object->style()->isOriginalDisplayInlineType()) {
38 resolver.runs().addRun(createRun(0, 1, object, resolver)); 38 resolver.runs().addRun(createRun(0, 1, object, resolver));
39 lineInfo.incrementRunsFromLeadingWhitespace(); 39 lineInfo.incrementRunsFromLeadingWhitespace();
40 } 40 }
41 } else if (object->isFloating()) { 41 } else if (object->isFloating()) {
42 m_block->positionNewFloatOnLine(m_block->insertFloatingObject(*toLay outBox(object)), lastFloatFromPreviousLine, lineInfo, width); 42 m_block->positionNewFloatOnLine(*(m_block->insertFloatingObject(*toL ayoutBox(object))), lastFloatFromPreviousLine, lineInfo, width);
Julien - ping for review 2015/06/10 15:15:44 Ditto.
Sunil Ratnu 2015/06/11 05:49:43 Done.
43 } 43 }
44 resolver.position().increment(&resolver); 44 resolver.position().increment(&resolver);
45 } 45 }
46 resolver.commitExplicitEmbedding(resolver.runs()); 46 resolver.commitExplicitEmbedding(resolver.runs());
47 } 47 }
48 48
49 void LineBreaker::reset() 49 void LineBreaker::reset()
50 { 50 {
51 m_positionedObjects.clear(); 51 m_positionedObjects.clear();
52 m_hyphenated = false; 52 m_hyphenated = false;
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after
103 103
104 context.increment(); 104 context.increment();
105 } 105 }
106 106
107 context.clearLineBreakIfFitsOnLine(); 107 context.clearLineBreakIfFitsOnLine();
108 108
109 return context.handleEndOfLine(); 109 return context.handleEndOfLine();
110 } 110 }
111 111
112 } 112 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698