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

Side by Side Diff: third_party/WebKit/Source/core/layout/LayoutBox.h

Issue 2468193002: Revert of Improve how the column balancer handles top margins on floats. (Closed)
Patch Set: Created 4 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
OLDNEW
1 /* 1 /*
2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
3 * (C) 1999 Antti Koivisto (koivisto@kde.org) 3 * (C) 1999 Antti Koivisto (koivisto@kde.org)
4 * Copyright (C) 2003, 2006, 2007 Apple Inc. All rights reserved. 4 * Copyright (C) 2003, 2006, 2007 Apple 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 233 matching lines...) Expand 10 before | Expand all | Expand 10 after
244 } 244 }
245 LayoutUnit logicalBottom() const { return logicalTop() + logicalHeight(); } 245 LayoutUnit logicalBottom() const { return logicalTop() + logicalHeight(); }
246 LayoutUnit logicalWidth() const { 246 LayoutUnit logicalWidth() const {
247 return style()->isHorizontalWritingMode() ? m_frameRect.width() 247 return style()->isHorizontalWritingMode() ? m_frameRect.width()
248 : m_frameRect.height(); 248 : m_frameRect.height();
249 } 249 }
250 LayoutUnit logicalHeight() const { 250 LayoutUnit logicalHeight() const {
251 return style()->isHorizontalWritingMode() ? m_frameRect.height() 251 return style()->isHorizontalWritingMode() ? m_frameRect.height()
252 : m_frameRect.width(); 252 : m_frameRect.width();
253 } 253 }
254 254 LayoutUnit logicalHeightIncludingOverflow() const;
255 // Logical height of the object, including content overflowing the
256 // border-after edge.
257 LayoutUnit logicalHeightWithVisibleOverflow() const;
258 255
259 LayoutUnit constrainLogicalWidthByMinMax(LayoutUnit, 256 LayoutUnit constrainLogicalWidthByMinMax(LayoutUnit,
260 LayoutUnit, 257 LayoutUnit,
261 LayoutBlock*) const; 258 LayoutBlock*) const;
262 LayoutUnit constrainLogicalHeightByMinMax( 259 LayoutUnit constrainLogicalHeightByMinMax(
263 LayoutUnit logicalHeight, 260 LayoutUnit logicalHeight,
264 LayoutUnit intrinsicContentHeight) const; 261 LayoutUnit intrinsicContentHeight) const;
265 LayoutUnit constrainContentBoxLogicalHeightByMinMax( 262 LayoutUnit constrainContentBoxLogicalHeightByMinMax(
266 LayoutUnit logicalHeight, 263 LayoutUnit logicalHeight,
267 LayoutUnit intrinsicContentHeight) const; 264 LayoutUnit intrinsicContentHeight) const;
(...skipping 1354 matching lines...) Expand 10 before | Expand all | Expand 10 after
1622 1619
1623 inline bool LayoutBox::isForcedFragmentainerBreakValue(EBreak breakValue) { 1620 inline bool LayoutBox::isForcedFragmentainerBreakValue(EBreak breakValue) {
1624 return breakValue == BreakColumn || breakValue == BreakLeft || 1621 return breakValue == BreakColumn || breakValue == BreakLeft ||
1625 breakValue == BreakPage || breakValue == BreakRecto || 1622 breakValue == BreakPage || breakValue == BreakRecto ||
1626 breakValue == BreakRight || breakValue == BreakVerso; 1623 breakValue == BreakRight || breakValue == BreakVerso;
1627 } 1624 }
1628 1625
1629 } // namespace blink 1626 } // namespace blink
1630 1627
1631 #endif // LayoutBox_h 1628 #endif // LayoutBox_h
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/layout/ColumnBalancer.cpp ('k') | third_party/WebKit/Source/core/layout/LayoutBox.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698