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

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

Issue 23737004: Paint flex items atomically, like inline-blocks (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: update comment Created 7 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 | Annotate | Revision Log
« no previous file with comments | « Source/core/rendering/RenderBlock.cpp ('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) 2011 Google Inc. All rights reserved. 2 * Copyright (C) 2011 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 307 matching lines...) Expand 10 before | Expand all | Expand 10 after
318 if (!selfNeedsLayout() && child->checkForRepaintDuringLayout()) 318 if (!selfNeedsLayout() && child->checkForRepaintDuringLayout())
319 child->repaintDuringLayoutIfMoved(oldChildRects[childIndex]); 319 child->repaintDuringLayoutIfMoved(oldChildRects[childIndex]);
320 ++childIndex; 320 ++childIndex;
321 } 321 }
322 ASSERT(childIndex == oldChildRects.size()); 322 ASSERT(childIndex == oldChildRects.size());
323 } 323 }
324 324
325 void RenderFlexibleBox::paintChildren(PaintInfo& paintInfo, const LayoutPoint& p aintOffset) 325 void RenderFlexibleBox::paintChildren(PaintInfo& paintInfo, const LayoutPoint& p aintOffset)
326 { 326 {
327 for (RenderBox* child = m_orderIterator.first(); child; child = m_orderItera tor.next()) 327 for (RenderBox* child = m_orderIterator.first(); child; child = m_orderItera tor.next())
328 paintChild(child, paintInfo, paintOffset); 328 paintChildAsInlineBlock(child, paintInfo, paintOffset);
329 } 329 }
330 330
331 void RenderFlexibleBox::repositionLogicalHeightDependentFlexItems(Vector<LineCon text>& lineContexts) 331 void RenderFlexibleBox::repositionLogicalHeightDependentFlexItems(Vector<LineCon text>& lineContexts)
332 { 332 {
333 LayoutUnit crossAxisStartEdge = lineContexts.isEmpty() ? LayoutUnit() : line Contexts[0].crossAxisOffset; 333 LayoutUnit crossAxisStartEdge = lineContexts.isEmpty() ? LayoutUnit() : line Contexts[0].crossAxisOffset;
334 alignFlexLines(lineContexts); 334 alignFlexLines(lineContexts);
335 335
336 // If we have a single line flexbox, the line height is all the available sp ace. 336 // If we have a single line flexbox, the line height is all the available sp ace.
337 // For flex-direction: row, this means we need to use the height, so we do t his after calling updateLogicalHeight. 337 // For flex-direction: row, this means we need to use the height, so we do t his after calling updateLogicalHeight.
338 if (!isMultiline() && lineContexts.size() == 1) 338 if (!isMultiline() && lineContexts.size() == 1)
(...skipping 1043 matching lines...) Expand 10 before | Expand all | Expand 10 after
1382 ASSERT(child); 1382 ASSERT(child);
1383 LayoutUnit lineCrossAxisExtent = lineContexts[lineNumber].crossAxisE xtent; 1383 LayoutUnit lineCrossAxisExtent = lineContexts[lineNumber].crossAxisE xtent;
1384 LayoutUnit originalOffset = lineContexts[lineNumber].crossAxisOffset - crossAxisStartEdge; 1384 LayoutUnit originalOffset = lineContexts[lineNumber].crossAxisOffset - crossAxisStartEdge;
1385 LayoutUnit newOffset = contentExtent - originalOffset - lineCrossAxi sExtent; 1385 LayoutUnit newOffset = contentExtent - originalOffset - lineCrossAxi sExtent;
1386 adjustAlignmentForChild(child, newOffset - originalOffset); 1386 adjustAlignmentForChild(child, newOffset - originalOffset);
1387 } 1387 }
1388 } 1388 }
1389 } 1389 }
1390 1390
1391 } 1391 }
OLDNEW
« no previous file with comments | « Source/core/rendering/RenderBlock.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698