Move squash preventing reasons out of compositing reasons

third_party/WebKit/Source/core/paint/PaintLayer.cpp

 /*
  * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011, 2012 Apple Inc. All rights reserved.
  *
  * Portions are Copyright (C) 1998 Netscape Communications Corporation.
  *
  * Other contributors:
  *   Robert O'Callahan <roc+@cs.cmu.edu>
  *   David Baron <dbaron@fas.harvard.edu>
  *   Christian Biesinger <cbiesinger@web.de>
  *   Randall Jesup <rjesup@wgate.com>
@@ skipping 106 matching lines @@
 static_assert(sizeof(PaintLayer) == sizeof(SameSizeAsPaintLayer), "PaintLayer should stay small");
 
 } // namespace
 
 using namespace HTMLNames;
 
 PaintLayerRareData::PaintLayerRareData()
     : enclosingPaginationLayer(nullptr)
     , potentialCompositingReasonsFromStyle(CompositingReasonNone)
     , compositingReasons(CompositingReasonNone)
+    , squashingDisallowedReasons(SquashingDisallowedReasonsNone)
     , groupedMapping(nullptr)
 {
 }
 
 PaintLayerRareData::~PaintLayerRareData()
 {
 }
 
 PaintLayer::PaintLayer(LayoutBoxModelObject* layoutObject, PaintLayerType type)
     : m_layerType(type)
@@ skipping 888 matching lines @@
 void PaintLayer::setCompositingReasons(CompositingReasons reasons, CompositingReasons mask)
 {
     CompositingReasons oldReasons = m_rareData ? m_rareData->compositingReasons : CompositingReasonNone;
     if ((oldReasons & mask) == (reasons & mask))
         return;
     CompositingReasons newReasons = (reasons & mask) | (oldReasons & ~mask);
     if (m_rareData || newReasons != CompositingReasonNone)
         ensureRareData().compositingReasons = newReasons;
 }
 
+void PaintLayer::setSquashingDisallowedReasons(SquashingDisallowedReasons reasons)
+{
+    SquashingDisallowedReasons oldReasons = m_rareData ? m_rareData->squashingDisallowedReasons : SquashingDisallowedReasonsNone;
+    if (oldReasons == reasons)
+        return;
+    if (m_rareData || reasons != SquashingDisallowedReasonsNone)
+        ensureRareData().squashingDisallowedReasons = reasons;
+}
+
 void PaintLayer::setHasCompositingDescendant(bool hasCompositingDescendant)
 {
     if (m_hasCompositingDescendant == static_cast<unsigned>(hasCompositingDescendant))
         return;
 
     m_hasCompositingDescendant = hasCompositingDescendant;
 
     if (hasCompositedLayerMapping())
         compositedLayerMapping()->setNeedsGraphicsLayerUpdate(GraphicsLayerUpdateLocal);
 }
@@ skipping 1753 matching lines @@
 
 void showLayerTree(const blink::LayoutObject* layoutObject)
 {
     if (!layoutObject) {
         fprintf(stderr, "Cannot showLayerTree. Root is (nil)\n");
         return;
     }
     showLayerTree(layoutObject->enclosingLayer());
 }
 #endif