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

Unified Diff: Source/core/layout/line/RootInlineBox.cpp

Issue 1296383005: Remove FIXME re: negative maxHeight. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 5 years, 4 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/layout/line/RootInlineBox.cpp
diff --git a/Source/core/layout/line/RootInlineBox.cpp b/Source/core/layout/line/RootInlineBox.cpp
index 71fe8aad86a3ee685dd2b4cec5ea6e67ee814af7..613922a46a56796dd460e69209405555ec8e0de4 100644
--- a/Source/core/layout/line/RootInlineBox.cpp
+++ b/Source/core/layout/line/RootInlineBox.cpp
@@ -63,7 +63,6 @@ RootInlineBox::RootInlineBox(LayoutBlockFlow& block)
setIsHorizontal(block.isHorizontalWritingMode());
}
-
void RootInlineBox::destroy()
{
detachEllipsisBox();
@@ -228,7 +227,7 @@ LayoutUnit RootInlineBox::alignBoxesInBlockDirection(LayoutUnit heightOfBlock, G
m_hasAnnotationsBefore = hasAnnotationsBefore;
m_hasAnnotationsAfter = hasAnnotationsAfter;
- maxHeight = std::max<LayoutUnit>(0, maxHeight); // FIXME: Is this really necessary?
+ maxHeight = std::max<LayoutUnit>(0, maxHeight);
setLineTopBottomPositions(lineTop, lineBottom, heightOfBlock, heightOfBlock + maxHeight, selectionBottom);
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698