Replace overdraw_bottom_height with top_controls_layout_height.

content/renderer/render_widget.cc

Index: content/renderer/render_widget.cc
diff --git a/content/renderer/render_widget.cc b/content/renderer/render_widget.cc
index ef30ede736cadf20c4d54550b351d73f85c0aa7d..e27a3d454cc67e4affaee483e8822e396dfe9a01 100644
--- a/content/renderer/render_widget.cc
+++ b/content/renderer/render_widget.cc
@@ -196,7 +196,7 @@ class RenderWidget::ScreenMetricsEmulator {
 
  private:
   void Reapply();
-  void Apply(float overdraw_bottom_height,
+  void Apply(float top_controls_layout_height,
              gfx::Rect resizer_rect,
              bool is_fullscreen);
 
@@ -233,7 +233,7 @@ RenderWidget::ScreenMetricsEmulator::ScreenMetricsEmulator(
   original_screen_info_ = widget_->screen_info_;
   original_view_screen_rect_ = widget_->view_screen_rect_;
   original_window_screen_rect_ = widget_->window_screen_rect_;
-  Apply(widget_->overdraw_bottom_height_, widget_->resizer_rect_,
+  Apply(widget_->top_controls_layout_height_, widget_->resizer_rect_,
       widget_->is_fullscreen_);
 }
 
@@ -244,9 +244,13 @@ RenderWidget::ScreenMetricsEmulator::~ScreenMetricsEmulator() {
   widget_->SetScreenMetricsEmulationParameters(0.f, gfx::Point(), 1.f);
   widget_->view_screen_rect_ = original_view_screen_rect_;
   widget_->window_screen_rect_ = original_window_screen_rect_;
-  widget_->Resize(original_size_, original_physical_backing_size_,
-      widget_->overdraw_bottom_height_, original_visible_viewport_size_,
-      widget_->resizer_rect_, widget_->is_fullscreen_, NO_RESIZE_ACK);
+  widget_->Resize(original_size_,
+                  original_physical_backing_size_,
+                  widget_->top_controls_layout_height_,
+                  original_visible_viewport_size_,
+                  widget_->resizer_rect_,
+                  widget_->is_fullscreen_,
+                  NO_RESIZE_ACK);
 }
 
 void RenderWidget::ScreenMetricsEmulator::ChangeEmulationParams(
@@ -256,12 +260,12 @@ void RenderWidget::ScreenMetricsEmulator::ChangeEmulationParams(
 }
 
 void RenderWidget::ScreenMetricsEmulator::Reapply() {
-  Apply(widget_->overdraw_bottom_height_, widget_->resizer_rect_,
+  Apply(widget_->top_controls_layout_height_, widget_->resizer_rect_,
       widget_->is_fullscreen_);
 }
 
 void RenderWidget::ScreenMetricsEmulator::Apply(
-    float overdraw_bottom_height,
+    float top_controls_layout_height,
     gfx::Rect resizer_rect,
     bool is_fullscreen) {
   applied_widget_rect_.set_size(gfx::Size(params_.viewSize));
@@ -320,7 +324,7 @@ void RenderWidget::ScreenMetricsEmulator::Apply(
   gfx::Size physical_backing_size = gfx::ToCeiledSize(gfx::ScaleSize(
       original_size_, original_screen_info_.deviceScaleFactor));
   widget_->Resize(applied_widget_rect_.size(), physical_backing_size,
-      overdraw_bottom_height, applied_widget_rect_.size(), resizer_rect,
+      top_controls_layout_height, applied_widget_rect_.size(), resizer_rect,
       is_fullscreen, NO_RESIZE_ACK);
 }
 
@@ -332,7 +336,7 @@ void RenderWidget::ScreenMetricsEmulator::OnResizeMessage(
   original_physical_backing_size_ = params.physical_backing_size;
   original_screen_info_ = params.screen_info;
   original_visible_viewport_size_ = params.visible_viewport_size;
-  Apply(params.overdraw_bottom_height, params.resizer_rect,
+  Apply(params.top_controls_layout_height, params.resizer_rect,
       params.is_fullscreen);
 
   if (need_ack) {
@@ -379,7 +383,7 @@ RenderWidget::RenderWidget(blink::WebPopupType popup_type,
       webwidget_(NULL),
       opener_id_(MSG_ROUTING_NONE),
       init_complete_(false),
-      overdraw_bottom_height_(0.f),
+      top_controls_layout_height_(0.f),
       next_paint_flags_(0),
       auto_resize_mode_(false),
       need_update_rect_for_auto_resize_(false),
@@ -642,7 +646,7 @@ bool RenderWidget::Send(IPC::Message* message) {
 
 void RenderWidget::Resize(const gfx::Size& new_size,
                           const gfx::Size& physical_backing_size,
-                          float overdraw_bottom_height,
+                          float top_controls_layout_height,
                           const gfx::Size& visible_viewport_size,
                           const gfx::Rect& resizer_rect,
                           bool is_fullscreen,
@@ -660,11 +664,11 @@ void RenderWidget::Resize(const gfx::Size& new_size,
 
   if (compositor_) {
     compositor_->setViewportSize(new_size, physical_backing_size);
-    compositor_->SetOverdrawBottomHeight(overdraw_bottom_height);
+    compositor_->SetTopControlsLayoutHeight(top_controls_layout_height);
   }
 
   physical_backing_size_ = physical_backing_size;
-  overdraw_bottom_height_ = overdraw_bottom_height;
+  top_controls_layout_height_ = top_controls_layout_height;
   visible_viewport_size_ = visible_viewport_size;
   resizer_rect_ = resizer_rect;
 
@@ -708,8 +712,13 @@ void RenderWidget::Resize(const gfx::Size& new_size,
 }
 
 void RenderWidget::ResizeSynchronously(const gfx::Rect& new_position) {
-  Resize(new_position.size(), new_position.size(), overdraw_bottom_height_,
-         visible_viewport_size_, gfx::Rect(), is_fullscreen_, NO_RESIZE_ACK);
+  Resize(new_position.size(),
+         new_position.size(),
+         top_controls_layout_height_,
+         visible_viewport_size_,
+         gfx::Rect(),
+         is_fullscreen_,
+         NO_RESIZE_ACK);
   view_screen_rect_ = new_position;
   window_screen_rect_ = new_position;
   if (!did_show_)
@@ -762,8 +771,9 @@ void RenderWidget::OnResize(const ViewMsg_Resize_Params& params) {
   screen_info_ = params.screen_info;
   SetDeviceScaleFactor(screen_info_.deviceScaleFactor);
   Resize(params.new_size, params.physical_backing_size,
-         params.overdraw_bottom_height, params.visible_viewport_size,
-         params.resizer_rect, params.is_fullscreen, SEND_RESIZE_ACK);
+         params.top_controls_layout_height,
+         params.visible_viewport_size, params.resizer_rect,
+         params.is_fullscreen, SEND_RESIZE_ACK);
 
   if (orientation_changed)
     OnOrientationChange();