Update PaintLayer size during layout, not after.

third_party/WebKit/Source/web/WebViewImpl.cpp

 /*
  * Copyright (C) 2011, 2012 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 1887 matching lines @@
                                           bool browser_controls_shrink_layout) {
   DCHECK(MainFrameImpl());
 
   GetBrowserControls().SetHeight(browser_controls_height,
                                  browser_controls_shrink_layout);
 
   {
     // Avoids unnecessary invalidations while various bits of state in
     // TextAutosizer are updated.
     TextAutosizer::DeferUpdatePageInfo defer_update_page_info(GetPage());
+    FrameView* frame_view = MainFrameImpl()->GetFrameView();
+    IntRect old_rect = frame_view->FrameRect();
     UpdateICBAndResizeViewport();
+    IntRect new_rect = frame_view->FrameRect();
+    frame_view->MarkViewportConstrainedObjectsForLayout(
+        old_rect.Width() != new_rect.Width(),
+        old_rect.Height() != new_rect.Height());
   }
 
   fullscreen_controller_->UpdateSize();
 
   // Update lifecyle phases immediately to recalculate the minimum scale limit
   // for rotation anchoring, and to make sure that no lifecycle states are
   // stale if this WebView is embedded in another one.
   UpdateAllLifecyclePhases();
 }
 
@@ skipping 1240 matching lines @@
   float new_page_scale_factor = PageScaleFactor();
   if (GetPageScaleConstraintsSet().NeedsReset() &&
       GetPageScaleConstraintsSet().FinalConstraints().initial_scale != -1) {
     new_page_scale_factor =
         GetPageScaleConstraintsSet().FinalConstraints().initial_scale;
     GetPageScaleConstraintsSet().SetNeedsReset(false);
   }
   SetPageScaleFactor(new_page_scale_factor);
 
   UpdateLayerTreeViewport();
-
-  // Changes to page-scale during layout may require an additional frame.
-  // We can't update the lifecycle here because we may be in the middle of
-  // layout in the caller of this method.
-  // TODO(chrishtr): clean all this up. All layout should happen in one
-  // lifecycle run (crbug.com/578239).
-  if (MainFrameImpl()->GetFrameView()->NeedsLayout())
-    MainFrameImpl()->FrameWidget()->ScheduleAnimation();
 }
 
 void WebViewImpl::UpdatePageDefinedViewportConstraints(
     const ViewportDescription& description) {
   if (!GetPage() || (!size_.width && !size_.height) ||
       !GetPage()->MainFrame()->IsLocalFrame())
     return;
 
   if (!GetSettings()->ViewportEnabled()) {
     GetPageScaleConstraintsSet().ClearPageDefinedConstraints();
@@ skipping 468 matching lines @@
 
   // Give the visual viewport's scroll layer its initial size.
   GetPage()->GetVisualViewport().MainFrameDidChangeSize();
 
   // Make sure link highlight from previous page is cleared.
   link_highlights_.clear();
   EndActiveFlingAnimation();
 }
 
 void WebViewImpl::ResizeFrameView(WebLocalFrameImpl* webframe) {
-  FrameView* view = webframe->GetFrame()->View();
   if (webframe == MainFrame())
     resize_viewport_anchor_->ResizeFrameView(MainFrameSize());
-  else
-    view->Resize(webframe->GetFrameView()->Size());
 }
 
 void WebViewImpl::ResizeAfterLayout(WebLocalFrameImpl* webframe) {
   LocalFrame* frame = webframe->GetFrame();
   if (!client_ || !client_->CanUpdateLayout() || !frame->IsMainFrame())
     return;
 
   if (should_auto_resize_) {
     WebSize frame_size = frame->View()->FrameRect().Size();
     if (frame_size != size_) {
       size_ = frame_size;
 
       GetPage()->GetVisualViewport().SetSize(size_);
       GetPageScaleConstraintsSet().DidChangeInitialContainingBlockSize(size_);
       frame->View()->SetInitialViewportSize(size_);
 
       client_->DidAutoResize(size_);
       SendResizeEventAndRepaint();
     }
   }
 
   if (GetPageScaleConstraintsSet().ConstraintsDirty())
     RefreshPageScaleFactorAfterLayout();
 
-  UpdateICBAndResizeViewport();
+  ResizeFrameView(webframe);
 }
 
 void WebViewImpl::LayoutUpdated(WebLocalFrameImpl* webframe) {
   LocalFrame* frame = webframe->GetFrame();
-  if (!client_ || !client_->CanUpdateLayout() || !frame->IsMainFrame())
+  if (!client_ || !frame->IsLocalRoot())
     return;
-
-  ResizeAfterLayout(webframe);
-
   // Relayout immediately to avoid violating the rule that needsLayout()
   // isn't set at the end of a layout.
   FrameView* view = frame->View();
   if (view->NeedsLayout())
     view->UpdateLayout();
 
   UpdatePageOverlays();
 
   fullscreen_controller_->DidUpdateLayout();
   client_->DidUpdateLayout();
@@ skipping 466 matching lines @@
   if (focused_frame->LocalFrameRoot() != MainFrameImpl()->GetFrame())
     return nullptr;
   return focused_frame;
 }
 
 LocalFrame* WebViewImpl::FocusedLocalFrameAvailableForIme() const {
   return ime_accept_events_ ? FocusedLocalFrameInWidget() : nullptr;
 }
 
 }  // namespace blink