Refactor WebView resize and update-after-layout methods

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 1786 matching lines @@
 
 WebSize WebViewImpl::Size() {
   return size_;
 }
 
 void WebViewImpl::ResizeVisualViewport(const WebSize& new_size) {
   GetPage()->GetVisualViewport().SetSize(new_size);
   GetPage()->GetVisualViewport().ClampToBoundaries();
 }
 
-void WebViewImpl::PerformResize() {
+void WebViewImpl::UpdateICBAndResizeViewport() {
   // We'll keep the initial containing block size from changing when the top
   // controls hide so that the ICB will always be the same size as the
   // viewport with the browser controls shown.
   IntSize icb_size = size_;
   if (RuntimeEnabledFeatures::inertTopControlsEnabled() &&
       GetBrowserControls().PermittedState() == kWebBrowserControlsBoth &&
       !GetBrowserControls().ShrinkViewport())
     icb_size.Expand(0, -GetBrowserControls().Height());
 
   GetPageScaleConstraintsSet().DidChangeInitialContainingBlockSize(icb_size);
 
   UpdatePageDefinedViewportConstraints(
       MainFrameImpl()->GetFrame()->GetDocument()->GetViewportDescription());
   UpdateMainFrameLayoutSize();
 
   GetPage()->GetVisualViewport().SetSize(size_);
 
   if (MainFrameImpl()->GetFrameView()) {
     MainFrameImpl()->GetFrameView()->SetInitialViewportSize(icb_size);
     if (!MainFrameImpl()->GetFrameView()->NeedsLayout())
-      PostLayoutResize(MainFrameImpl());
+      ResizeFrameView(MainFrameImpl());
   }
 }
 
 void WebViewImpl::UpdateBrowserControlsState(WebBrowserControlsState constraint,
                                              WebBrowserControlsState current,
                                              bool animate) {
   WebBrowserControlsState old_permitted_state =
       GetBrowserControls().PermittedState();
 
   GetBrowserControls().UpdateConstraintsAndState(constraint, current, animate);
 
   // If the controls are going from a locked hidden to unlocked state, or vice
   // versa, the ICB size needs to change but we can't rely on getting a
   // WebViewImpl::resize since the top controls shown state may not have
   // changed.
   if ((old_permitted_state == kWebBrowserControlsHidden &&
        constraint == kWebBrowserControlsBoth) ||
       (old_permitted_state == kWebBrowserControlsBoth &&
        constraint == kWebBrowserControlsHidden)) {
-    PerformResize();
+    UpdateICBAndResizeViewport();
   }
 
   if (layer_tree_view_)
     layer_tree_view_->UpdateBrowserControlsState(constraint, current, animate);
 }
 
 void WebViewImpl::DidUpdateBrowserControls() {
   if (layer_tree_view_) {
     layer_tree_view_->SetBrowserControlsShownRatio(
         GetBrowserControls().ShownRatio());
@@ skipping 35 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());
-    PerformResize();
+    UpdateICBAndResizeViewport();
   }
 
   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 1735 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::PostLayoutResize(WebLocalFrameImpl* webframe) {
+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::LayoutUpdated(WebLocalFrameImpl* webframe) {
+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();
 
-  FrameView* view = webframe->GetFrame()->View();
+  UpdateICBAndResizeViewport();
+}
 
-  PostLayoutResize(webframe);
+void WebViewImpl::LayoutUpdated(WebLocalFrameImpl* webframe) {
+  LocalFrame* frame = webframe->GetFrame();
+  if (!client_ || !client_->CanUpdateLayout() || !frame->IsMainFrame())
+    return;
+
+  ResizeAfterLayout(webframe);
 
   // Relayout immediately to avoid violating the rule that needsLayout()
   // isn't set at the end of a layout.
+  FrameView* view = webframe->GetFrame()->View();

[skobes, 2017/04/28 20:52:13]

nit: this could just be frame->View()

[szager1, 2017/04/29 09:11:00]

Done.

   if (view->NeedsLayout())
     view->UpdateLayout();
 
   UpdatePageOverlays();
 
   fullscreen_controller_->DidUpdateLayout();
   client_->DidUpdateLayout();
 }
 
 void WebViewImpl::DidChangeContentsSize() {
@@ skipping 459 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