Remove layoutBlock.

sky/engine/core/rendering/RenderBlockFlow.cpp

 /*
  * Copyright (C) 2013 Google 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:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 47 matching lines @@
     RenderBlockFlow* renderer = new RenderBlockFlow(0);
     renderer->setDocumentForAnonymous(document);
     return renderer;
 }
 
 bool RenderBlockFlow::updateLogicalWidthAndColumnWidth()
 {
     return RenderBlock::updateLogicalWidthAndColumnWidth();
 }
 
-void RenderBlockFlow::layoutBlock(bool relayoutChildren)
+void RenderBlockFlow::layout()
 {
     ASSERT(needsLayout());
     ASSERT(isInlineBlock() || !isInline());
 
-    if (!relayoutChildren && simplifiedLayout())
+    if (simplifiedLayout())
         return;
 
     SubtreeLayoutScope layoutScope(*this);
 
-    layoutBlockFlow(relayoutChildren, layoutScope);
+    layoutBlockFlow(layoutScope);
 
     updateLayerTransformAfterLayout();
 
     // Update our scroll information if we're overflow:auto/scroll/hidden now that we know if
     // we overflow or not.
     updateScrollInfoAfterLayout();
 
     clearNeedsLayout();
 }
 
-inline void RenderBlockFlow::layoutBlockFlow(bool relayoutChildren, SubtreeLayoutScope& layoutScope)
+inline void RenderBlockFlow::layoutBlockFlow(SubtreeLayoutScope& layoutScope)
 {
     LayoutUnit oldLeft = logicalLeft();
     bool logicalWidthChanged = updateLogicalWidthAndColumnWidth();
-    relayoutChildren |= logicalWidthChanged;
+    bool relayoutChildren = logicalWidthChanged;
 
     LayoutState state(*this, locationOffset(), logicalWidthChanged);
 
     LayoutUnit beforeEdge = borderBefore() + paddingBefore();
     LayoutUnit afterEdge = borderAfter() + paddingAfter();
     LayoutUnit previousHeight = logicalHeight();
     setLogicalHeight(beforeEdge);
 
     layoutChildren(relayoutChildren, layoutScope, beforeEdge, afterEdge);
 
@@ skipping 255 matching lines @@
     float logicalLeft = logicalLeftOffsetForLine(false).toFloat();
     float availableLogicalWidth = logicalRightOffsetForLine(false) - logicalLeft;
     updateLogicalWidthForAlignment(textAlign, 0, 0, logicalLeft, totalLogicalWidth, availableLogicalWidth, 0);
 
     if (!style()->isLeftToRightDirection())
         return logicalWidth() - logicalLeft;
     return logicalLeft;
 }
 
 } // namespace blink