[css-tables] Clean up code that detects significant border changes

third_party/WebKit/Source/core/layout/LayoutTableRow.cpp

 /*
  * Copyright (C) 1997 Martin Jones (mjones@kde.org)
  *           (C) 1997 Torben Weis (weis@kde.org)
  *           (C) 1998 Waldo Bastian (bastian@kde.org)
  *           (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2013 Apple Inc. All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
@@ skipping 42 matching lines @@
     section()->setNeedsCellRecalc();
 }
 
 void LayoutTableRow::styleDidChange(StyleDifference diff, const ComputedStyle* oldStyle)
 {
     ASSERT(style()->display() == TABLE_ROW);
 
     LayoutTableBoxComponent::styleDidChange(diff, oldStyle);
     propagateStyleToAnonymousChildren();
 
-    if (section() && oldStyle && style()->logicalHeight() != oldStyle->logicalHeight())
+    if (!oldStyle)
+        return;
+
+    if (section() && style()->logicalHeight() != oldStyle->logicalHeight())
         section()->rowLogicalHeightChanged(this);
 
-    // If border was changed, notify table.
-    if (parent()) {
-        LayoutTable* table = this->table();
-        if (table && !table->selfNeedsLayout() && !table->normalChildNeedsLayout() && oldStyle && oldStyle->border() != style()->border())
-            table->invalidateCollapsedBorders();
+    if (!parent())
+        return;
+    LayoutTable* table = this->table();
+    if (!table)
+        return;
 
-        if (table && oldStyle && diff.needsFullLayout() && needsLayout() && table->collapseBorders() && oldStyle->border().sizeEquals(style()->border())) {
-            // If the border width changes on a row, we need to make sure the cells in the row know to lay out again.
-            // This only happens when borders are collapsed, since they end up affecting the border sides of the cell
-            // itself.
-            for (LayoutBox* childBox = firstChildBox(); childBox; childBox = childBox->nextSiblingBox()) {
-                if (!childBox->isTableCell())
-                    continue;
-                // TODO(dgrogan) Add a layout test showing that setChildNeedsLayout is needed instead of setNeedsLayout.
-                childBox->setChildNeedsLayout();
-                childBox->setPreferredLogicalWidthsDirty(MarkOnlyThis);
-            }
-            // Most table componenents can rely on LayoutObject::styleDidChange
-            // to mark the container chain dirty. But LayoutTableSection seems
-            // to never clear its dirty bit, which stops the propagation. So
-            // anything under LayoutTableSection has to restart the propagation
-            // at the table.
-            // TODO(dgrogan): Make LayoutTableSection clear its dirty bit.
-            table->setPreferredLogicalWidthsDirty();
+    if (!table->selfNeedsLayout() && !table->normalChildNeedsLayout() && oldStyle->border() != style()->border())
+        table->invalidateCollapsedBorders();
+
+    if (LayoutTableBoxComponent::doCellsHaveDirtyWidth(*this, *table, diff, *oldStyle)) {
+        // If the border width changes on a row, we need to make sure the cells in the row know to lay out again.
+        // This only happens when borders are collapsed, since they end up affecting the border sides of the cell
+        // itself.
+        for (LayoutBox* childBox = firstChildBox(); childBox; childBox = childBox->nextSiblingBox()) {
+            if (!childBox->isTableCell())
+                continue;
+            // TODO(dgrogan) Add a layout test showing that setChildNeedsLayout is needed instead of setNeedsLayout.
+            childBox->setChildNeedsLayout();
+            childBox->setPreferredLogicalWidthsDirty(MarkOnlyThis);
         }
+        // Most table componenents can rely on LayoutObject::styleDidChange
+        // to mark the container chain dirty. But LayoutTableSection seems
+        // to never clear its dirty bit, which stops the propagation. So
+        // anything under LayoutTableSection has to restart the propagation
+        // at the table.
+        // TODO(dgrogan): Make LayoutTableSection clear its dirty bit.
+        table->setPreferredLogicalWidthsDirty();
     }
 }
 
 const BorderValue& LayoutTableRow::borderAdjoiningStartCell(const LayoutTableCell* cell) const
 {
     ASSERT_UNUSED(cell, cell->isFirstOrLastCellInRow());
     // FIXME: https://webkit.org/b/79272 - Add support for mixed directionality at the cell level.
     return style()->borderStart();
 }
 
@@ skipping 159 matching lines @@
     // The cell and the row share the section's coordinate system. However
     // the visual overflow should be determined in the coordinate system of
     // the row, that's why we shift it below.
     LayoutUnit cellOffsetLogicalTopDifference = cell->location().y() - location().y();
     cellVisualOverflowRect.move(LayoutUnit(), cellOffsetLogicalTopDifference);
 
     addContentsVisualOverflow(cellVisualOverflowRect);
 }
 
 } // namespace blink