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

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

Issue 716213002: Remove 'paginated line width' from RootInlineBox. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 6 years, 1 month 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
« no previous file with comments | « no previous file | Source/core/rendering/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 1033 matching lines...) Expand 10 before | Expand all | Expand 10 after
1044 LayoutUnit bottomVisualOverflow = lastRootBox()->logicalBottomVisual Overflow(); 1044 LayoutUnit bottomVisualOverflow = lastRootBox()->logicalBottomVisual Overflow();
1045 LayoutUnit bottomLayoutOverflow = lastRootBox()->logicalBottomLayout Overflow(); 1045 LayoutUnit bottomLayoutOverflow = lastRootBox()->logicalBottomLayout Overflow();
1046 TrailingFloatsRootInlineBox* trailingFloatsLineBox = new TrailingFlo atsRootInlineBox(*this); 1046 TrailingFloatsRootInlineBox* trailingFloatsLineBox = new TrailingFlo atsRootInlineBox(*this);
1047 m_lineBoxes.appendLineBox(trailingFloatsLineBox); 1047 m_lineBoxes.appendLineBox(trailingFloatsLineBox);
1048 trailingFloatsLineBox->setConstructed(); 1048 trailingFloatsLineBox->setConstructed();
1049 GlyphOverflowAndFallbackFontsMap textBoxDataMap; 1049 GlyphOverflowAndFallbackFontsMap textBoxDataMap;
1050 VerticalPositionCache verticalPositionCache; 1050 VerticalPositionCache verticalPositionCache;
1051 LayoutUnit blockLogicalHeight = logicalHeight(); 1051 LayoutUnit blockLogicalHeight = logicalHeight();
1052 trailingFloatsLineBox->alignBoxesInBlockDirection(blockLogicalHeight , textBoxDataMap, verticalPositionCache); 1052 trailingFloatsLineBox->alignBoxesInBlockDirection(blockLogicalHeight , textBoxDataMap, verticalPositionCache);
1053 trailingFloatsLineBox->setLineTopBottomPositions(blockLogicalHeight, blockLogicalHeight, blockLogicalHeight, blockLogicalHeight); 1053 trailingFloatsLineBox->setLineTopBottomPositions(blockLogicalHeight, blockLogicalHeight, blockLogicalHeight, blockLogicalHeight);
1054 trailingFloatsLineBox->setPaginatedLineWidth(availableLogicalWidthFo rContent());
1055 LayoutRect logicalLayoutOverflow(0, blockLogicalHeight, 1, bottomLay outOverflow - blockLogicalHeight); 1054 LayoutRect logicalLayoutOverflow(0, blockLogicalHeight, 1, bottomLay outOverflow - blockLogicalHeight);
1056 LayoutRect logicalVisualOverflow(0, blockLogicalHeight, 1, bottomVis ualOverflow - blockLogicalHeight); 1055 LayoutRect logicalVisualOverflow(0, blockLogicalHeight, 1, bottomVis ualOverflow - blockLogicalHeight);
1057 trailingFloatsLineBox->setOverflowFromLogicalRects(logicalLayoutOver flow, logicalVisualOverflow, trailingFloatsLineBox->lineTop(), trailingFloatsLin eBox->lineBottom()); 1056 trailingFloatsLineBox->setOverflowFromLogicalRects(logicalLayoutOver flow, logicalVisualOverflow, trailingFloatsLineBox->lineTop(), trailingFloatsLin eBox->lineBottom());
1058 } 1057 }
1059 1058
1060 for (; it != end; ++it) 1059 for (; it != end; ++it)
1061 appendFloatingObjectToLastLine(it->get()); 1060 appendFloatingObjectToLastLine(it->get());
1062 } 1061 }
1063 } 1062 }
1064 1063
(...skipping 981 matching lines...) Expand 10 before | Expand all | Expand 10 after
2046 float logicalLeft = logicalLeftOffsetForLine(logicalHeight(), false).toFloat (); 2045 float logicalLeft = logicalLeftOffsetForLine(logicalHeight(), false).toFloat ();
2047 float availableLogicalWidth = logicalRightOffsetForLine(logicalHeight(), fal se) - logicalLeft; 2046 float availableLogicalWidth = logicalRightOffsetForLine(logicalHeight(), fal se) - logicalLeft;
2048 updateLogicalWidthForAlignment(textAlign, 0, 0, logicalLeft, totalLogicalWid th, availableLogicalWidth, 0); 2047 updateLogicalWidthForAlignment(textAlign, 0, 0, logicalLeft, totalLogicalWid th, availableLogicalWidth, 0);
2049 2048
2050 if (!style()->isLeftToRightDirection()) 2049 if (!style()->isLeftToRightDirection())
2051 return logicalWidth() - logicalLeft; 2050 return logicalWidth() - logicalLeft;
2052 return logicalLeft; 2051 return logicalLeft;
2053 } 2052 }
2054 2053
2055 } 2054 }
OLDNEW
« no previous file with comments | « no previous file | Source/core/rendering/RootInlineBox.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698