Remove inheritance on SameSizeAsComputedStyle.

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 52 matching lines @@
 
 struct SameSizeAsBorderValue {
   RGBA32 m_color;
   unsigned m_bitfield;
 };
 
 ASSERT_SIZE(BorderValue, SameSizeAsBorderValue);
 
 // Since different compilers/architectures pack ComputedStyle differently,
 // re-create the same structure for an accurate size comparison.
-struct SameSizeAsComputedStyle : public ComputedStyleBase,
-                                 public RefCounted<ComputedStyle> {
+struct SameSizeAsComputedStyle : public RefCounted<SameSizeAsComputedStyle> {
+  struct ComputedStyleBase {
+    unsigned m_bitfields[3];
+  } m_base;
+
   void* dataRefs[7];
   void* ownPtrs[1];
   void* dataRefSvgStyle;
 
   struct InheritedData {
     unsigned m_bitfields[1];
   } m_inheritedData;
 
   struct NonInheritedData {
     unsigned m_bitfields[2];
   } m_nonInheritedData;
 };
 
+// If this assert fails, it means that size of ComputedStyle has changed. Please
+// update the SameSizeAsComputedStyle struct to mirror the updated storage of

[sashab, 2017/02/24 06:05:41]

Check that you really *do* want to increase the size of ComputedStyle, then
update...

[esprehn, 2017/02/24 17:59:48]

Word.

[shend, 2017/02/27 19:36:44]

Done.

+// ComputedStyle.
 ASSERT_SIZE(ComputedStyle, SameSizeAsComputedStyle);
 
 PassRefPtr<ComputedStyle> ComputedStyle::create() {
   return adoptRef(new ComputedStyle());
 }
 
 PassRefPtr<ComputedStyle> ComputedStyle::createInitialStyle() {
   return adoptRef(new ComputedStyle(InitialStyle));
 }
 
@@ skipping 2373 matching lines @@
     if (value < 0)
       fvalue -= 0.5f;
     else
       fvalue += 0.5f;
   }
 
   return roundForImpreciseConversion<int>(fvalue / zoomFactor);
 }
 
 }  // namespace blink