Fix viewport computation in Mac UC

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 191 matching lines @@
     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.viewport_size,
-                                                page_scale);
+  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);
 
   std::string format;
   int quality = kDefaultScreenshotQuality;
   double scale = 1;
   double max_width = -1;
@@ skipping 377 matching lines @@
     response_metadata->SetDouble(
         devtools::Page::ScreencastFrameMetadata::kParamOffsetBottom,
         metadata.overdraw_bottom_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.viewport_size.width());
+                        metadata.scrollable_viewport_size.width());
     viewport->SetDouble(devtools::DOM::Rect::kParamHeight,
-                        metadata.viewport_size.height());
+                        metadata.scrollable_viewport_size.height());
     response_metadata->Set(
         devtools::Page::ScreencastFrameMetadata::kParamViewport, viewport);
 
-    gfx::SizeF viewport_size_dip = gfx::ScaleSize(metadata.viewport_size,
-                                                  metadata.page_scale_factor);
+    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());
     response_metadata->SetDouble(
         devtools::Page::ScreencastFrameMetadata::kParamDeviceHeight,
         viewport_size_dip.height() +
             metadata.location_bar_content_translation.y() +
             metadata.overdraw_bottom_height);
     response_metadata->SetDouble(
         devtools::Page::ScreencastFrameMetadata::kParamScrollOffsetX,
@@ skipping 371 matching lines @@
       return NULL;
     }
     event.data.pinchUpdate.scale = static_cast<float>(scale);
   }
 
   host->ForwardGestureEvent(event);
   return command->SuccessResponse(NULL);
 }
 
 }  // namespace content