Oilpan: improve ScrollableArea handling.

Source/core/paint/DeprecatedPaintLayer.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 153 matching lines @@
         setGroupedMapping(0);
     }
 
     // Child layers will be deleted by their corresponding layout objects, so
     // we don't need to delete them ourselves.
 
     clearCompositedDeprecatedPaintLayerMapping(true);
 
     if (m_reflectionInfo)
         m_reflectionInfo->destroy();
+
+    if (m_scrollableArea)
+        m_scrollableArea->dispose();
 }
 
 String DeprecatedPaintLayer::debugName() const
 {
     if (isReflection())
         return layoutObject()->parent()->debugName() + " (reflection)";
     return layoutObject()->debugName();
 }
 
 DeprecatedPaintLayerCompositor* DeprecatedPaintLayer::compositor() const
@@ skipping 1251 matching lines @@
 {
     if (requiresStackingNode())
         m_stackingNode = adoptPtr(new DeprecatedPaintLayerStackingNode(*layoutObject()));
     else
         m_stackingNode = nullptr;
 }
 
 void DeprecatedPaintLayer::updateScrollableArea()
 {
     if (requiresScrollableArea())
-        m_scrollableArea = adoptPtr(new DeprecatedPaintLayerScrollableArea(*this));
+        m_scrollableArea = DeprecatedPaintLayerScrollableArea::create(*this);
     else
         m_scrollableArea = nullptr;

[haraken, 2015/06/30 10:30:35]

To avoid confusion, I'd move m_scrollableArea(nullptr) to the constructor and
add ASSERT(!m_scrollableArea) at the head of updateScrollableArea().

[sof, 2015/06/30 11:34:09]

Added assert to this and another update*() method so as have them follow the
same pattern.

 }
 
 bool DeprecatedPaintLayer::hasOverflowControls() const
 {
     return m_scrollableArea && (m_scrollableArea->hasScrollbar() || m_scrollableArea->scrollCorner() || layoutObject()->style()->resize() != RESIZE_NONE);
 }
 
 void DeprecatedPaintLayer::appendSingleFragmentIgnoringPagination(DeprecatedPaintLayerFragments& fragments, const DeprecatedPaintLayer* rootLayer, const LayoutRect& dirtyRect, ClipRectsCacheSlot clipRectsCacheSlot, OverlayScrollbarSizeRelevancy inOverlayScrollbarSizeRelevancy, ShouldRespectOverflowClip respectOverflowClip, const LayoutPoint* offsetFromRoot, const LayoutSize& subPixelAccumulation)
 {
     DeprecatedPaintLayerFragment fragment;
@@ skipping 1279 matching lines @@
 
 void showLayerTree(const blink::LayoutObject* layoutObject)
 {
     if (!layoutObject) {
         fprintf(stderr, "Cannot showLayerTree. Root is (nil)\n");
         return;
     }
     showLayerTree(layoutObject->enclosingLayer());
 }
 #endif