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

Side by Side Diff: third_party/WebKit/Source/core/layout/LayoutDeprecatedFlexibleBox.cpp

Issue 2555923002: Changed TextDirection to an enum class and renamed its members (Closed)
Patch Set: Rebase after reopen Created 4 years 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
OLDNEW
1 /* 1 /*
2 * This file is part of the layout object implementation for KHTML. 2 * This file is part of the layout object implementation for KHTML.
3 * 3 *
4 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) 4 * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
5 * (C) 1999 Antti Koivisto (koivisto@kde.org) 5 * (C) 1999 Antti Koivisto (koivisto@kde.org)
6 * Copyright (C) 2003 Apple Computer, Inc. 6 * Copyright (C) 2003 Apple Computer, Inc.
7 * 7 *
8 * This library is free software; you can redistribute it and/or 8 * This library is free software; you can redistribute it and/or
9 * modify it under the terms of the GNU Library General Public 9 * modify it under the terms of the GNU Library General Public
10 * License as published by the Free Software Foundation; either 10 * License as published by the Free Software Foundation; either
(...skipping 1119 matching lines...) Expand 10 before | Expand all | Expand 10 after
1130 LayoutUnit newHeight( 1130 LayoutUnit newHeight(
1131 getHeightForLineCount(blockChild, numVisibleLines, true, dummyCount)); 1131 getHeightForLineCount(blockChild, numVisibleLines, true, dummyCount));
1132 if (newHeight == child->size().height()) 1132 if (newHeight == child->size().height())
1133 continue; 1133 continue;
1134 1134
1135 child->setOverrideLogicalContentHeight(newHeight - 1135 child->setOverrideLogicalContentHeight(newHeight -
1136 child->borderAndPaddingHeight()); 1136 child->borderAndPaddingHeight());
1137 child->forceChildLayout(); 1137 child->forceChildLayout();
1138 1138
1139 // FIXME: For now don't support RTL. 1139 // FIXME: For now don't support RTL.
1140 if (style()->direction() != LTR) 1140 if (style()->direction() != TextDirection::Ltr)
1141 continue; 1141 continue;
1142 1142
1143 // Get the last line 1143 // Get the last line
1144 RootInlineBox* lastLine = lineAtIndex(blockChild, lineCount - 1); 1144 RootInlineBox* lastLine = lineAtIndex(blockChild, lineCount - 1);
1145 if (!lastLine) 1145 if (!lastLine)
1146 continue; 1146 continue;
1147 1147
1148 RootInlineBox* lastVisibleLine = 1148 RootInlineBox* lastVisibleLine =
1149 lineAtIndex(blockChild, numVisibleLines - 1); 1149 lineAtIndex(blockChild, numVisibleLines - 1);
1150 if (!lastVisibleLine) 1150 if (!lastVisibleLine)
(...skipping 114 matching lines...) Expand 10 before | Expand all | Expand 10 after
1265 if (minHeight.isFixed() || minHeight.isAuto()) { 1265 if (minHeight.isFixed() || minHeight.isAuto()) {
1266 LayoutUnit minHeight(child->style()->minHeight().value()); 1266 LayoutUnit minHeight(child->style()->minHeight().value());
1267 LayoutUnit height = contentHeightForChild(child); 1267 LayoutUnit height = contentHeightForChild(child);
1268 LayoutUnit allowedShrinkage = (minHeight - height).clampPositiveToZero(); 1268 LayoutUnit allowedShrinkage = (minHeight - height).clampPositiveToZero();
1269 return allowedShrinkage; 1269 return allowedShrinkage;
1270 } 1270 }
1271 return LayoutUnit(); 1271 return LayoutUnit();
1272 } 1272 }
1273 1273
1274 } // namespace blink 1274 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/layout/LayoutBox.cpp ('k') | third_party/WebKit/Source/core/layout/LayoutFlexibleBox.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698