diff options
| author | Steve Block <steveblock@google.com> | 2011-06-10 16:52:27 +0100 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2011-06-14 01:14:02 +0100 |
| commit | 54cdeeebc7adcbcd900e8b6a141a8cae27d9a631 (patch) | |
| tree | 845b0d338b204a48560eca3b51b34cf92ed96840 /Source/WebCore/rendering/RenderLayer.cpp | |
| parent | d2c5226a647dc21d0c15267e09a3d19cf3e0d593 (diff) | |
| download | external_webkit-54cdeeebc7adcbcd900e8b6a141a8cae27d9a631.zip external_webkit-54cdeeebc7adcbcd900e8b6a141a8cae27d9a631.tar.gz external_webkit-54cdeeebc7adcbcd900e8b6a141a8cae27d9a631.tar.bz2 | |
Merge WebKit at branches/chromium/742 r88085: Initial merge by git.
Change-Id: I0501b484b9528e31b0026e5ad64416dd6541cdde
Diffstat (limited to 'Source/WebCore/rendering/RenderLayer.cpp')
| -rw-r--r-- | Source/WebCore/rendering/RenderLayer.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Source/WebCore/rendering/RenderLayer.cpp b/Source/WebCore/rendering/RenderLayer.cpp index 4676c91..6aff65c 100644 --- a/Source/WebCore/rendering/RenderLayer.cpp +++ b/Source/WebCore/rendering/RenderLayer.cpp @@ -217,6 +217,9 @@ RenderLayer::~RenderLayer() destroyScrollbar(HorizontalScrollbar); destroyScrollbar(VerticalScrollbar); + if (m_reflection) + removeReflection(); + // Child layers will be deleted by their corresponding render objects, so // we don't need to delete them ourselves. @@ -232,9 +235,6 @@ RenderLayer::~RenderLayer() // Make sure we have no lingering clip rects. ASSERT(!m_clipRects); - if (m_reflection) - removeReflection(); - if (m_scrollCorner) m_scrollCorner->destroy(); if (m_resizer) |