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

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

Issue 568443002: [New Multicolumn] A renderer can't be both a parent and a sibling of another renderer. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 6 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
« no previous file with comments | « LayoutTests/fast/multicol/empty-list-item-expected.txt ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2013 Google Inc. All rights reserved. 2 * Copyright (C) 2013 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 1960 matching lines...) Expand 10 before | Expand all | Expand 10 after
1971 } 1971 }
1972 1972
1973 void RenderBlockFlow::setStaticInlinePositionForChild(RenderBox* child, LayoutUn it inlinePosition) 1973 void RenderBlockFlow::setStaticInlinePositionForChild(RenderBox* child, LayoutUn it inlinePosition)
1974 { 1974 {
1975 child->layer()->setStaticInlinePosition(inlinePosition); 1975 child->layer()->setStaticInlinePosition(inlinePosition);
1976 } 1976 }
1977 1977
1978 void RenderBlockFlow::addChild(RenderObject* newChild, RenderObject* beforeChild ) 1978 void RenderBlockFlow::addChild(RenderObject* newChild, RenderObject* beforeChild )
1979 { 1979 {
1980 if (RenderMultiColumnFlowThread* flowThread = multiColumnFlowThread()) { 1980 if (RenderMultiColumnFlowThread* flowThread = multiColumnFlowThread()) {
1981 if (beforeChild == flowThread)
1982 beforeChild = flowThread->firstChild();
1983 ASSERT(!beforeChild || beforeChild->isDescendantOf(flowThread));
1981 flowThread->addChild(newChild, beforeChild); 1984 flowThread->addChild(newChild, beforeChild);
1982 return; 1985 return;
1983 } 1986 }
1984 RenderBlock::addChild(newChild, beforeChild); 1987 RenderBlock::addChild(newChild, beforeChild);
1985 } 1988 }
1986 1989
1987 void RenderBlockFlow::moveAllChildrenIncludingFloatsTo(RenderBlock* toBlock, boo l fullRemoveInsert) 1990 void RenderBlockFlow::moveAllChildrenIncludingFloatsTo(RenderBlock* toBlock, boo l fullRemoveInsert)
1988 { 1991 {
1989 RenderBlockFlow* toBlockFlow = toRenderBlockFlow(toBlock); 1992 RenderBlockFlow* toBlockFlow = toRenderBlockFlow(toBlock);
1990 moveAllChildrenTo(toBlockFlow, fullRemoveInsert); 1993 moveAllChildrenTo(toBlockFlow, fullRemoveInsert);
(...skipping 914 matching lines...) Expand 10 before | Expand all | Expand 10 after
2905 RenderBlockFlow::RenderBlockFlowRareData& RenderBlockFlow::ensureRareData() 2908 RenderBlockFlow::RenderBlockFlowRareData& RenderBlockFlow::ensureRareData()
2906 { 2909 {
2907 if (m_rareData) 2910 if (m_rareData)
2908 return *m_rareData; 2911 return *m_rareData;
2909 2912
2910 m_rareData = adoptPtrWillBeNoop(new RenderBlockFlowRareData(this)); 2913 m_rareData = adoptPtrWillBeNoop(new RenderBlockFlowRareData(this));
2911 return *m_rareData; 2914 return *m_rareData;
2912 } 2915 }
2913 2916
2914 } // namespace blink 2917 } // namespace blink
OLDNEW
« no previous file with comments | « LayoutTests/fast/multicol/empty-list-item-expected.txt ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698