summaryrefslogtreecommitdiff
path: root/chromium/third_party/blink/renderer/core/layout/table_layout_algorithm_auto.cc
diff options
context:
space:
mode:
Diffstat (limited to 'chromium/third_party/blink/renderer/core/layout/table_layout_algorithm_auto.cc')
-rw-r--r--chromium/third_party/blink/renderer/core/layout/table_layout_algorithm_auto.cc8
1 files changed, 4 insertions, 4 deletions
diff --git a/chromium/third_party/blink/renderer/core/layout/table_layout_algorithm_auto.cc b/chromium/third_party/blink/renderer/core/layout/table_layout_algorithm_auto.cc
index c16273ceed3..a0586d130e4 100644
--- a/chromium/third_party/blink/renderer/core/layout/table_layout_algorithm_auto.cc
+++ b/chromium/third_party/blink/renderer/core/layout/table_layout_algorithm_auto.cc
@@ -54,7 +54,7 @@ void TableLayoutAlgorithmAuto::RecalcColumn(unsigned eff_col) {
// we need to clear their dirty bits so that if we call
// setPreferredWidthsDirty(true) on a col or one of its descendants, we'll
// mark it's ancestors as dirty.
- ToLayoutTableCol(child)->ClearIntrinsicLogicalWidthsDirtyBits();
+ To<LayoutTableCol>(child)->ClearIntrinsicLogicalWidthsDirtyBits();
} else if (child->IsTableSection()) {
LayoutTableSection* section = To<LayoutTableSection>(child);
unsigned num_rows = section->NumRows();
@@ -241,7 +241,7 @@ static bool ShouldScaleColumnsForParent(LayoutTable* table) {
const bool is_deprecated_webkit_box =
cb->StyleRef().IsDeprecatedWebkitBox();
if ((!is_deprecated_webkit_box && cb->IsFlexibleBoxIncludingNG()) ||
- cb->IsLayoutGrid()) {
+ cb->IsLayoutGridIncludingNG()) {
return false;
}
cb = cb->ContainingBlock();
@@ -472,9 +472,9 @@ int TableLayoutAlgorithmAuto::CalcEffectiveLogicalWidth() {
// adjust table max width if needed
if (cell_logical_width.IsPercentOrCalc()) {
- if (total_percent > cell_logical_width.Percent() ||
+ if (total_percent >= cell_logical_width.Percent() ||
all_cols_are_percent) {
- // can't satify this condition, treat as variable
+ // can't satisfy this condition, treat as variable
cell_logical_width = Length();
} else {
max_logical_width =