Replace overdraw_bottom_height with top_controls_layout_height.

content/browser/devtools/renderer_overrides_handler.cc

 // Copyright (c) 2013 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 "content/browser/devtools/renderer_overrides_handler.h"
 
 #include <map>
 #include <string>
 
 #include "base/barrier_closure.h"
@@ skipping 213 matching lines @@
   if (!host_ || !host_->GetView())
     return;
 
   last_frame_time_ = base::TimeTicks::Now();
 
   RenderWidgetHostViewBase* view = static_cast<RenderWidgetHostViewBase*>(
       host_->GetView());
   // TODO(vkuzkokov): do not use previous frame metadata.
   cc::CompositorFrameMetadata& metadata = last_compositor_frame_metadata_;
 
-  float page_scale = metadata.page_scale_factor;
   gfx::SizeF viewport_size_dip = gfx::ScaleSize(
-      metadata.scrollable_viewport_size, page_scale);
-
-  float total_bar_height_dip = metadata.location_bar_content_translation.y() +
-                                   metadata.overdraw_bottom_height;
-  gfx::SizeF screen_size_dip(viewport_size_dip.width(),
-                             viewport_size_dip.height() + total_bar_height_dip);
+      metadata.scrollable_viewport_size, metadata.page_scale_factor);
+  gfx::SizeF screen_size_dip = gfx::ScaleSize(view->GetPhysicalBackingSize(),
+                                              1 / metadata.device_scale_factor);
 
   std::string format;
   int quality = kDefaultScreenshotQuality;
   double scale = 1;
   double max_width = -1;
   double max_height = -1;
   base::DictionaryValue* params = screencast_command_->params();
   if (params) {
     params->GetString(devtools::Page::startScreencast::kParamFormat,
                       &format);
@@ skipping 362 matching lines @@
       &base_64_data);
 
   base::DictionaryValue* response = new base::DictionaryValue();
   response->SetString(devtools::Page::screencastFrame::kParamData,
                       base_64_data);
 
   // Consider metadata empty in case it has no device scale factor.
   if (metadata.device_scale_factor != 0) {
     base::DictionaryValue* response_metadata = new base::DictionaryValue();
 
+    RenderWidgetHostViewBase* view = static_cast<RenderWidgetHostViewBase*>(
+        host_->GetView());

[piman, 2014/08/19 23:58:45]

nit: is the cast safe in tests? (sorry, I'm not familiar with this part of the
code, you may want a reviewer that's familiar with devtools).

[aelias_OOO_until_Jul13, 2014/08/20 03:09:46]

There are similar casts elsewhere in this file.  dgozman@ is a devtools person
and took an initial look earlier in this thread.  dgozman, everything else here
look OK?

[dgozman, 2014/08/20 04:47:01]

We don't use mock views in tests for this functionality. Everything else is
looking good.

+    if (!view)
+      return;
+
+    gfx::SizeF viewport_size_dip = gfx::ScaleSize(
+        metadata.scrollable_viewport_size, metadata.page_scale_factor);
+    gfx::SizeF screen_size_dip = gfx::ScaleSize(
+        view->GetPhysicalBackingSize(), 1 / metadata.device_scale_factor);
+
     response_metadata->SetDouble(
         devtools::Page::ScreencastFrameMetadata::kParamDeviceScaleFactor,
         metadata.device_scale_factor);
     response_metadata->SetDouble(
         devtools::Page::ScreencastFrameMetadata::kParamPageScaleFactor,
         metadata.page_scale_factor);
     response_metadata->SetDouble(
         devtools::Page::ScreencastFrameMetadata::kParamPageScaleFactorMin,
         metadata.min_page_scale_factor);
     response_metadata->SetDouble(
         devtools::Page::ScreencastFrameMetadata::kParamPageScaleFactorMax,
         metadata.max_page_scale_factor);
     response_metadata->SetDouble(
         devtools::Page::ScreencastFrameMetadata::kParamOffsetTop,
         metadata.location_bar_content_translation.y());
     response_metadata->SetDouble(
         devtools::Page::ScreencastFrameMetadata::kParamOffsetBottom,
-        metadata.overdraw_bottom_height);
+        screen_size_dip.height() -
+            metadata.location_bar_content_translation.y() -
+            viewport_size_dip.height());
 
     base::DictionaryValue* viewport = new base::DictionaryValue();
     viewport->SetDouble(devtools::DOM::Rect::kParamX,
                         metadata.root_scroll_offset.x());
     viewport->SetDouble(devtools::DOM::Rect::kParamY,
                         metadata.root_scroll_offset.y());
     viewport->SetDouble(devtools::DOM::Rect::kParamWidth,
                         metadata.scrollable_viewport_size.width());
     viewport->SetDouble(devtools::DOM::Rect::kParamHeight,
                         metadata.scrollable_viewport_size.height());
     response_metadata->Set(
         devtools::Page::ScreencastFrameMetadata::kParamViewport, viewport);
 
-    gfx::SizeF viewport_size_dip = gfx::ScaleSize(
-        metadata.scrollable_viewport_size, metadata.page_scale_factor);
     response_metadata->SetDouble(
         devtools::Page::ScreencastFrameMetadata::kParamDeviceWidth,
-        viewport_size_dip.width());
+        screen_size_dip.width());
     response_metadata->SetDouble(
         devtools::Page::ScreencastFrameMetadata::kParamDeviceHeight,
-        viewport_size_dip.height() +
-            metadata.location_bar_content_translation.y() +
-            metadata.overdraw_bottom_height);
+        screen_size_dip.height());
     response_metadata->SetDouble(
         devtools::Page::ScreencastFrameMetadata::kParamScrollOffsetX,
         metadata.root_scroll_offset.x());
     response_metadata->SetDouble(
         devtools::Page::ScreencastFrameMetadata::kParamScrollOffsetY,
         metadata.root_scroll_offset.y());
 
     response->Set(devtools::Page::screencastFrame::kParamMetadata,
                   response_metadata);
   }
@@ skipping 570 matching lines @@
     return command->InternalErrorResponse("Could not connect to view");
 
   if (event->type == WebInputEvent::MouseWheel)
     host_->ForwardWheelEvent(wheel_event);
   else
     host_->ForwardMouseEvent(mouse_event);
   return command->SuccessResponse(NULL);
 }
 
 }  // namespace content