[Mac] Replace SetOverlayView with AllowOtherViews.

content/browser/web_contents/web_contents_view_mac.mm

 // 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.
 
 #import <Carbon/Carbon.h>
 
 #import "content/browser/web_contents/web_contents_view_mac.h"
 
 #include <string>
 
@@ skipping 64 matching lines @@
   WebContentsViewMac* rv = new WebContentsViewMac(web_contents, delegate);
   *render_view_host_delegate_view = rv;
   return rv;
 }
 
 WebContentsViewMac::WebContentsViewMac(WebContentsImpl* web_contents,
                                        WebContentsViewDelegate* delegate)
     : web_contents_(web_contents),
       delegate_(delegate),
       allow_overlapping_views_(false),
-      overlay_view_(NULL),
-      underlay_view_(NULL) {
+      allow_other_views_(false) {
 }
 
 WebContentsViewMac::~WebContentsViewMac() {
   // This handles the case where a renderer close call was deferred
   // while the user was operating a UI control which resulted in a
   // close.  In that case, the Cocoa view outlives the
   // WebContentsViewMac instance due to Cocoa retain count.
   [cocoa_view_ cancelDeferredClose];
   [cocoa_view_ clearWebContentsView];
 }
@@ skipping 174 matching lines @@
   RenderWidgetHostViewMac* view = static_cast<RenderWidgetHostViewMac*>(
       web_contents_->GetRenderWidgetHostView());
   if (view)
     view->SetAllowOverlappingViews(allow_overlapping_views_);
 }
 
 bool WebContentsViewMac::GetAllowOverlappingViews() const {
   return allow_overlapping_views_;
 }
 
-void WebContentsViewMac::SetOverlayView(
-    WebContentsView* overlay, const gfx::Point& offset) {
-  DCHECK(!underlay_view_);
-  if (overlay_view_)
-    RemoveOverlayView();
+void WebContentsViewMac::SetAllowOtherViews(bool allow) {
+  if (allow_other_views_ == allow)
+    return;
 
-  overlay_view_ = static_cast<WebContentsViewMac*>(overlay);
-  DCHECK(!overlay_view_->overlay_view_);
-  overlay_view_->underlay_view_ = this;
-  overlay_view_offset_ = offset;
-  UpdateRenderWidgetHostViewOverlay();
+  allow_other_views_ = allow;
+  RenderWidgetHostViewMac* view = static_cast<RenderWidgetHostViewMac*>(
+      web_contents_->GetRenderWidgetHostView());
+  if (view)
+    view->SetAllowPauseForResizeOrRepaint(!allow_other_views_);
 }
 
-void WebContentsViewMac::RemoveOverlayView() {
-  DCHECK(overlay_view_);
-
-  RenderWidgetHostViewMac* rwhv = static_cast<RenderWidgetHostViewMac*>(
-      web_contents_->GetRenderWidgetHostView());
-  if (rwhv)
-    rwhv->RemoveOverlayView();
-
-  overlay_view_->underlay_view_ = NULL;
-  overlay_view_ = NULL;
-}
-
-void WebContentsViewMac::UpdateRenderWidgetHostViewOverlay() {
-  RenderWidgetHostViewMac* rwhv = static_cast<RenderWidgetHostViewMac*>(
-      web_contents_->GetRenderWidgetHostView());
-  if (!rwhv)
-    return;
-
-  if (overlay_view_) {
-    RenderWidgetHostViewMac* overlay_rwhv =
-        static_cast<RenderWidgetHostViewMac*>(
-            overlay_view_->web_contents_->GetRenderWidgetHostView());
-    if (overlay_rwhv)
-      rwhv->SetOverlayView(overlay_rwhv, overlay_view_offset_);
-  }
-
-  if (underlay_view_) {
-    RenderWidgetHostViewMac* underlay_rwhv =
-        static_cast<RenderWidgetHostViewMac*>(
-            underlay_view_->web_contents_->GetRenderWidgetHostView());
-    if (underlay_rwhv)
-      underlay_rwhv->SetOverlayView(rwhv, underlay_view_->overlay_view_offset_);
-  }
+bool WebContentsViewMac::GetAllowOtherViews() const {
+  return allow_other_views_;
 }
 
 void WebContentsViewMac::CreateView(
     const gfx::Size& initial_size, gfx::NativeView context) {
   WebContentsViewCocoa* view =
       [[WebContentsViewCocoa alloc] initWithWebContentsViewMac:this];
   cocoa_view_.reset(view);
 }
 
 RenderWidgetHostViewBase* WebContentsViewMac::CreateViewForWidget(
@@ skipping 12 matching lines @@
   RenderWidgetHostViewMac* view = new RenderWidgetHostViewMac(
       render_widget_host);
   if (delegate()) {
     base::scoped_nsobject<NSObject<RenderWidgetHostViewMacDelegate> >
         rw_delegate(
             delegate()->CreateRenderWidgetHostViewDelegate(render_widget_host));
 
     view->SetDelegate(rw_delegate.get());
   }
   view->SetAllowOverlappingViews(allow_overlapping_views_);
+  view->SetAllowPauseForResizeOrRepaint(!allow_other_views_);
 
   // Fancy layout comes later; for now just make it our size and resize it
   // with us. In case there are other siblings of the content area, we want
   // to make sure the content area is on the bottom so other things draw over
   // it.
   NSView* view_view = view->GetNativeView();
   [view_view setFrame:[cocoa_view_.get() bounds]];
   [view_view setAutoresizingMask:NSViewWidthSizable | NSViewHeightSizable];
   // Add the new view below all other views; this also keeps it below any
   // overlay view installed.
@@ skipping 21 matching lines @@
 
 
 void WebContentsViewMac::RenderViewCreated(RenderViewHost* host) {
   // We want updates whenever the intrinsic width of the webpage changes.
   // Put the RenderView into that mode. The preferred width is used for example
   // when the "zoom" button in the browser window is clicked.
   host->EnablePreferredSizeMode();
 }
 
 void WebContentsViewMac::RenderViewSwappedIn(RenderViewHost* host) {
-  UpdateRenderWidgetHostViewOverlay();
 }
 
 void WebContentsViewMac::SetOverscrollControllerEnabled(bool enabled) {
 }
 
 bool WebContentsViewMac::IsEventTracking() const {
   return base::MessagePumpMac::IsHandlingSendEvent();
 }
 
 // Arrange to call CloseTab() after we're back to the main event loop.
@@ skipping 217 matching lines @@
 // When the subviews require a layout, their size should be reset to the size
 // of this view. (It is possible for the size to get out of sync as an
 // optimization in preparation for an upcoming WebContentsView resize.
 // http://crbug.com/264207)
 - (void)resizeSubviewsWithOldSize:(NSSize)oldBoundsSize {
   for (NSView* subview in self.subviews)
     [subview setFrame:self.bounds];
 }
 
 @end