| OLD | NEW |
| 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 242 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 253 void RenderFlexibleBox::appendChildFrameRects(ChildFrameRects& childFrameRects) | 253 void RenderFlexibleBox::appendChildFrameRects(ChildFrameRects& childFrameRects) |
| 254 { | 254 { |
| 255 for (RenderBox* child = m_orderIterator.first(); child; child = m_orderItera
tor.next()) { | 255 for (RenderBox* child = m_orderIterator.first(); child; child = m_orderItera
tor.next()) { |
| 256 if (!child->isOutOfFlowPositioned()) | 256 if (!child->isOutOfFlowPositioned()) |
| 257 childFrameRects.append(child->frameRect()); | 257 childFrameRects.append(child->frameRect()); |
| 258 } | 258 } |
| 259 } | 259 } |
| 260 | 260 |
| 261 void RenderFlexibleBox::paintChildren(PaintInfo& paintInfo, const LayoutPoint& p
aintOffset) | 261 void RenderFlexibleBox::paintChildren(PaintInfo& paintInfo, const LayoutPoint& p
aintOffset) |
| 262 { | 262 { |
| 263 for (RenderBox* child = m_orderIterator.first(); child; child = m_orderItera
tor.next()) | 263 for (RenderBox* child = m_orderIterator.first(); child; child = m_orderItera
tor.next()) { |
| 264 paintChildAsInlineBlock(child, paintInfo, paintOffset); | 264 if (!child->hasSelfPaintingLayer()) |
| 265 child->paint(paintInfo, paintOffset); |
| 266 } |
| 265 } | 267 } |
| 266 | 268 |
| 267 void RenderFlexibleBox::repositionLogicalHeightDependentFlexItems(Vector<LineCon
text>& lineContexts) | 269 void RenderFlexibleBox::repositionLogicalHeightDependentFlexItems(Vector<LineCon
text>& lineContexts) |
| 268 { | 270 { |
| 269 LayoutUnit crossAxisStartEdge = lineContexts.isEmpty() ? LayoutUnit() : line
Contexts[0].crossAxisOffset; | 271 LayoutUnit crossAxisStartEdge = lineContexts.isEmpty() ? LayoutUnit() : line
Contexts[0].crossAxisOffset; |
| 270 alignFlexLines(lineContexts); | 272 alignFlexLines(lineContexts); |
| 271 | 273 |
| 272 alignChildren(lineContexts); | 274 alignChildren(lineContexts); |
| 273 | 275 |
| 274 if (style()->flexWrap() == FlexWrapReverse) | 276 if (style()->flexWrap() == FlexWrapReverse) |
| (...skipping 1009 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1284 ASSERT(child); | 1286 ASSERT(child); |
| 1285 LayoutUnit lineCrossAxisExtent = lineContexts[lineNumber].crossAxisE
xtent; | 1287 LayoutUnit lineCrossAxisExtent = lineContexts[lineNumber].crossAxisE
xtent; |
| 1286 LayoutUnit originalOffset = lineContexts[lineNumber].crossAxisOffset
- crossAxisStartEdge; | 1288 LayoutUnit originalOffset = lineContexts[lineNumber].crossAxisOffset
- crossAxisStartEdge; |
| 1287 LayoutUnit newOffset = contentExtent - originalOffset - lineCrossAxi
sExtent; | 1289 LayoutUnit newOffset = contentExtent - originalOffset - lineCrossAxi
sExtent; |
| 1288 adjustAlignmentForChild(child, newOffset - originalOffset); | 1290 adjustAlignmentForChild(child, newOffset - originalOffset); |
| 1289 } | 1291 } |
| 1290 } | 1292 } |
| 1291 } | 1293 } |
| 1292 | 1294 |
| 1293 } | 1295 } |
| OLD | NEW |