[css-grid] Avoid double loop in positioned objects layout

third_party/WebKit/Source/core/layout/LayoutGrid.cpp

 /*
  * Copyright (C) 2011 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 2464 matching lines @@
 
 void LayoutGrid::prepareChildForPositionedLayout(LayoutBox& child) {
   ASSERT(child.isOutOfFlowPositioned());
   child.containingBlock()->insertPositionedObject(&child);
 
   PaintLayer* childLayer = child.layer();
   childLayer->setStaticInlinePosition(borderAndPaddingStart());
   childLayer->setStaticBlockPosition(borderAndPaddingBefore());
 }
 
-void LayoutGrid::layoutPositionedObjects(bool relayoutChildren,
-                                         PositionedLayoutBehavior info) {
-  TrackedLayoutBoxListHashSet* positionedDescendants = positionedObjects();
-  if (!positionedDescendants)
-    return;
-
-  for (auto* child : *positionedDescendants) {
-    if (isOrthogonalChild(*child)) {
-      // FIXME: Properly support orthogonal writing mode.
-      continue;
-    }
+void LayoutGrid::layoutPositionedObject(LayoutBox* child,

[jfernandez, 2016/11/18 16:18:22]

Ditto.

+                                        bool relayoutChildren,
+                                        PositionedLayoutBehavior info) {
+  if (!isOrthogonalChild(*child)) {
+    // FIXME: Properly support orthogonal writing mode.
 
     LayoutUnit columnOffset = LayoutUnit();
     LayoutUnit columnBreadth = LayoutUnit();
     offsetAndBreadthForPositionedChild(*child, ForColumns, columnOffset,
                                        columnBreadth);
     LayoutUnit rowOffset = LayoutUnit();
     LayoutUnit rowBreadth = LayoutUnit();
     offsetAndBreadthForPositionedChild(*child, ForRows, rowOffset, rowBreadth);
 
     child->setOverrideContainingBlockContentLogicalWidth(columnBreadth);
     child->setOverrideContainingBlockContentLogicalHeight(rowBreadth);
     child->setExtraInlineOffset(columnOffset);
     child->setExtraBlockOffset(rowOffset);
 
     if (child->parent() == this) {
       PaintLayer* childLayer = child->layer();
       childLayer->setStaticInlinePosition(borderStart() + columnOffset);
       childLayer->setStaticBlockPosition(borderBefore() + rowOffset);
     }
   }
 
-  LayoutBlock::layoutPositionedObjects(relayoutChildren, info);
+  LayoutBlock::layoutPositionedObject(child, relayoutChildren, info);
 }
 
 void LayoutGrid::offsetAndBreadthForPositionedChild(
     const LayoutBox& child,
     GridTrackSizingDirection direction,
     LayoutUnit& offset,
     LayoutUnit& breadth) {
   ASSERT(!isOrthogonalChild(child));
   bool isForColumns = direction == ForColumns;
 
@@ skipping 967 matching lines @@
   if (!m_gridItemArea.isEmpty())
     GridPainter(*this).paintChildren(paintInfo, paintOffset);
 }
 
 bool LayoutGrid::cachedHasDefiniteLogicalHeight() const {
   SECURITY_DCHECK(m_hasDefiniteLogicalHeight);
   return m_hasDefiniteLogicalHeight.value();
 }
 
 }  // namespace blink