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

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

Issue 791023006: Delete invalidateTreeIfNeeded. (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Remove unneeded call 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
« no previous file with comments | « sky/engine/core/rendering/RenderBlock.cpp ('k') | sky/engine/core/rendering/RenderBox.h » ('j') | 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 139 matching lines...) Expand 10 before | Expand all | Expand 10 after
150 { 150 {
151 dirtyForLayoutFromPercentageHeightDescendants(layoutScope); 151 dirtyForLayoutFromPercentageHeightDescendants(layoutScope);
152 152
153 RenderBox* next = firstChildBox(); 153 RenderBox* next = firstChildBox();
154 RenderBox* lastNormalFlowChild = 0; 154 RenderBox* lastNormalFlowChild = 0;
155 155
156 while (next) { 156 while (next) {
157 RenderBox* child = next; 157 RenderBox* child = next;
158 next = child->nextSiblingBox(); 158 next = child->nextSiblingBox();
159 159
160 // FIXME: this should only be set from clearNeedsLayout crbug.com/361250
161 child->setLayoutDidGetCalled(true);
162
163 updateBlockChildDirtyBitsBeforeLayout(relayoutChildren, child); 160 updateBlockChildDirtyBitsBeforeLayout(relayoutChildren, child);
164 161
165 if (child->isOutOfFlowPositioned()) { 162 if (child->isOutOfFlowPositioned()) {
166 child->containingBlock()->insertPositionedObject(child); 163 child->containingBlock()->insertPositionedObject(child);
167 adjustPositionedBlock(child); 164 adjustPositionedBlock(child);
168 continue; 165 continue;
169 } 166 }
170 167
171 // Lay out the child. 168 // Lay out the child.
172 layoutBlockChild(child); 169 layoutBlockChild(child);
(...skipping 195 matching lines...) Expand 10 before | Expand all | Expand 10 after
368 float logicalLeft = logicalLeftOffsetForLine(false).toFloat(); 365 float logicalLeft = logicalLeftOffsetForLine(false).toFloat();
369 float availableLogicalWidth = logicalRightOffsetForLine(false) - logicalLeft ; 366 float availableLogicalWidth = logicalRightOffsetForLine(false) - logicalLeft ;
370 updateLogicalWidthForAlignment(textAlign, 0, 0, logicalLeft, totalLogicalWid th, availableLogicalWidth, 0); 367 updateLogicalWidthForAlignment(textAlign, 0, 0, logicalLeft, totalLogicalWid th, availableLogicalWidth, 0);
371 368
372 if (!style()->isLeftToRightDirection()) 369 if (!style()->isLeftToRightDirection())
373 return logicalWidth() - logicalLeft; 370 return logicalWidth() - logicalLeft;
374 return logicalLeft; 371 return logicalLeft;
375 } 372 }
376 373
377 } // namespace blink 374 } // namespace blink
OLDNEW
« no previous file with comments | « sky/engine/core/rendering/RenderBlock.cpp ('k') | sky/engine/core/rendering/RenderBox.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698