Generate nonproperty originalDisplay 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 327 matching lines @@
   ComputedStyleBase::copyNonInheritedFromCached(other);
   m_box = other.m_box;
   m_visual = other.m_visual;
   m_background = other.m_background;
   m_surround = other.m_surround;
   m_rareNonInheritedData = other.m_rareNonInheritedData;
 
   // The flags are copied one-by-one because m_nonInheritedData.m_contains a
   // bunch of stuff other than real style data.
   // See comments for each skipped flag below.
-  m_nonInheritedData.m_originalDisplay =
-      other.m_nonInheritedData.m_originalDisplay;
+  setOriginalDisplay(
+      other.originalDisplay());  // Not generated in ComputedStyleBase.
   m_nonInheritedData.m_verticalAlign = other.m_nonInheritedData.m_verticalAlign;
   m_nonInheritedData.m_hasViewportUnits =
       other.m_nonInheritedData.m_hasViewportUnits;
   m_nonInheritedData.m_hasRemUnits = other.m_nonInheritedData.m_hasRemUnits;
 
   // Correctly set during selector matching:
   // m_nonInheritedData.m_styleType
   // m_nonInheritedData.m_pseudoBits
 
   // Set correctly while computing style for children:
@@ skipping 114 matching lines @@
          m_rareInheritedData == other.m_rareInheritedData;
 }
 
 bool ComputedStyle::loadingCustomFontsEqual(const ComputedStyle& other) const {
   return font().loadingCustomFonts() == other.font().loadingCustomFonts();
 }
 
 bool ComputedStyle::nonInheritedEqual(const ComputedStyle& other) const {
   // compare everything except the pseudoStyle pointer
   return ComputedStyleBase::nonInheritedEqual(other) &&
+         originalDisplay() ==
+             other.originalDisplay() &&  // Not generated in ComputedStyleBase
          m_nonInheritedData == other.m_nonInheritedData &&
          m_box == other.m_box && m_visual == other.m_visual &&
          m_background == other.m_background && m_surround == other.m_surround &&
          m_rareNonInheritedData == other.m_rareNonInheritedData &&
          m_svgStyle->nonInheritedEqual(*other.m_svgStyle);
 }
 
 bool ComputedStyle::inheritedDataShared(const ComputedStyle& other) const {
   // This is a fast check that only looks if the data structures are shared.
   // TODO(sashab): Should ComputedStyleBase have an inheritedDataShared method?
@@ skipping 286 matching lines @@
       rtlOrdering() != other.rtlOrdering() ||
       textAlign() != other.textAlign() ||
       textTransform() != other.textTransform() ||
       direction() != other.direction() || whiteSpace() != other.whiteSpace() ||
       getWritingMode() != other.getWritingMode())
     return true;
 
   if (overflowX() != other.overflowX() || overflowY() != other.overflowY() ||
       clear() != other.clear() || getUnicodeBidi() != other.getUnicodeBidi() ||
       floating() != other.floating() ||
-      m_nonInheritedData.m_originalDisplay !=
-          other.m_nonInheritedData.m_originalDisplay)
+      originalDisplay() != other.originalDisplay())
     return true;
 
   if (isDisplayTableType(display())) {
     if (borderCollapse() != other.borderCollapse() ||
         emptyCells() != other.emptyCells() ||
         captionSide() != other.captionSide() ||
         tableLayout() != other.tableLayout())
       return true;
 
     // In the collapsing border model, 'hidden' suppresses other borders, while
@@ skipping 1687 matching lines @@
     if (value < 0)
       fvalue -= 0.5f;
     else
       fvalue += 0.5f;
   }
 
   return roundForImpreciseConversion<int>(fvalue / zoomFactor);
 }
 
 }  // namespace blink