Upstream version 7.36.149.0

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

diff --git a/src/third_party/WebKit/Source/core/rendering/RootInlineBox.cpp b/src/third_party/WebKit/Source/core/rendering/RootInlineBox.cpp
index 3bcc6fd..5b0a8fd 100644 (file)
--- a/src/third_party/WebKit/Source/core/rendering/RootInlineBox.cpp
+++ b/src/third_party/WebKit/Source/core/rendering/RootInlineBox.cpp
@@ -249,7 +249,8 @@ LayoutUnit RootInlineBox::alignBoxesInBlockDirection(LayoutUnit heightOfBlock, G
     maxHeight = max<LayoutUnit>(0, maxHeight); // FIXME: Is this really necessary?
 
     setLineTopBottomPositions(lineTop, lineBottom, heightOfBlock, heightOfBlock + maxHeight);
-    setPaginatedLineWidth(block().availableLogicalWidthForContent());
+    if (block().view()->layoutState()->isPaginated())
+        setPaginatedLineWidth(block().availableLogicalWidthForContent());
 
     LayoutUnit annotationsAdjustment = beforeAnnotationsAdjustment();
     if (annotationsAdjustment) {