Move border-collapse to be generated in ComputedStyleBase

third_party/WebKit/Source/core/style/ComputedStyle.cpp

 /*
  * Copyright (C) 1999 Antti Koivisto (koivisto@kde.org)
  * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights
  * reserved.
  * Copyright (C) 2011 Adobe Systems Incorporated. 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
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
@@ skipping 824 matching lines @@
       m_nonInheritedData.m_overflowY != other.m_nonInheritedData.m_overflowY ||
       m_nonInheritedData.m_clear != other.m_nonInheritedData.m_clear ||
       m_nonInheritedData.m_unicodeBidi !=
           other.m_nonInheritedData.m_unicodeBidi ||
       floating() != other.floating() ||
       m_nonInheritedData.m_originalDisplay !=
           other.m_nonInheritedData.m_originalDisplay)
     return true;
 
   if (isDisplayTableType(display())) {
-    if (m_inheritedData.m_borderCollapse !=
-            other.m_inheritedData.m_borderCollapse ||
+    if (borderCollapse() != other.borderCollapse() ||
         emptyCells() != other.emptyCells() ||
         captionSide() != other.captionSide() ||
         m_nonInheritedData.m_tableLayout !=
             other.m_nonInheritedData.m_tableLayout)
       return true;
 
     // In the collapsing border model, 'hidden' suppresses other borders, while
     // 'none' does not, so these style differences can be width differences.
-    if (m_inheritedData.m_borderCollapse &&
+    if ((borderCollapse() == EBorderCollapse::Collapse) &&

[alancutter (OOO until 2018), 2016/12/06 03:50:30]

Pleased to see this change.

         ((borderTopStyle() == BorderStyleHidden &&
           other.borderTopStyle() == BorderStyleNone) ||
          (borderTopStyle() == BorderStyleNone &&
           other.borderTopStyle() == BorderStyleHidden) ||
          (borderBottomStyle() == BorderStyleHidden &&
           other.borderBottomStyle() == BorderStyleNone) ||
          (borderBottomStyle() == BorderStyleNone &&
           other.borderBottomStyle() == BorderStyleHidden) ||
          (borderLeftStyle() == BorderStyleHidden &&
           other.borderLeftStyle() == BorderStyleNone) ||
@@ skipping 1605 matching lines @@
     if (value < 0)
       fvalue -= 0.5f;
     else
       fvalue += 0.5f;
   }
 
   return roundForImpreciseConversion<int>(fvalue / zoomFactor);
 }
 
 }  // namespace blink