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

Side by Side Diff: Source/core/rendering/RenderBlock.h

Issue 23463021: Avoid collapsing anonymous block children already being destroyed (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 7 years, 3 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 /* 1 /*
2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
3 * (C) 1999 Antti Koivisto (koivisto@kde.org) 3 * (C) 1999 Antti Koivisto (koivisto@kde.org)
4 * (C) 2007 David Smith (catfish.man@gmail.com) 4 * (C) 2007 David Smith (catfish.man@gmail.com)
5 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc. All r ights reserved. 5 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc. All r ights reserved.
6 * 6 *
7 * This library is free software; you can redistribute it and/or 7 * This library is free software; you can redistribute it and/or
8 * modify it under the terms of the GNU Library General Public 8 * modify it under the terms of the GNU Library General Public
9 * License as published by the Free Software Foundation; either 9 * License as published by the Free Software Foundation; either
10 * version 2 of the License, or (at your option) any later version. 10 * version 2 of the License, or (at your option) any later version.
(...skipping 589 matching lines...) Expand 10 before | Expand all | Expand 10 after
600 600
601 virtual const char* renderName() const; 601 virtual const char* renderName() const;
602 602
603 virtual bool isRenderBlock() const OVERRIDE FINAL { return true; } 603 virtual bool isRenderBlock() const OVERRIDE FINAL { return true; }
604 virtual bool isBlockFlow() const OVERRIDE FINAL { return (!isInline() || isR eplaced()) && !isTable(); } 604 virtual bool isBlockFlow() const OVERRIDE FINAL { return (!isInline() || isR eplaced()) && !isTable(); }
605 virtual bool isInlineBlockOrInlineTable() const OVERRIDE FINAL { return isIn line() && isReplaced(); } 605 virtual bool isInlineBlockOrInlineTable() const OVERRIDE FINAL { return isIn line() && isReplaced(); }
606 606
607 void makeChildrenNonInline(RenderObject* insertionPoint = 0); 607 void makeChildrenNonInline(RenderObject* insertionPoint = 0);
608 virtual void removeLeftoverAnonymousBlock(RenderBlock* child); 608 virtual void removeLeftoverAnonymousBlock(RenderBlock* child);
609 609
610 static void collapseAnonymousBoxChild(RenderBlock* parent, RenderObject* chi ld); 610 static void collapseAnonymousBlockChild(RenderBlock* parent, RenderBlock* ch ild);
611 void moveAllChildrenIncludingFloatsTo(RenderBlock* toBlock, bool fullRemoveI nsert); 611 void moveAllChildrenIncludingFloatsTo(RenderBlock* toBlock, bool fullRemoveI nsert);
612 612
613 virtual void dirtyLinesFromChangedChild(RenderObject* child) OVERRIDE FINAL { m_lineBoxes.dirtyLinesFromChangedChild(this, child); } 613 virtual void dirtyLinesFromChangedChild(RenderObject* child) OVERRIDE FINAL { m_lineBoxes.dirtyLinesFromChangedChild(this, child); }
614 614
615 void addChildToContinuation(RenderObject* newChild, RenderObject* beforeChil d); 615 void addChildToContinuation(RenderObject* newChild, RenderObject* beforeChil d);
616 void addChildIgnoringContinuation(RenderObject* newChild, RenderObject* befo reChild); 616 void addChildIgnoringContinuation(RenderObject* newChild, RenderObject* befo reChild);
617 void addChildToAnonymousColumnBlocks(RenderObject* newChild, RenderObject* b eforeChild); 617 void addChildToAnonymousColumnBlocks(RenderObject* newChild, RenderObject* b eforeChild);
618 618
619 void addChildIgnoringAnonymousColumnBlocks(RenderObject* newChild, RenderObj ect* beforeChild = 0); 619 void addChildIgnoringAnonymousColumnBlocks(RenderObject* newChild, RenderObj ect* beforeChild = 0);
620 620
(...skipping 478 matching lines...) Expand 10 before | Expand all | Expand 10 after
1099 ASSERT_WITH_SECURITY_IMPLICATION(!object || object->isRenderBlock()); 1099 ASSERT_WITH_SECURITY_IMPLICATION(!object || object->isRenderBlock());
1100 return static_cast<const RenderBlock*>(object); 1100 return static_cast<const RenderBlock*>(object);
1101 } 1101 }
1102 1102
1103 // This will catch anyone doing an unnecessary cast. 1103 // This will catch anyone doing an unnecessary cast.
1104 void toRenderBlock(const RenderBlock*); 1104 void toRenderBlock(const RenderBlock*);
1105 1105
1106 } // namespace WebCore 1106 } // namespace WebCore
1107 1107
1108 #endif // RenderBlock_h 1108 #endif // RenderBlock_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698