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

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

Issue 752723004: Use references in RenderBlock and RenderBlockFlow methods (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: cover RenderBlockFlow class as well Created 6 years 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 RenderObject* object = resolver.position().object(); 34 RenderObject* object = resolver.position().object();
35 if (object->isOutOfFlowPositioned()) { 35 if (object->isOutOfFlowPositioned()) {
36 setStaticPositions(m_block, toRenderBox(object)); 36 setStaticPositions(m_block, toRenderBox(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(toRend erBox(object)), lastFloatFromPreviousLine, lineInfo, width); 42 m_block->positionNewFloatOnLine(m_block->insertFloatingObject(*toRen derBox(object)), lastFloatFromPreviousLine, lineInfo, width);
43 } else if (object->isText() && object->style()->hasTextCombine() && obje ct->isCombineText() && !toRenderCombineText(object)->isCombined()) { 43 } else if (object->isText() && object->style()->hasTextCombine() && obje ct->isCombineText() && !toRenderCombineText(object)->isCombined()) {
44 toRenderCombineText(object)->combineText(); 44 toRenderCombineText(object)->combineText();
45 if (toRenderCombineText(object)->isCombined()) 45 if (toRenderCombineText(object)->isCombined())
46 continue; 46 continue;
47 } 47 }
48 resolver.position().increment(&resolver); 48 resolver.position().increment(&resolver);
49 } 49 }
50 resolver.commitExplicitEmbedding(resolver.runs()); 50 resolver.commitExplicitEmbedding(resolver.runs());
51 } 51 }
52 52
(...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after
107 107
108 context.increment(); 108 context.increment();
109 } 109 }
110 110
111 context.clearLineBreakIfFitsOnLine(); 111 context.clearLineBreakIfFitsOnLine();
112 112
113 return context.handleEndOfLine(); 113 return context.handleEndOfLine();
114 } 114 }
115 115
116 } 116 }
OLDNEW
« no previous file with comments | « Source/core/rendering/line/BreakingContextInlineHeaders.h ('k') | Source/core/rendering/shapes/ShapeOutsideInfo.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698