Index: Source/core/paint/DeprecatedPaintLayer.cpp |
diff --git a/Source/core/paint/DeprecatedPaintLayer.cpp b/Source/core/paint/DeprecatedPaintLayer.cpp |
index a7f62fdf05878ef7e08871febc7ff75416491108..23f7f0a4238f480245b4c620d8f8344caf2a6137 100644 |
--- a/Source/core/paint/DeprecatedPaintLayer.cpp |
+++ b/Source/core/paint/DeprecatedPaintLayer.cpp |
@@ -171,6 +171,9 @@ DeprecatedPaintLayer::~DeprecatedPaintLayer() |
if (m_reflectionInfo) |
m_reflectionInfo->destroy(); |
+ |
+ if (m_scrollableArea) |
+ m_scrollableArea->dispose(); |
} |
String DeprecatedPaintLayer::debugName() const |
@@ -1433,18 +1436,16 @@ void DeprecatedPaintLayer::updateReflectionInfo(const ComputedStyle* oldStyle) |
void DeprecatedPaintLayer::updateStackingNode() |
{ |
+ ASSERT(!m_stackingNode); |
if (requiresStackingNode()) |
m_stackingNode = adoptPtr(new DeprecatedPaintLayerStackingNode(*layoutObject())); |
- else |
- m_stackingNode = nullptr; |
} |
void DeprecatedPaintLayer::updateScrollableArea() |
{ |
+ ASSERT(!m_scrollableArea); |
if (requiresScrollableArea()) |
- m_scrollableArea = adoptPtr(new DeprecatedPaintLayerScrollableArea(*this)); |
- else |
- m_scrollableArea = nullptr; |
+ m_scrollableArea = DeprecatedPaintLayerScrollableArea::create(*this); |
} |
bool DeprecatedPaintLayer::hasOverflowControls() const |