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

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

Issue 203483002: Clear sibling floats while splitting inline flow. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Reupload Created 6 years, 9 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/block/float/split-inline-sibling-of-float-crash-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 2087 matching lines...) Expand 10 before | Expand all | Expand 10 after
2098 bool RenderBlockFlow::containsFloat(RenderBox* renderer) const 2098 bool RenderBlockFlow::containsFloat(RenderBox* renderer) const
2099 { 2099 {
2100 return m_floatingObjects && m_floatingObjects->set().contains<FloatingObject HashTranslator>(renderer); 2100 return m_floatingObjects && m_floatingObjects->set().contains<FloatingObject HashTranslator>(renderer);
2101 } 2101 }
2102 2102
2103 void RenderBlockFlow::removeFloatingObjects() 2103 void RenderBlockFlow::removeFloatingObjects()
2104 { 2104 {
2105 if (!m_floatingObjects) 2105 if (!m_floatingObjects)
2106 return; 2106 return;
2107 2107
2108 markSiblingsWithFloatsForLayout();
2109
2108 m_floatingObjects->clear(); 2110 m_floatingObjects->clear();
2109 } 2111 }
2110 2112
2111 LayoutPoint RenderBlockFlow::flipFloatForWritingModeForChild(const FloatingObjec t* child, const LayoutPoint& point) const 2113 LayoutPoint RenderBlockFlow::flipFloatForWritingModeForChild(const FloatingObjec t* child, const LayoutPoint& point) const
2112 { 2114 {
2113 if (!style()->isFlippedBlocksWritingMode()) 2115 if (!style()->isFlippedBlocksWritingMode())
2114 return point; 2116 return point;
2115 2117
2116 // This is similar to RenderBox::flipForWritingModeForChild. We have to subt ract out our left/top offsets twice, since 2118 // This is similar to RenderBox::flipForWritingModeForChild. We have to subt ract out our left/top offsets twice, since
2117 // it's going to get added back in. We hide this complication here so that t he calling code looks normal for the unflipped 2119 // it's going to get added back in. We hide this complication here so that t he calling code looks normal for the unflipped
(...skipping 714 matching lines...) Expand 10 before | Expand all | Expand 10 after
2832 RenderBlockFlow::RenderBlockFlowRareData& RenderBlockFlow::ensureRareData() 2834 RenderBlockFlow::RenderBlockFlowRareData& RenderBlockFlow::ensureRareData()
2833 { 2835 {
2834 if (m_rareData) 2836 if (m_rareData)
2835 return *m_rareData; 2837 return *m_rareData;
2836 2838
2837 m_rareData = adoptPtr(new RenderBlockFlowRareData(this)); 2839 m_rareData = adoptPtr(new RenderBlockFlowRareData(this));
2838 return *m_rareData; 2840 return *m_rareData;
2839 } 2841 }
2840 2842
2841 } // namespace WebCore 2843 } // namespace WebCore
OLDNEW
« no previous file with comments | « LayoutTests/fast/block/float/split-inline-sibling-of-float-crash-expected.txt ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698