cros: Instant extended support for immersive fullscreen

chrome/browser/ui/views/frame/contents_container.cc

 // Copyright 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.
 
 #include "chrome/browser/ui/views/frame/contents_container.h"
 
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/notification_types.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/web_contents.h"
@@ skipping 66 matching lines @@
 };
 
 }  // namespace
 
 ContentsContainer::ContentsContainer(views::WebView* active)
     : active_(active),
       overlay_(NULL),
       overlay_web_contents_(NULL),
       draw_drop_shadow_(false),
       active_top_margin_(0),
+      overlay_top_margin_(0),
       overlay_height_(100),
       overlay_height_units_(INSTANT_SIZE_PERCENT) {
   AddChildView(active_);
 }
 
 ContentsContainer::~ContentsContainer() {
 }
 
 void ContentsContainer::MakeOverlayContentsActiveContents() {
   DCHECK(overlay_);
@@ skipping 114 matching lines @@
     RemoveChildView(shadow_view_.get());
     removed_shadow = true;
   }
   RemoveChildView(overlay_);
   AddChildView(overlay_);
   if (removed_shadow)  // Add back shadow view if it was removed.
     AddChildView(shadow_view_.get());
   Layout();
 }
 
-void ContentsContainer::SetActiveTopMargin(int margin) {
+bool ContentsContainer::SetActiveTopMargin(int margin) {
   if (active_top_margin_ == margin)
-    return;
+    return false;
 
   active_top_margin_ = margin;
   // Make sure we layout next time around. We need this in case our bounds
   // haven't changed.
   InvalidateLayout();
+  return true;
+}
+
+bool ContentsContainer::SetOverlayTopMargin(int margin) {
+  if (overlay_top_margin_ == margin)
+    return false;
+  overlay_top_margin_ = margin;
+  // Make sure we layout next time around. We need this in case our bounds
+  // haven't changed.
+  InvalidateLayout();
+  return true;
 }
 
 gfx::Rect ContentsContainer::GetOverlayBounds() const {
   gfx::Point screen_loc;
   ConvertPointToScreen(this, &screen_loc);
   return gfx::Rect(screen_loc, size());
 }
 
 bool ContentsContainer::WillOverlayBeFullHeight(
     int overlay_height,
     InstantSizeUnits overlay_height_units) const {
   int height_in_pixels = OverlayHeightInPixels(height(), overlay_height,
                                                overlay_height_units);
   return height_in_pixels == height();
 }
 
 bool ContentsContainer::IsOverlayFullHeight() const {
   return overlay_ && overlay_height_ == 100 &&
       overlay_height_units_ == INSTANT_SIZE_PERCENT;
 }
 
 void ContentsContainer::Layout() {
   int content_y = active_top_margin_;
   int content_height = std::max(0, height() - content_y);
 
   active_->SetBounds(0, content_y, width(), content_height);
 
   if (overlay_) {
-    overlay_->SetBounds(0, 0, width(),
-                        OverlayHeightInPixels(height(), overlay_height_,
-                                              overlay_height_units_));
+    int target_overlay_height =
+        OverlayHeightInPixels(height(), overlay_height_, overlay_height_units_);
+    // Ensure the overlay doesn't extend outside this container view.
+    int overlay_height =
+        std::min(height() - overlay_top_margin_, target_overlay_height);
+    overlay_->SetBounds(0, overlay_top_margin_,
+                        width(), std::max(0, overlay_height));
     if (draw_drop_shadow_) {
 #if !defined(OS_WIN)
       DCHECK(shadow_view_.get() && shadow_view_->parent());
-      shadow_view_->SetBounds(0, overlay_->bounds().height(), width(),
+      shadow_view_->SetBounds(0, overlay_->bounds().bottom(), width(),
                               shadow_view_->GetPreferredSize().height());
 #endif  // !defined(OS_WIN)
     }
   }
 
   // Need to invoke views::View in case any views whose bounds didn't change
   // still need a layout.
   views::View::Layout();
 }
 
 std::string ContentsContainer::GetClassName() const {
   return kViewClassName;
 }
 
 void ContentsContainer::Observe(int type,
                                 const content::NotificationSource& source,
                                 const content::NotificationDetails& details) {
   DCHECK_EQ(content::NOTIFICATION_RENDER_WIDGET_HOST_DID_UPDATE_BACKING_STORE,
             type);
   // Remove shadow view if it's not needed.
   if (overlay_ && !draw_drop_shadow_) {
     DCHECK(overlay_web_contents_);
     DCHECK_EQ(overlay_web_contents_->GetRenderViewHost(),
               (content::Source<content::RenderWidgetHost>(source)).ptr());
     shadow_view_.reset();
   }
 }