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

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

Issue 140323004: Mark private method layoutBlockFlow as inline (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 6 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
« no previous file with comments | « Source/core/rendering/RenderBlockFlow.h ('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 233 matching lines...) Expand 10 before | Expand all | Expand 10 after
244 { 244 {
245 m_hasOnlySelfCollapsingChildren = RenderBlock::isSelfCollapsingBlock(); 245 m_hasOnlySelfCollapsingChildren = RenderBlock::isSelfCollapsingBlock();
246 return m_hasOnlySelfCollapsingChildren; 246 return m_hasOnlySelfCollapsingChildren;
247 } 247 }
248 248
249 void RenderBlockFlow::layoutBlock(bool relayoutChildren) 249 void RenderBlockFlow::layoutBlock(bool relayoutChildren)
250 { 250 {
251 layoutBlockFlow(relayoutChildren); 251 layoutBlockFlow(relayoutChildren);
252 } 252 }
253 253
254 void RenderBlockFlow::layoutBlockFlow(bool relayoutChildren, LayoutUnit pageLogi calHeight) 254 inline void RenderBlockFlow::layoutBlockFlow(bool relayoutChildren, LayoutUnit p ageLogicalHeight)
Inactive 2014/01/20 18:57:50 Yes, looking at the original patch, it seems like
255 { 255 {
256 ASSERT(needsLayout()); 256 ASSERT(needsLayout());
257 ASSERT(isInlineBlockOrInlineTable() || !isInline()); 257 ASSERT(isInlineBlockOrInlineTable() || !isInline());
258 258
259 // If we are self-collapsing with self-collapsing descendants this will get set to save us burrowing through our 259 // If we are self-collapsing with self-collapsing descendants this will get set to save us burrowing through our
260 // descendants every time in |isSelfCollapsingBlock|. We reset it here so th at |isSelfCollapsingBlock| attempts to burrow 260 // descendants every time in |isSelfCollapsingBlock|. We reset it here so th at |isSelfCollapsingBlock| attempts to burrow
261 // at least once and so that it always gives a reliable result reflecting th e latest layout. 261 // at least once and so that it always gives a reliable result reflecting th e latest layout.
262 m_hasOnlySelfCollapsingChildren = false; 262 m_hasOnlySelfCollapsingChildren = false;
263 263
264 if (!relayoutChildren && simplifiedLayout()) 264 if (!relayoutChildren && simplifiedLayout())
(...skipping 2557 matching lines...) Expand 10 before | Expand all | Expand 10 after
2822 RenderBlockFlow::RenderBlockFlowRareData& RenderBlockFlow::ensureRareData() 2822 RenderBlockFlow::RenderBlockFlowRareData& RenderBlockFlow::ensureRareData()
2823 { 2823 {
2824 if (m_rareData) 2824 if (m_rareData)
2825 return *m_rareData; 2825 return *m_rareData;
2826 2826
2827 m_rareData = adoptPtr(new RenderBlockFlowRareData(this)); 2827 m_rareData = adoptPtr(new RenderBlockFlowRareData(this));
2828 return *m_rareData; 2828 return *m_rareData;
2829 } 2829 }
2830 2830
2831 } // namespace WebCore 2831 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/core/rendering/RenderBlockFlow.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698