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

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

Issue 2635143002: Changed EBoxSizing to an enum class and renamed its members (Closed)
Patch Set: Aded k prefix Created 3 years, 11 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
OLDNEW
1 /* 1 /*
2 * Copyright (C) 1997 Martin Jones (mjones@kde.org) 2 * Copyright (C) 1997 Martin Jones (mjones@kde.org)
3 * (C) 1997 Torben Weis (weis@kde.org) 3 * (C) 1997 Torben Weis (weis@kde.org)
4 * (C) 1998 Waldo Bastian (bastian@kde.org) 4 * (C) 1998 Waldo Bastian (bastian@kde.org)
5 * (C) 1999 Lars Knoll (knoll@kde.org) 5 * (C) 1999 Lars Knoll (knoll@kde.org)
6 * (C) 1999 Antti Koivisto (koivisto@kde.org) 6 * (C) 1999 Antti Koivisto (koivisto@kde.org)
7 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2009, 2013 Apple Inc. 7 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2009, 2013 Apple Inc.
8 * All rights reserved. 8 * All rights reserved.
9 * 9 *
10 * This library is free software; you can redistribute it and/or 10 * This library is free software; you can redistribute it and/or
(...skipping 139 matching lines...) Expand 10 before | Expand all | Expand 10 after
150 int logicalHeightFromStyle() const { 150 int logicalHeightFromStyle() const {
151 Length height = style()->logicalHeight(); 151 Length height = style()->logicalHeight();
152 int styleLogicalHeight = height.isIntrinsicOrAuto() 152 int styleLogicalHeight = height.isIntrinsicOrAuto()
153 ? 0 153 ? 0
154 : valueForLength(height, LayoutUnit()).toInt(); 154 : valueForLength(height, LayoutUnit()).toInt();
155 155
156 // In strict mode, box-sizing: content-box do the right thing and actually 156 // In strict mode, box-sizing: content-box do the right thing and actually
157 // add in the border and padding. 157 // add in the border and padding.
158 // Call computedCSSPadding* directly to avoid including implicitPadding. 158 // Call computedCSSPadding* directly to avoid including implicitPadding.
159 if (!document().inQuirksMode() && 159 if (!document().inQuirksMode() &&
160 style()->boxSizing() != BoxSizingBorderBox) 160 style()->boxSizing() != EBoxSizing::kBorderBox)
161 styleLogicalHeight += 161 styleLogicalHeight +=
162 (computedCSSPaddingBefore() + computedCSSPaddingAfter()).floor() + 162 (computedCSSPaddingBefore() + computedCSSPaddingAfter()).floor() +
163 borderBefore() + borderAfter(); 163 borderBefore() + borderAfter();
164 return styleLogicalHeight; 164 return styleLogicalHeight;
165 } 165 }
166 166
167 int logicalHeightForRowSizing() const { 167 int logicalHeightForRowSizing() const {
168 // FIXME: This function does too much work, and is very hot during table 168 // FIXME: This function does too much work, and is very hot during table
169 // layout! 169 // layout!
170 int adjustedLogicalHeight = 170 int adjustedLogicalHeight =
(...skipping 298 matching lines...) Expand 10 before | Expand all | Expand 10 after
469 return toLayoutTableCell(firstChild()); 469 return toLayoutTableCell(firstChild());
470 } 470 }
471 471
472 inline LayoutTableCell* LayoutTableRow::lastCell() const { 472 inline LayoutTableCell* LayoutTableRow::lastCell() const {
473 return toLayoutTableCell(lastChild()); 473 return toLayoutTableCell(lastChild());
474 } 474 }
475 475
476 } // namespace blink 476 } // namespace blink
477 477
478 #endif // LayoutTableCell_h 478 #endif // LayoutTableCell_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698