Store PaintLayerFilterInfo in PaintLayerRareData instead of a HashMap.

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 131 matching lines @@
     , m_hasVisibleContent(false)
     , m_visibleDescendantStatusDirty(false)
     , m_hasVisibleDescendant(false)
     , m_hasVisibleNonLayerContent(false)
 #if ENABLE(ASSERT)
     , m_needsPositionUpdate(true)
 #endif
     , m_3DTransformedDescendantStatusDirty(true)
     , m_has3DTransformedDescendant(false)
     , m_containsDirtyOverlayScrollbars(false)
-    , m_hasFilterInfo(false)
     , m_needsAncestorDependentCompositingInputsUpdate(true)
     , m_needsDescendantDependentCompositingInputsUpdate(true)
     , m_childNeedsCompositingInputsUpdate(true)
     , m_hasCompositingDescendant(false)
     , m_hasNonCompositedChild(false)
     , m_shouldIsolateCompositedDescendants(false)
     , m_lostGroupedMapping(false)
     , m_needsRepaint(false)
     , m_previousPaintResult(PaintLayerPainter::FullyPainted)
     , m_needsPaintPhaseDescendantOutlines(false)
@@ skipping 23 matching lines @@
     updateScrollableArea();
 }
 
 PaintLayer::~PaintLayer()
 {
     if (layoutObject()->frame() && layoutObject()->frame()->page()) {
         if (ScrollingCoordinator* scrollingCoordinator = layoutObject()->frame()->page()->scrollingCoordinator())
             scrollingCoordinator->willDestroyLayer(this);
     }
 
-    removeFilterInfoIfNeeded();
-
     if (groupedMapping()) {
         DisableCompositingQueryAsserts disabler;
         setGroupedMapping(0, InvalidateLayerAndRemoveFromMapping);
     }
 
     // Child layers will be deleted by their corresponding layout objects, so
     // we don't need to delete them ourselves.
 
     clearCompositedLayerMapping(true);
 
@@ skipping 2399 matching lines @@
 FilterOperations PaintLayer::computeFilterOperations(const ComputedStyle& style) const
 {
     return computeFilterOperationsHandleReferenceFilters(style.filter(), style.effectiveZoom(), enclosingNode());
 }
 
 FilterOperations PaintLayer::computeBackdropFilterOperations(const ComputedStyle& style) const
 {
     return computeFilterOperationsHandleReferenceFilters(style.backdropFilter(), style.effectiveZoom(), enclosingNode());
 }
 
+PaintLayerFilterInfo& PaintLayer::ensureFilterInfo()
+{
+    PaintLayerRareData& rareData = ensureRareData();
+    if (!rareData.filterInfo)
+        rareData.filterInfo = adoptPtr(new PaintLayerFilterInfo(this));
+    return *rareData.filterInfo;
+}
+
 void PaintLayer::updateOrRemoveFilterClients()
 {
-    if (!hasFilter()) {
-        removeFilterInfoIfNeeded();
-        return;
+    if (!hasFilter() && m_rareData) {
+        m_rareData->filterInfo = nullptr;
+    } else if (layoutObject()->style()->filter().hasReferenceFilter()) {
+        ensureFilterInfo().updateReferenceFilterClients(layoutObject()->style()->filter());
+    } else if (filterInfo()) {
+        filterInfo()->clearFilterReferences();
     }
-
-    if (layoutObject()->style()->filter().hasReferenceFilter())
-        ensureFilterInfo()->updateReferenceFilterClients(layoutObject()->style()->filter());
-    else if (hasFilterInfo())
-        filterInfo()->clearFilterReferences();
 }
 
 FilterEffectBuilder* PaintLayer::updateFilterEffectBuilder() const
 {
     // TODO(chrishtr): ensure (and assert) that compositing is clean here.
 
     if (!paintsWithFilters())
         return nullptr;
 
     PaintLayerFilterInfo* filterInfo = this->filterInfo();
@@ skipping 38 matching lines @@
     // mode might have changed for this layer.
     if (!paintsWithFilters()) {
         // Don't delete the whole filter info here, because we might use it
         // for loading CSS shader files.
         if (PaintLayerFilterInfo* filterInfo = this->filterInfo())
             filterInfo->setBuilder(nullptr);
 
         return;
     }
 
-    ensureFilterInfo()->setBuilder(nullptr);
+    ensureFilterInfo().setBuilder(nullptr);
 }
 
 void PaintLayer::filterNeedsPaintInvalidation()
 {
     {
         DeprecatedScheduleStyleRecalcDuringLayout marker(layoutObject()->document().lifecycle());
         // It's possible for scheduleSVGFilterLayerUpdateHack to schedule a style recalc, which
         // is a problem because this function can be called right before performing layout but
         // after style recalc.
         //
@@ skipping 117 matching lines @@
 
 void showLayerTree(const blink::LayoutObject* layoutObject)
 {
     if (!layoutObject) {
         fprintf(stderr, "Cannot showLayerTree. Root is (nil)\n");
         return;
     }
     showLayerTree(layoutObject->enclosingLayer());
 }
 #endif