Refactor LayoutTableCell::Has(Start|End)BorderAdjoinjingTable() and add test

third_party/WebKit/Source/core/layout/LayoutTableCell.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 Apple Inc.
  *               All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
@@ skipping 554 matching lines @@
   // The border have the same width and style.  Rely on precedence (cell over
   // row over row group, etc.)
   return border1.Precedence() < border2.Precedence();
 }
 
 static CollapsedBorderValue ChooseBorder(const CollapsedBorderValue& border1,
                                          const CollapsedBorderValue& border2) {
   return CompareBorders(border1, border2) ? border2 : border1;
 }
 
+bool LayoutTableCell::IsInStartColumn() const {
+  return !AbsoluteColumnIndex();
+}
+
+bool LayoutTableCell::IsInEndColumn() const {
+  return Table()->AbsoluteColumnToEffectiveColumn(AbsoluteColumnIndex() +
+                                                  ColSpan() - 1) ==
+         Table()->NumEffectiveColumns() - 1;
+}
+
 bool LayoutTableCell::HasStartBorderAdjoiningTable() const {
-  bool is_start_column = !AbsoluteColumnIndex();
-  bool is_end_column = Table()->AbsoluteColumnToEffectiveColumn(
-                           AbsoluteColumnIndex() + ColSpan() - 1) ==
-                       Table()->NumEffectiveColumns() - 1;
-  bool has_same_direction_as_table = HasSameDirectionAs(Table());
-
   // The table direction determines the row direction. In mixed directionality,
   // we cannot guarantee that we have a common border with the table (think a
   // ltr table with rtl start cell).
-  return (is_start_column && has_same_direction_as_table) ||
-         (is_end_column && !has_same_direction_as_table);
+  return HasSameDirectionAs(Table()) ? IsInStartColumn() : IsInEndColumn();
 }
 
 bool LayoutTableCell::HasEndBorderAdjoiningTable() const {
-  bool is_start_column = !AbsoluteColumnIndex();
-  bool is_end_column = Table()->AbsoluteColumnToEffectiveColumn(
-                           AbsoluteColumnIndex() + ColSpan() - 1) ==
-                       Table()->NumEffectiveColumns() - 1;
-  bool has_same_direction_as_table = HasSameDirectionAs(Table());
-
   // The table direction determines the row direction. In mixed directionality,
   // we cannot guarantee that we have a common border with the table (think a
   // ltr table with ltr end cell).
-  return (is_start_column && !has_same_direction_as_table) ||
-         (is_end_column && has_same_direction_as_table);
+  return HasSameDirectionAs(Table()) ? IsInEndColumn() : IsInStartColumn();
 }
 
 CollapsedBorderValue LayoutTableCell::ComputeCollapsedStartBorder(
     IncludeBorderColorOrNot include_color) const {
   LayoutTable* table = this->Table();
 
   // For the start border, we need to check, in order of precedence:
   // (1) Our start border.
   int start_color_property = include_color
                                  ? CSSProperty::ResolveDirectionAwareProperty(
@@ skipping 871 matching lines @@
 }
 
 bool LayoutTableCell::HasLineIfEmpty() const {
   if (GetNode() && HasEditableStyle(*GetNode()))
     return true;
 
   return LayoutBlock::HasLineIfEmpty();
 }
 
 }  // namespace blink