Handle resize corner layout entirely in the platform BrowserWindow*/BrowserView* code...

chrome/browser/renderer_host/render_widget_host.cc

 // Copyright (c) 2010 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/renderer_host/render_widget_host.h"
 
 #include "app/keyboard_codes.h"
 #include "base/auto_reset.h"
 #include "base/command_line.h"
 #include "base/message_loop.h"
@@ skipping 237 matching lines @@
       Source<RenderWidgetHost>(this),
       Details<bool>(&is_visible));
 }
 
 void RenderWidgetHost::WasResized() {
   if (resize_ack_pending_ || !process_->HasConnection() || !view_ ||
       !renderer_initialized_) {
     return;
   }
 
-  gfx::Rect view_bounds = view_->GetViewBounds();
-  gfx::Size new_size(view_bounds.width(), view_bounds.height());
+  gfx::Size new_size = view_->GetViewBounds().size();
+  gfx::Rect reserved_rect = view_->reserved_contents_rect();
 
   // Avoid asking the RenderWidget to resize to its current size, since it
-  // won't send us a PaintRect message in that case.
-  if (new_size == current_size_)
+  // won't send us a PaintRect message in that case, unless reserved area is
+  // changed, but even in this case PaintRect message won't be sent.
+  if (new_size == current_size_ && reserved_rect == current_reserved_rect_)
     return;
 
-  if (in_flight_size_ != gfx::Size() && new_size == in_flight_size_)
+  if (in_flight_size_ != gfx::Size() && new_size == in_flight_size_ &&
+      in_flight_reserved_rect_ == reserved_rect) {
     return;
+  }
 
-  // We don't expect to receive an ACK when the requested size is empty.
-  if (!new_size.IsEmpty())
-    resize_ack_pending_ = true;
+  // We don't expect to receive an ACK when the requested size is empty or
+  // only reserved area is changed.
+  resize_ack_pending_ = !new_size.IsEmpty() && new_size != current_size_;
 
-  if (!Send(new ViewMsg_Resize(routing_id_, new_size,
-                               GetRootWindowResizerRect())))
+  if (!Send(new ViewMsg_Resize(routing_id_, new_size, reserved_rect))) {
     resize_ack_pending_ = false;
-  else
-    in_flight_size_ = new_size;
+  } else {
+    if (resize_ack_pending_) {
+      in_flight_size_ = new_size;
+      in_flight_reserved_rect_ = reserved_rect;
+    } else {
+      // Message was sent successfully, but we do not expect to receive an ACK,
+      // so update current values right away.
+      current_size_ = new_size;
+      current_reserved_rect_ = reserved_rect;
+    }
+  }
 }
 
 void RenderWidgetHost::GotFocus() {
   Focus();
 }
 
 void RenderWidgetHost::Focus() {
   Send(new ViewMsg_SetFocus(routing_id_, true));
 }
 
@@ skipping 322 matching lines @@
 
   // Must reset these to ensure that keyboard events work with a new renderer.
   key_queue_.clear();
   suppress_next_char_events_ = false;
 
   // Reset some fields in preparation for recovering from a crash.
   resize_ack_pending_ = false;
   repaint_ack_pending_ = false;
 
   in_flight_size_.SetSize(0, 0);
+  in_flight_reserved_rect_.SetRect(0, 0, 0, 0);
   current_size_.SetSize(0, 0);
+  current_reserved_rect_.SetRect(0, 0, 0, 0);
   is_hidden_ = false;
 
   if (view_) {
     view_->RenderViewGone();
     view_ = NULL;  // The View should be deleted by RenderViewGone.
   }
 
   BackingStoreManager::RemoveBackingStore(this);
 }
 
@@ skipping 37 matching lines @@
 
 void RenderWidgetHost::ImeConfirmComposition() {
   Send(new ViewMsg_ImeConfirmComposition(routing_id()));
 }
 
 void RenderWidgetHost::ImeCancelComposition() {
   Send(new ViewMsg_ImeSetComposition(routing_id(), string16(),
             std::vector<WebKit::WebCompositionUnderline>(), 0, 0));
 }
 
-gfx::Rect RenderWidgetHost::GetRootWindowResizerRect() const {
-  return gfx::Rect();
-}
-
 void RenderWidgetHost::SetActive(bool active) {
   Send(new ViewMsg_SetActive(routing_id(), active));
 }
 
 void RenderWidgetHost::Destroy() {
   NotificationService::current()->Notify(
       NotificationType::RENDER_WIDGET_HOST_DESTROYED,
       Source<RenderWidgetHost>(this),
       NotificationService::NoDetails());
 
@@ skipping 66 matching lines @@
 
 void RenderWidgetHost::OnMsgUpdateRect(
     const ViewHostMsg_UpdateRect_Params& params) {
   TimeTicks paint_start = TimeTicks::Now();
 
   if (paint_observer_.get())
     paint_observer_->RenderWidgetHostWillPaint(this);
 
   // Update our knowledge of the RenderWidget's size.
   current_size_ = params.view_size;
+  current_reserved_rect_ = params.resizer_rect;
 
   bool is_resize_ack =
       ViewHostMsg_UpdateRect_Flags::is_resize_ack(params.flags);
 
   // resize_ack_pending_ needs to be cleared before we call DidPaintRect, since
   // that will end up reaching GetBackingStore.
   if (is_resize_ack) {
     DCHECK(resize_ack_pending_);
     resize_ack_pending_ = false;
     in_flight_size_.SetSize(0, 0);
+    in_flight_reserved_rect_.SetRect(0, 0, 0, 0);
   }
 
   bool is_repaint_ack =
       ViewHostMsg_UpdateRect_Flags::is_repaint_ack(params.flags);
   if (is_repaint_ack) {
     repaint_ack_pending_ = false;
     TimeDelta delta = TimeTicks::Now() - repaint_start_time_;
     UMA_HISTOGRAM_TIMES("MPArch.RWH_RepaintDelta", delta);
   }
 
@@ skipping 53 matching lines @@
                                    params.copy_rects);
       view_being_painted_ = false;
     }
   }
 
   if (paint_observer_.get())
     paint_observer_->RenderWidgetHostDidPaint(this);
 
   // If we got a resize ack, then perhaps we have another resize to send?
   if (is_resize_ack && view_) {
-    gfx::Rect view_bounds = view_->GetViewBounds();
-    if (current_size_.width() != view_bounds.width() ||
-        current_size_.height() != view_bounds.height()) {
-      WasResized();
-    }
+    // WasResized checks the current size and sends the resize update only
+    // when something was actually changed.
+    WasResized();
   }
 
   if (painting_observer_)
     painting_observer_->WidgetDidUpdateBackingStore(this);
 
   // Log the time delta for processing a paint message.
   TimeDelta delta = TimeTicks::Now() - paint_start;
   UMA_HISTOGRAM_TIMES("MPArch.RWH_OnMsgUpdateRect", delta);
 }
 
@@ skipping 293 matching lines @@
     // of this key event.
     if (!processed && !is_hidden_ && !front_item.skip_in_browser) {
       UnhandledKeyboardEvent(front_item);
 
       // WARNING: This RenderWidgetHost can be deallocated at this point
       // (i.e.  in the case of Ctrl+W, where the call to
       // UnhandledKeyboardEvent destroys this RenderWidgetHost).
     }
   }
 }