Mac: Do layout before adding the WebContents to the view hierarchy when switching tabs

chrome/browser/ui/cocoa/tab_contents/tab_contents_controller.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CHROME_BROWSER_UI_COCOA_TAB_CONTENTS_TAB_CONTENTS_CONTROLLER_H_
 #define CHROME_BROWSER_UI_COCOA_TAB_CONTENTS_TAB_CONTENTS_CONTROLLER_H_
 
 #include <Cocoa/Cocoa.h>
 
 #include <memory>
 
 class FullscreenObserver;
 
 namespace content {
 class WebContents;
 }
 
 // A class that controls the WebContents view. It internally creates a container
 // view (the NSView accessed by calling |-view|) which manages the layout and
 // display of the WebContents view.
 //
 // Client code that inserts [controller view] into the view hierarchy needs to
-// beforehand call the |-ensureContentsSizeDoesNotChange| method. This will
-// avoid multiple resize messages being sent to the renderer and triggering
-// redundant and costly layouts. After the view has been inserted, client code
-// calls |-ensureContentsVisible| to display the WebContents view.
+// call -ensureContentsVisibleInSuperview:(NSView*)superview to match the
+// container to the [superview bounds] and avoid multiple resize messages being
+// sent to the renderer, which triggers redundant and costly layouts.
 //
 // AutoEmbedFullscreen mode: When enabled, TabContentsController will observe
 // for WebContents fullscreen changes and automatically swap the normal
 // WebContents view with the fullscreen view (if different). In addition, if a
 // WebContents is being screen-captured, the view will be centered within the
 // container view, sized to the aspect ratio of the capture video resolution,
 // and scaling will be avoided whenever possible.
 @interface TabContentsController : NSViewController {
  @private
    content::WebContents* contents_;  // weak
@@ skipping 13 matching lines @@
 // This flag is set to true when we don't want the fullscreen widget to
 // resize. This is done so that we can avoid resizing the fullscreen widget
 // to intermediate sizes during the fullscreen transition.
 // As a result, we would prevent janky movements during the transition and
 // Pepper Fullscreen from blowing up.
 @property(assign, nonatomic) BOOL blockFullscreenResize;
 
 // Create the contents of a tab represented by |contents|.
 - (id)initWithContents:(content::WebContents*)contents isPopup:(BOOL)popup;
 
-// Call when the container view owned by TabContentsController is about to be
-// resized and inserted into the view hierarchy, so as to not trigger
-// unnecessary content re-layout.
-- (void)ensureContentsSizeDoesNotChange;
-
-// Call after the container view is inserted into the view hierarchy and
-// properly sized. Then, this method will select either the WebContents view or
-// the fullscreen view and swap it into the view hierarchy for display.
-- (void)ensureContentsVisible;
+// Call to insert the container view into the view hierarchy, sizing it to match
+// |superview|. Then, this method will select either the WebContents view or
+// the fullscreen view and swap it into the container for display.
+- (void)ensureContentsVisibleInSuperview:(NSView*)superview;
 
 // Called after we enter fullscreen to ensure that the fullscreen widget will
 // have the right frame.
 - (void)updateFullscreenWidgetFrame;
 
 // Call to change the underlying web contents object. View is not changed,
 // call |-ensureContentsVisible| to display the |newContents|'s render widget
 // host view.
 - (void)changeWebContents:(content::WebContents*)newContents;
 
@@ skipping 11 matching lines @@
 // an entirely new tab contents object.
 - (void)tabDidChange:(content::WebContents*)updatedContents;
 
 // Called to switch the container's subview to the WebContents-owned fullscreen
 // widget or back to WebContentsView's widget.
 - (void)toggleFullscreenWidget:(BOOL)enterFullscreen;
 
 @end
 
 #endif  // CHROME_BROWSER_UI_COCOA_TAB_CONTENTS_TAB_CONTENTS_CONTROLLER_H_