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

Side by Side Diff: Source/core/rendering/RenderBlockLineLayout.cpp

Issue 18601002: Add infrastructure for partial layouts (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: define RenderObject::frameView in the header Created 7 years, 3 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
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 2136 matching lines...) Expand 10 before | Expand all | Expand 10 after
2147 } else if (o->isText() || (o->isRenderInline() && !walker.atEndOfInl ine())) { 2147 } else if (o->isText() || (o->isRenderInline() && !walker.atEndOfInl ine())) {
2148 if (!o->isText()) 2148 if (!o->isText())
2149 toRenderInline(o)->updateAlwaysCreateLineBoxes(layoutState.i sFullLayout()); 2149 toRenderInline(o)->updateAlwaysCreateLineBoxes(layoutState.i sFullLayout());
2150 if (layoutState.isFullLayout() || o->selfNeedsLayout()) 2150 if (layoutState.isFullLayout() || o->selfNeedsLayout())
2151 dirtyLineBoxesForRenderer(o, layoutState.isFullLayout()); 2151 dirtyLineBoxesForRenderer(o, layoutState.isFullLayout());
2152 o->clearNeedsLayout(); 2152 o->clearNeedsLayout();
2153 } 2153 }
2154 } 2154 }
2155 2155
2156 for (size_t i = 0; i < replacedChildren.size(); i++) 2156 for (size_t i = 0; i < replacedChildren.size(); i++)
2157 replacedChildren[i]->layoutIfNeeded(); 2157 replacedChildren[i]->layoutIfNeeded();
2158 2158
2159 layoutRunsAndFloats(layoutState, hasInlineChild); 2159 layoutRunsAndFloats(layoutState, hasInlineChild);
2160 } 2160 }
2161 2161
2162 // Expand the last line to accommodate Ruby and emphasis marks. 2162 // Expand the last line to accommodate Ruby and emphasis marks.
2163 int lastLineAnnotationsAdjustment = 0; 2163 int lastLineAnnotationsAdjustment = 0;
2164 if (lastRootBox()) { 2164 if (lastRootBox()) {
2165 LayoutUnit lowestAllowedPosition = max(lastRootBox()->lineBottom(), logi calHeight() + paddingAfter()); 2165 LayoutUnit lowestAllowedPosition = max(lastRootBox()->lineBottom(), logi calHeight() + paddingAfter());
2166 if (!style()->isFlippedLinesWritingMode()) 2166 if (!style()->isFlippedLinesWritingMode())
2167 lastLineAnnotationsAdjustment = lastRootBox()->computeUnderAnnotatio nAdjustment(lowestAllowedPosition); 2167 lastLineAnnotationsAdjustment = lastRootBox()->computeUnderAnnotatio nAdjustment(lowestAllowedPosition);
(...skipping 1346 matching lines...) Expand 10 before | Expand all | Expand 10 after
3514 lineGridBox->alignBoxesInBlockDirection(logicalHeight(), textBoxDataMap, ver ticalPositionCache); 3514 lineGridBox->alignBoxesInBlockDirection(logicalHeight(), textBoxDataMap, ver ticalPositionCache);
3515 3515
3516 setLineGridBox(lineGridBox); 3516 setLineGridBox(lineGridBox);
3517 3517
3518 // FIXME: If any of the characteristics of the box change compared to the ol d one, then we need to do a deep dirtying 3518 // FIXME: If any of the characteristics of the box change compared to the ol d one, then we need to do a deep dirtying
3519 // (similar to what happens when the page height changes). Ideally, though, we only do this if someone is actually snapping 3519 // (similar to what happens when the page height changes). Ideally, though, we only do this if someone is actually snapping
3520 // to this grid. 3520 // to this grid.
3521 } 3521 }
3522 3522
3523 } 3523 }
OLDNEW
« no previous file with comments | « Source/core/rendering/RenderBlock.cpp ('k') | Source/core/rendering/RenderDeprecatedFlexibleBox.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698