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

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

Issue 1128713004: Don't mark a positioned object for layout when we've just laid it out. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Updated Created 5 years, 7 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/LayoutBox.cpp ('k') | no next file » | 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 LayoutBox* box = toLayoutBox(object); 36 setStaticPositions(m_block, toLayoutBox(object));
37 setStaticPositions(m_block, box); 37 if (object->style()->isOriginalDisplayInlineType()) {
38 bool originallyInline = box->style()->isOriginalDisplayInlineType();
39 box->markStaticPositionedBoxForLayout(box->style()->isHorizontalWrit ingMode(), originallyInline);
40 if (originallyInline) {
41 resolver.runs().addRun(createRun(0, 1, object, resolver)); 38 resolver.runs().addRun(createRun(0, 1, object, resolver));
42 lineInfo.incrementRunsFromLeadingWhitespace(); 39 lineInfo.incrementRunsFromLeadingWhitespace();
43 } 40 }
44 } else if (object->isFloating()) { 41 } else if (object->isFloating()) {
45 m_block->positionNewFloatOnLine(m_block->insertFloatingObject(*toLay outBox(object)), lastFloatFromPreviousLine, lineInfo, width); 42 m_block->positionNewFloatOnLine(m_block->insertFloatingObject(*toLay outBox(object)), lastFloatFromPreviousLine, lineInfo, width);
46 } 43 }
47 resolver.position().increment(&resolver); 44 resolver.position().increment(&resolver);
48 } 45 }
49 resolver.commitExplicitEmbedding(resolver.runs()); 46 resolver.commitExplicitEmbedding(resolver.runs());
50 } 47 }
(...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after
106 103
107 context.increment(); 104 context.increment();
108 } 105 }
109 106
110 context.clearLineBreakIfFitsOnLine(); 107 context.clearLineBreakIfFitsOnLine();
111 108
112 return context.handleEndOfLine(); 109 return context.handleEndOfLine();
113 } 110 }
114 111
115 } 112 }
OLDNEW
« no previous file with comments | « Source/core/layout/LayoutBox.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698