Update PaintLayer size during layout, not after.

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

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009 Apple Inc.
  *               All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
  *
@@ skipping 19 matching lines @@
 #include "core/frame/Settings.h"
 #include "core/html/HTMLIFrameElement.h"
 #include "core/layout/HitTestResult.h"
 #include "core/layout/LayoutGeometryMap.h"
 #include "core/layout/LayoutPart.h"
 #include "core/layout/ViewFragmentationContext.h"
 #include "core/layout/api/LayoutAPIShim.h"
 #include "core/layout/api/LayoutPartItem.h"
 #include "core/layout/api/LayoutViewItem.h"
 #include "core/layout/compositing/PaintLayerCompositor.h"
+#include "core/page/ChromeClient.h"
 #include "core/page/Page.h"
 #include "core/paint/PaintLayer.h"
 #include "core/paint/ViewPaintInvalidator.h"
 #include "core/paint/ViewPainter.h"
 #include "core/svg/SVGDocumentExtensions.h"
 #include "platform/Histogram.h"
 #include "platform/RuntimeEnabledFeatures.h"
 #include "platform/geometry/FloatQuad.h"
 #include "platform/geometry/TransformState.h"
 #include "platform/graphics/paint/PaintController.h"
@@ skipping 221 matching lines @@
   }
 
   SubtreeLayoutScope layout_scope(*this);
 
   // Use calcWidth/Height to get the new width/height, since this will take the
   // full page zoom factor into account.
   bool relayout_children =
       !ShouldUsePrintingLayout() &&
       (!frame_view_ || LogicalWidth() != ViewLogicalWidthForBoxSizing() ||
        LogicalHeight() != ViewLogicalHeightForBoxSizing());
+
+  if (!relayout_children && GetDocument().IsSVGDocument()) {
+    for (LayoutObject* child = FirstChild(); child;
+         child = child->NextSibling()) {
+      if (!child->IsSVGRoot())
+        continue;
+      const Length& child_height = child->Style()->LogicalHeight();
+      if (!child_height.IsPercentOrCalc())
+        continue;
+      if (ToLayoutBox(child)->LogicalHeight() !=
+          ValueForLength(child_height,
+                         AvailableLogicalHeightUsing(
+                             child_height, kExcludeMarginBorderPadding))) {
+        relayout_children = true;
+        layout_scope.SetChildNeedsLayout(child);
+      }
+    }
+  }
+
   if (relayout_children) {
     layout_scope.SetChildNeedsLayout(this);
     for (LayoutObject* child = FirstChild(); child;
          child = child->NextSibling()) {
       if (child->IsSVGRoot())
         continue;
 
       if ((child->IsBox() && ToLayoutBox(child)->HasRelativeLogicalHeight()) ||
           child->Style()->LogicalHeight().IsPercentOrCalc() ||
           child->Style()->LogicalMinHeight().IsPercentOrCalc() ||
@@ skipping 408 matching lines @@
 LayoutUnit LayoutView::ViewLogicalHeightForPercentages() const {
   if (ShouldUsePrintingLayout())
     return PageLogicalHeight();
   return LayoutUnit(ViewLogicalHeight());
 }
 
 float LayoutView::ZoomFactor() const {
   return frame_view_->GetFrame().PageZoomFactor();
 }
 
+void LayoutView::UpdateAfterLayout() {
+  // Unlike every other layer, the root PaintLayer takes its size from the
+  // layout viewport size.  The call to AdjustViewSize() will update the
+  // frame's contents size, which will also update the page's minimum scale
+  // factor.  The call to ResizeAfterLayout() will calculate the layout viewport
+  // size based on the page minimum scale factor, and then update the FrameView
+  // with the new size.
+  if (HasOverflowClip())
+    GetScrollableArea()->ClampScrollOffsetAfterOverflowChange();
+  LocalFrame& frame = GetFrameView()->GetFrame();
+  if (!GetDocument().Printing())
+    GetFrameView()->AdjustViewSize();
+  frame.GetChromeClient().ResizeAfterLayout(&frame);
+  LayoutBlock::UpdateAfterLayout();
+}
+
 void LayoutView::UpdateHitTestResult(HitTestResult& result,
                                      const LayoutPoint& point) {
   if (result.InnerNode())
     return;
 
   Node* node = GetDocument().documentElement();
   if (node) {
     LayoutPoint adjusted_point = point;
     OffsetForContents(adjusted_point);
     result.SetNodeAndPosition(node, adjusted_point);
@@ skipping 93 matching lines @@
   // Frame scroll corner is painted using LayoutView as the display item client.
   if (!RuntimeEnabledFeatures::rootLayerScrollingEnabled() &&
       (GetFrameView()->HorizontalScrollbar() ||
        GetFrameView()->VerticalScrollbar()))
     return false;
 
   return LayoutBlockFlow::PaintedOutputOfObjectHasNoEffectRegardlessOfSize();
 }
 
 }  // namespace blink