Upstream version 7.35.139.0

[platform/framework/web/crosswalk.git] / src / third_party / WebKit / Source / core / rendering / RenderBlockFlow.cpp

diff --git a/src/third_party/WebKit/Source/core/rendering/RenderBlockFlow.cpp b/src/third_party/WebKit/Source/core/rendering/RenderBlockFlow.cpp
index d52100b..a43ed6c 100644 (file)
--- a/src/third_party/WebKit/Source/core/rendering/RenderBlockFlow.cpp
+++ b/src/third_party/WebKit/Source/core/rendering/RenderBlockFlow.cpp
@@ -330,7 +330,6 @@ void RenderBlockFlow::layoutBlock(bool relayoutChildren)
 
 inline bool RenderBlockFlow::layoutBlockFlow(bool relayoutChildren, LayoutUnit &pageLogicalHeight, SubtreeLayoutScope& layoutScope)
 {
-    LayoutUnit oldLeft = logicalLeft();
     if (updateLogicalWidthAndColumnWidth())
         relayoutChildren = true;
 
@@ -434,7 +433,7 @@ inline bool RenderBlockFlow::layoutBlockFlow(bool relayoutChildren, LayoutUnit &
     if (heightChanged)
         relayoutChildren = true;
 
-    layoutPositionedObjects(relayoutChildren || isRoot(), oldLeft != logicalLeft() ? ForcedLayoutAfterContainingBlockMoved : DefaultLayout);
+    layoutPositionedObjects(relayoutChildren || isRoot());
 
     computeRegionRangeForBlock(flowThreadContainingBlock());