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

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

Issue 926193003: Move rendering/RenderBox to layout/LayoutBox. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 5 years, 10 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
« no previous file with comments | « Source/core/layout/line/LineBreaker.h ('k') | Source/core/layout/line/RootInlineBox.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 15 matching lines...) Expand all
26 #include "core/layout/line/BreakingContextInlineHeaders.h" 26 #include "core/layout/line/BreakingContextInlineHeaders.h"
27 27
28 namespace blink { 28 namespace blink {
29 29
30 void LineBreaker::skipLeadingWhitespace(InlineBidiResolver& resolver, LineInfo& lineInfo, 30 void LineBreaker::skipLeadingWhitespace(InlineBidiResolver& resolver, LineInfo& lineInfo,
31 FloatingObject* lastFloatFromPreviousLine, LineWidth& width) 31 FloatingObject* lastFloatFromPreviousLine, LineWidth& width)
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 RenderBox* box = toRenderBox(object); 36 LayoutBox* box = toLayoutBox(object);
37 setStaticPositions(m_block, box); 37 setStaticPositions(m_block, box);
38 bool originallyInline = box->style()->isOriginalDisplayInlineType(); 38 bool originallyInline = box->style()->isOriginalDisplayInlineType();
39 box->markStaticPositionedBoxForLayout(box->style()->isHorizontalWrit ingMode(), originallyInline); 39 box->markStaticPositionedBoxForLayout(box->style()->isHorizontalWrit ingMode(), originallyInline);
40 if (originallyInline) { 40 if (originallyInline) {
41 resolver.runs().addRun(createRun(0, 1, object, resolver)); 41 resolver.runs().addRun(createRun(0, 1, object, resolver));
42 lineInfo.incrementRunsFromLeadingWhitespace(); 42 lineInfo.incrementRunsFromLeadingWhitespace();
43 } 43 }
44 } else if (object->isFloating()) { 44 } else if (object->isFloating()) {
45 m_block->positionNewFloatOnLine(m_block->insertFloatingObject(*toRen derBox(object)), lastFloatFromPreviousLine, lineInfo, width); 45 m_block->positionNewFloatOnLine(m_block->insertFloatingObject(*toLay outBox(object)), lastFloatFromPreviousLine, lineInfo, width);
46 } 46 }
47 resolver.position().increment(&resolver); 47 resolver.position().increment(&resolver);
48 } 48 }
49 resolver.commitExplicitEmbedding(resolver.runs()); 49 resolver.commitExplicitEmbedding(resolver.runs());
50 } 50 }
51 51
52 void LineBreaker::reset() 52 void LineBreaker::reset()
53 { 53 {
54 m_positionedObjects.clear(); 54 m_positionedObjects.clear();
55 m_hyphenated = false; 55 m_hyphenated = false;
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after
106 106
107 context.increment(); 107 context.increment();
108 } 108 }
109 109
110 context.clearLineBreakIfFitsOnLine(); 110 context.clearLineBreakIfFitsOnLine();
111 111
112 return context.handleEndOfLine(); 112 return context.handleEndOfLine();
113 } 113 }
114 114
115 } 115 }
OLDNEW
« no previous file with comments | « Source/core/layout/line/LineBreaker.h ('k') | Source/core/layout/line/RootInlineBox.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698