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

Side by Side Diff: sky/engine/core/rendering/RenderBlockFlow.cpp

Issue 748943002: remove childrenInline & setChildrenInline (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: cr comments Created 6 years 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) 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 85 matching lines...) Expand 10 before | Expand all | Expand 10 after
96 96
97 LayoutState state(*this, locationOffset(), logicalWidthChanged); 97 LayoutState state(*this, locationOffset(), logicalWidthChanged);
98 98
99 LayoutUnit beforeEdge = borderBefore() + paddingBefore(); 99 LayoutUnit beforeEdge = borderBefore() + paddingBefore();
100 LayoutUnit afterEdge = borderAfter() + paddingAfter(); 100 LayoutUnit afterEdge = borderAfter() + paddingAfter();
101 LayoutUnit previousHeight = logicalHeight(); 101 LayoutUnit previousHeight = logicalHeight();
102 setLogicalHeight(beforeEdge); 102 setLogicalHeight(beforeEdge);
103 103
104 m_paintInvalidationLogicalTop = 0; 104 m_paintInvalidationLogicalTop = 0;
105 m_paintInvalidationLogicalBottom = 0; 105 m_paintInvalidationLogicalBottom = 0;
106 if (!firstChild() && !isAnonymousBlock())
107 setChildrenInline(true);
108 106
109 if (childrenInline()) 107 if (isRenderParagraph())
110 layoutInlineChildren(relayoutChildren, m_paintInvalidationLogicalTop, m_ paintInvalidationLogicalBottom, afterEdge); 108 layoutInlineChildren(relayoutChildren, m_paintInvalidationLogicalTop, m_ paintInvalidationLogicalBottom, afterEdge);
111 else 109 else
112 layoutBlockChildren(relayoutChildren, layoutScope, beforeEdge, afterEdge ); 110 layoutBlockChildren(relayoutChildren, layoutScope, beforeEdge, afterEdge );
113 111
114 LayoutUnit oldClientAfterEdge = clientLogicalBottom(); 112 LayoutUnit oldClientAfterEdge = clientLogicalBottom();
115 113
116 updateLogicalHeight(); 114 updateLogicalHeight();
117 115
118 if (previousHeight != logicalHeight()) 116 if (previousHeight != logicalHeight())
119 relayoutChildren = true; 117 relayoutChildren = true;
(...skipping 226 matching lines...) Expand 10 before | Expand all | Expand 10 after
346 } 344 }
347 return logicalRight; 345 return logicalRight;
348 } 346 }
349 347
350 RootInlineBox* RenderBlockFlow::createRootInlineBox() 348 RootInlineBox* RenderBlockFlow::createRootInlineBox()
351 { 349 {
352 return new RootInlineBox(*this); 350 return new RootInlineBox(*this);
353 } 351 }
354 352
355 } // namespace blink 353 } // namespace blink
OLDNEW
« no previous file with comments | « sky/engine/core/rendering/RenderBlock.cpp ('k') | sky/engine/core/rendering/RenderFlexibleBox.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698