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

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

Issue 6598044: Merge 79734 (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/648/
Patch Set: Created 9 years, 10 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 | « Source/WebCore/rendering/RenderBlock.cpp ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/WebCore/rendering/RenderInline.cpp
===================================================================
--- Source/WebCore/rendering/RenderInline.cpp (revision 79910)
+++ Source/WebCore/rendering/RenderInline.cpp (working copy)
@@ -53,6 +53,19 @@
void RenderInline::destroy()
{
+#ifndef NDEBUG
+ // Make sure we do not retain "this" in the continuation outline table map of our containing blocks.
+ if (parent() && style()->visibility() == VISIBLE && hasOutline()) {
+ bool containingBlockPaintsContinuationOutline = continuation() || isInlineElementContinuation();
+ if (containingBlockPaintsContinuationOutline) {
+ if (RenderBlock* cb = containingBlock()) {
+ if (RenderBlock* cbCb = cb->containingBlock())
+ ASSERT(!cbCb->paintsContinuationOutline(this));
+ }
+ }
+ }
+#endif
+
// Make sure to destroy anonymous children first while they are still connected to the rest of the tree, so that they will
// properly dirty line boxes that they are removed from. Effects that do :before/:after only on hover could crash otherwise.
children()->destroyLeftoverChildren();
« no previous file with comments | « Source/WebCore/rendering/RenderBlock.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698