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

Side by Side Diff: Source/core/rendering/RenderBox.cpp

Issue 869583002: [New Multicolumn] Support dynamic insertion and removal of multicol content. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 5 years, 11 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
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) 2005 Allan Sandfeld Jensen (kde@carewolf.com) 4 * (C) 2005 Allan Sandfeld Jensen (kde@carewolf.com)
5 * (C) 2005, 2006 Samuel Weinig (sam.weinig@gmail.com) 5 * (C) 2005, 2006 Samuel Weinig (sam.weinig@gmail.com)
6 * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights reserv ed. 6 * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights reserv ed.
7 * Copyright (C) 2013 Adobe Systems Incorporated. All rights reserved. 7 * Copyright (C) 2013 Adobe Systems Incorporated. All rights reserved.
8 * 8 *
9 * This library is free software; you can redistribute it and/or 9 * This library is free software; you can redistribute it and/or
10 * modify it under the terms of the GNU Library General Public 10 * modify it under the terms of the GNU Library General Public
(...skipping 110 matching lines...) Expand 10 before | Expand all | Expand 10 after
121 return NoLayer; 121 return NoLayer;
122 } 122 }
123 return NormalLayer; 123 return NormalLayer;
124 } 124 }
125 if (hasOverflowClip()) 125 if (hasOverflowClip())
126 return OverflowClipLayer; 126 return OverflowClipLayer;
127 127
128 return NoLayer; 128 return NoLayer;
129 } 129 }
130 130
131 void RenderBox::willBeRemovedFromTree()
132 {
133 if (m_rareData && m_rareData->m_spannerPlaceholder) {
134 m_rareData->m_spannerPlaceholder->spannerWillBeRemoved();
135 m_rareData->m_spannerPlaceholder = 0;
136 }
137 RenderBoxModelObject::willBeRemovedFromTree();
138 }
139
140 void RenderBox::willBeDestroyed() 131 void RenderBox::willBeDestroyed()
141 { 132 {
142 clearOverrideSize(); 133 clearOverrideSize();
143 clearContainingBlockOverrideSize(); 134 clearContainingBlockOverrideSize();
144 clearExtraInlineAndBlockOffests(); 135 clearExtraInlineAndBlockOffests();
145 136
146 RenderBlock::removePercentHeightDescendantIfNeeded(this); 137 RenderBlock::removePercentHeightDescendantIfNeeded(this);
147 138
148 ShapeOutsideInfo::removeInfo(*this); 139 ShapeOutsideInfo::removeInfo(*this);
149 140
(...skipping 4410 matching lines...) Expand 10 before | Expand all | Expand 10 after
4560 computedValues.m_margins.m_end = marginEnd(); 4551 computedValues.m_margins.m_end = marginEnd();
4561 4552
4562 setLogicalTop(oldLogicalTop); 4553 setLogicalTop(oldLogicalTop);
4563 setLogicalWidth(oldLogicalWidth); 4554 setLogicalWidth(oldLogicalWidth);
4564 setLogicalLeft(oldLogicalLeft); 4555 setLogicalLeft(oldLogicalLeft);
4565 setMarginLeft(oldMarginLeft); 4556 setMarginLeft(oldMarginLeft);
4566 setMarginRight(oldMarginRight); 4557 setMarginRight(oldMarginRight);
4567 } 4558 }
4568 4559
4569 } // namespace blink 4560 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698