Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(312)

Unified Diff: Source/WebCore/rendering/RenderLayer.cpp

Issue 6953015: Merge 85586 (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/742/
Patch Set: Created 9 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « LayoutTests/fast/reflections/remove-reflection-crash-expected.txt ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/WebCore/rendering/RenderLayer.cpp
===================================================================
--- Source/WebCore/rendering/RenderLayer.cpp (revision 86004)
+++ Source/WebCore/rendering/RenderLayer.cpp (working copy)
@@ -211,6 +211,9 @@
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.
@@ -226,9 +229,6 @@
// Make sure we have no lingering clip rects.
ASSERT(!m_clipRects);
- if (m_reflection)
- removeReflection();
-
if (m_scrollCorner)
m_scrollCorner->destroy();
if (m_resizer)
« no previous file with comments | « LayoutTests/fast/reflections/remove-reflection-crash-expected.txt ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698