Replace call sites to BorderValue functions to save the BorderValue construction cost

third_party/WebKit/Source/core/layout/LayoutTableSection.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, 2008, 2009, 2010, 2013 Apple Inc.
  *               All rights reserved.
  * Copyright (C) 2006 Alexey Proskuryakov (ap@nypop.com)
  *
@@ skipping 1332 matching lines @@
   }
 }
 
 int LayoutTableSection::CalcBlockDirectionOuterBorder(
     BlockBorderSide side) const {
   if (!grid_.size() || !Table()->NumEffectiveColumns())
     return 0;
 
   int border_width = 0;
 
-  const BorderValue& sb =
-      side == kBorderBefore ? Style()->BorderBefore() : Style()->BorderAfter();
-  if (sb.Style() == EBorderStyle::kHidden)
+  EBorderStyle sbs = side == kBorderBefore ? Style()->BorderBeforeStyle()

[rune, 2017/05/31 09:02:02]

Could we use some more descriptive variable names than sbs?

[nainar, 2017/05/31 09:31:57]

I can try. Some suggestions: 

sbs -> style_border_style

[rune, 2017/05/31 11:02:09]

I think the s is for section (as in LayoutTableSection), so perhaps
section_border_style?

[nainar, 2017/05/31 12:32:48]

Done.

+                                           : Style()->BorderAfterStyle();
+  if (sbs == EBorderStyle::kHidden)
     return -1;
-  if (ComputedStyle::BorderStyleIsVisible(sb.Style()))
-    border_width = sb.Width();
+  if (ComputedStyle::BorderStyleIsVisible(sbs)) {
+    border_width = side == kBorderBefore ? Style()->BorderBeforeWidth()
+                                         : Style()->BorderAfterWidth();
+  }
 
-  const BorderValue& rb = side == kBorderBefore
-                              ? FirstRow()->Style()->BorderBefore()
-                              : LastRow()->Style()->BorderAfter();
-  if (rb.Style() == EBorderStyle::kHidden)
+  EBorderStyle rbs = side == kBorderBefore

[nainar, 2017/05/31 09:31:56]

rbs -> row_border_style

[nainar, 2017/05/31 09:31:56]

rbs -> row_border_style

[rune, 2017/05/31 11:02:10]

Acknowledged.

[nainar, 2017/05/31 12:32:48]

Done.

+                         ? FirstRow()->Style()->BorderBeforeStyle()
+                         : LastRow()->Style()->BorderAfterStyle();
+  float rbw = side == kBorderBefore ? FirstRow()->Style()->BorderBeforeWidth()

[nainar, 2017/05/31 09:31:56]

rbw -> row_border_width

[rune, 2017/05/31 11:02:10]

Acknowledged.

[nainar, 2017/05/31 12:32:48]

Done

+                                    : LastRow()->Style()->BorderAfterWidth();
+  if (rbs == EBorderStyle::kHidden)
     return -1;
-  if (ComputedStyle::BorderStyleIsVisible(rb.Style()) &&
-      rb.Width() > border_width)
-    border_width = rb.Width();
-
+  if (ComputedStyle::BorderStyleIsVisible(rbs) && rbw > border_width)
+    border_width = rbw;
   bool all_hidden = true;
   unsigned r = side == kBorderBefore ? 0 : grid_.size() - 1;
   unsigned n_cols = NumCols(r);
   for (unsigned c = 0; c < n_cols; c++) {
     const auto& grid_cell = GridCellAt(r, c);
     if (grid_cell.InColSpan() || !grid_cell.HasCells())
       continue;
     const ComputedStyle& primary_cell_style =
         grid_cell.PrimaryCell()->StyleRef();
     // FIXME: Make this work with perpendicular and flipped cells.
-    const BorderValue& cb = side == kBorderBefore
-                                ? primary_cell_style.BorderBefore()
-                                : primary_cell_style.BorderAfter();
+    EBorderStyle cbs = side == kBorderBefore

[nainar, 2017/05/31 09:31:56]

cbs -> cell_border_style

[rune, 2017/05/31 11:02:09]

Acknowledged.

[nainar, 2017/05/31 12:32:49]

Done

+                           ? primary_cell_style.BorderBeforeStyle()
+                           : primary_cell_style.BorderAfterStyle();
+    float cbw = side == kBorderBefore ? primary_cell_style.BorderBeforeWidth()

[nainar, 2017/05/31 09:31:56]

cbw -> cell_border_width

[rune, 2017/05/31 11:02:09]

Acknowledged.

[nainar, 2017/05/31 12:32:48]

Done.

+                                      : primary_cell_style.BorderAfterWidth();
     // FIXME: Don't repeat for the same col group
     LayoutTableCol* col =
         Table()->ColElementAtAbsoluteColumn(c).InnermostColOrColGroup();
     if (col) {
-      const BorderValue& gb = side == kBorderBefore
-                                  ? col->Style()->BorderBefore()
-                                  : col->Style()->BorderAfter();
-      if (gb.Style() == EBorderStyle::kHidden ||
-          cb.Style() == EBorderStyle::kHidden)
+      EBorderStyle gbs = side == kBorderBefore

[nainar, 2017/05/31 09:31:56]

gbs -> col_border_style

[rune, 2017/05/31 11:02:10]

Acknowledged.

[nainar, 2017/05/31 12:32:48]

Done

+                             ? col->Style()->BorderBeforeStyle()
+                             : col->Style()->BorderAfterStyle();
+      const float gbw = side == kBorderBefore

[nainar, 2017/05/31 09:31:56]

gbw -> col_border_width

[rune, 2017/05/31 11:02:09]

Acknowledged.

[nainar, 2017/05/31 12:32:48]

Done.

+                            ? col->Style()->BorderBeforeWidth()
+                            : col->Style()->BorderAfterWidth();
+      if (gbs == EBorderStyle::kHidden || cbs == EBorderStyle::kHidden)
         continue;
       all_hidden = false;
-      if (ComputedStyle::BorderStyleIsVisible(gb.Style()) &&
-          gb.Width() > border_width)
-        border_width = gb.Width();
-      if (ComputedStyle::BorderStyleIsVisible(cb.Style()) &&
-          cb.Width() > border_width)
-        border_width = cb.Width();
+      if (ComputedStyle::BorderStyleIsVisible(gbs) && gbw > border_width)
+        border_width = gbw;
+      if (ComputedStyle::BorderStyleIsVisible(cbs) && cbw > border_width)
+        border_width = cbw;
     } else {
-      if (cb.Style() == EBorderStyle::kHidden)
+      if (cbs == EBorderStyle::kHidden)
         continue;
       all_hidden = false;
-      if (ComputedStyle::BorderStyleIsVisible(cb.Style()) &&
-          cb.Width() > border_width)
-        border_width = cb.Width();
+      if (ComputedStyle::BorderStyleIsVisible(cbs) && cbw > border_width)
+        border_width = cbw;
     }
   }
   if (all_hidden)
     return -1;
 
   if (side == kBorderAfter)
     border_width++;  // Distribute rounding error
   return border_width / 2;
 }
 
 int LayoutTableSection::CalcInlineDirectionOuterBorder(
     InlineBorderSide side) const {
   unsigned total_cols = Table()->NumEffectiveColumns();
   if (!grid_.size() || !total_cols)
     return 0;
   unsigned col_index = side == kBorderStart ? 0 : total_cols - 1;
 
   int border_width = 0;
 
-  const BorderValue& sb =
-      side == kBorderStart ? Style()->BorderStart() : Style()->BorderEnd();
-  if (sb.Style() == EBorderStyle::kHidden)
+  EBorderStyle sbs = side == kBorderStart ? Style()->BorderStartStyle()

[nainar, 2017/05/31 09:31:56]

sbs -> style_border_style

[rune, 2017/05/31 11:02:09]

section_border_style?

[nainar, 2017/05/31 12:32:48]

Done.

+                                          : Style()->BorderEndStyle();
+  const float sbw = side == kBorderStart ? Style()->BorderStartWidth()

[nainar, 2017/05/31 09:31:56]

sbw -> style_border_width

[rune, 2017/05/31 11:02:09]

section_border_width?

[nainar, 2017/05/31 12:32:49]

Done

+                                         : Style()->BorderEndWidth();
+  if (sbs == EBorderStyle::kHidden)
     return -1;
-  if (ComputedStyle::BorderStyleIsVisible(sb.Style()))
-    border_width = sb.Width();
+  if (ComputedStyle::BorderStyleIsVisible(sbs))
+    border_width = sbw;
 
   if (LayoutTableCol* col = Table()
                                 ->ColElementAtAbsoluteColumn(col_index)
                                 .InnermostColOrColGroup()) {
-    const BorderValue& gb = side == kBorderStart ? col->Style()->BorderStart()
-                                                 : col->Style()->BorderEnd();
-    if (gb.Style() == EBorderStyle::kHidden)
+    EBorderStyle gbs = side == kBorderStart ? col->Style()->BorderStartStyle()

[nainar, 2017/05/31 09:31:56]

gbs -> col_border_style

[rune, 2017/05/31 11:02:09]

Acknowledged.

[nainar, 2017/05/31 12:32:48]

Done.

+                                            : col->Style()->BorderEndStyle();
+    const float gbw = side == kBorderStart ? col->Style()->BorderStartWidth()

[nainar, 2017/05/31 09:31:56]

gbw -> col_border_width

[rune, 2017/05/31 11:02:09]

Acknowledged.

[nainar, 2017/05/31 12:32:48]

Done

+                                           : col->Style()->BorderEndWidth();
+    if (gbs == EBorderStyle::kHidden)
       return -1;
-    if (ComputedStyle::BorderStyleIsVisible(gb.Style()) &&
-        gb.Width() > border_width)
-      border_width = gb.Width();
+    if (ComputedStyle::BorderStyleIsVisible(gbs) && gbw > border_width)
+      border_width = gbw;
   }
 
   bool all_hidden = true;
   for (unsigned r = 0; r < grid_.size(); r++) {
     if (col_index >= NumCols(r))
       continue;
     const auto& grid_cell = GridCellAt(r, col_index);
     if (!grid_cell.HasCells())
       continue;
     // FIXME: Don't repeat for the same cell
     const ComputedStyle& primary_cell_style =
         grid_cell.PrimaryCell()->StyleRef();
     const ComputedStyle& primary_cell_parent_style =
         grid_cell.PrimaryCell()->Parent()->StyleRef();
     // FIXME: Make this work with perpendicular and flipped cells.
-    const BorderValue& cb = side == kBorderStart
-                                ? primary_cell_style.BorderStart()
-                                : primary_cell_style.BorderEnd();
-    const BorderValue& rb = side == kBorderStart
-                                ? primary_cell_parent_style.BorderStart()
-                                : primary_cell_parent_style.BorderEnd();
-    if (cb.Style() == EBorderStyle::kHidden ||
-        rb.Style() == EBorderStyle::kHidden)
+    EBorderStyle cbs = side == kBorderStart

[nainar, 2017/05/31 09:31:56]

cbs -> cell_border_style

[rune, 2017/05/31 11:02:09]

Acknowledged.

[nainar, 2017/05/31 12:32:48]

Done.

+                           ? primary_cell_style.BorderStartStyle()
+                           : primary_cell_style.BorderEndStyle();
+    EBorderStyle rbs = side == kBorderStart

[nainar, 2017/05/31 09:31:57]

rbs -> cell_parent_border_style

[rune, 2017/05/31 11:02:09]

row_border_style?

[nainar, 2017/05/31 12:32:48]

Done

+                           ? primary_cell_parent_style.BorderStartStyle()
+                           : primary_cell_parent_style.BorderEndStyle();
+    const float cbw = side == kBorderStart

[nainar, 2017/05/31 09:31:56]

cbw -> cell_border_width

[rune, 2017/05/31 11:02:09]

Acknowledged.

[nainar, 2017/05/31 12:32:48]

Done

+                          ? primary_cell_style.BorderStartWidth()
+                          : primary_cell_style.BorderEndWidth();
+    const float rbw = side == kBorderStart

[nainar, 2017/05/31 09:31:56]

rbw -> cell_parent_border_width

[rune, 2017/05/31 11:02:09]

row_border_width?

[nainar, 2017/05/31 12:32:48]

Done

+                          ? primary_cell_parent_style.BorderStartWidth()
+                          : primary_cell_parent_style.BorderEndWidth();
+    if (cbs == EBorderStyle::kHidden || rbs == EBorderStyle::kHidden)
       continue;
     all_hidden = false;
-    if (ComputedStyle::BorderStyleIsVisible(cb.Style()) &&
-        cb.Width() > border_width)
-      border_width = cb.Width();
-    if (ComputedStyle::BorderStyleIsVisible(rb.Style()) &&
-        rb.Width() > border_width)
-      border_width = rb.Width();
+    if (ComputedStyle::BorderStyleIsVisible(cbs) && cbw > border_width)
+      border_width = cbw;
+    if (ComputedStyle::BorderStyleIsVisible(rbs) && rbw > border_width)
+      border_width = rbw;
   }
   if (all_hidden)
     return -1;
 
   if ((side == kBorderStart) != Table()->Style()->IsLeftToRightDirection())
     border_width++;  // Distribute rounding error
   return border_width / 2;
 }
 
 void LayoutTableSection::RecalcOuterBorder() {
@@ skipping 651 matching lines @@
 bool LayoutTableSection::PaintedOutputOfObjectHasNoEffectRegardlessOfSize()
     const {
   // LayoutTableSection paints background from columns.
   if (Table()->HasColElements())
     return false;
   return LayoutTableBoxComponent::
       PaintedOutputOfObjectHasNoEffectRegardlessOfSize();
 }
 
 }  // namespace blink