Adds scroll position/scale emulation to DevTools.

content/browser/devtools/protocol/emulation_handler.cc

 // Copyright 2015 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/protocol/emulation_handler.h"
 
 #include <utility>
 
 #include "base/strings/string_number_conversions.h"
 #include "build/build_config.h"
@@ skipping 128 matching lines @@
     double device_scale_factor,
     bool mobile,
     bool fit_window,
     const double* optional_scale,
     const double* optional_offset_x,
     const double* optional_offset_y,
     const int* screen_width,
     const int* screen_height,
     const int* position_x,
     const int* position_y,
-    const std::unique_ptr<base::DictionaryValue>& screen_orientation) {
+    const std::unique_ptr<base::DictionaryValue>& screen_orientation,
+    const int* scroll_position_x,
+    const int* scroll_position_y,
+    const int* visual_viewport_width,
+    const int* visual_viewport_height,
+    const double* visual_viewport_position_x,
+    const double* visual_viewport_position_y,
+    const double* visual_viewport_scale,
+    const bool* resize_window) {
   const static int max_size = 10000000;
   const static double max_scale = 10;
   const static int max_orientation_angle = 360;
 
   if (!host_)
     return Response::InternalError("Could not connect to view");
 
   if (screen_width && screen_height &&
       (*screen_width < 0 || *screen_height < 0 ||
            *screen_width > max_size || *screen_height > max_size)) {
@@ skipping 40 matching lines @@
       return Response::InvalidParams(
           "Screen orientation angle must be a number");
     }
     if (orientationAngle < 0 || orientationAngle >= max_orientation_angle) {
       return Response::InvalidParams(
           "Screen orientation angle must be non-negative, less than " +
           base::IntToString(max_orientation_angle));
     }
   }
 
+  if ((scroll_position_x &&
+       (*scroll_position_x < 0 || *scroll_position_x > max_size)) ||
+      (scroll_position_y &&
+       (*scroll_position_y < 0 || *scroll_position_y > max_size))) {
+    return Response::InvalidParams(
+        "Scroll position coordinates must be non-negative, not greater than" +

[Sami, 2016/06/23 17:34:03]

nit: missing space at the end.

[Eric Seckler, 2016/06/27 17:32:58]

Done, also below.

+        base::IntToString(max_size));
+  }
+
+  if ((visual_viewport_width &&
+       (*visual_viewport_width < 0 || *visual_viewport_width > max_size)) ||
+      (visual_viewport_height &&
+       (*visual_viewport_height < 0 || *visual_viewport_height > max_size))) {
+    return Response::InvalidParams(
+        "Visible_width and visible_height values must be positive, not greater "
+        "than " +
+        base::IntToString(max_size));
+  }
+
+  if ((visual_viewport_position_x &&
+       (*visual_viewport_position_x < 0 ||
+        *visual_viewport_position_x > max_size)) ||
+      (visual_viewport_position_y &&
+       (*visual_viewport_position_y < 0 ||
+        *visual_viewport_position_y > max_size))) {
+    return Response::InvalidParams(
+        "Visual viewport position coordinates must be non-negative, not "
+        "greater than" +
+        base::IntToString(max_size));
+  }
+
+  if (visual_viewport_scale &&
+      (*visual_viewport_scale <= 0 || *visual_viewport_scale > max_scale)) {
+    return Response::InvalidParams(
+        "Scale must be positive and not greater than " +
+        base::DoubleToString(max_scale));
+  }
+
   blink::WebDeviceEmulationParams params;
   params.screenPosition = mobile ? blink::WebDeviceEmulationParams::Mobile :
       blink::WebDeviceEmulationParams::Desktop;
   if (screen_width && screen_height)
     params.screenSize = blink::WebSize(*screen_width, *screen_height);
   if (position_x && position_y)
     params.viewPosition = blink::WebPoint(*position_x, *position_y);
   params.deviceScaleFactor = device_scale_factor;
   params.viewSize = blink::WebSize(width, height);
   params.fitToView = fit_window;
   params.scale = optional_scale ? *optional_scale : 1;
   params.offset = blink::WebFloatPoint(
       optional_offset_x ? *optional_offset_x : 0.f,
       optional_offset_y ? *optional_offset_y : 0.f);
   params.screenOrientationType = orientationType;
   params.screenOrientationAngle = orientationAngle;
+  params.scrollPosition =
+      blink::WebPoint(scroll_position_x ? *scroll_position_x : -1,
+                      scroll_position_y ? *scroll_position_y : -1);
+  params.visualViewportSize =
+      blink::WebSize(visual_viewport_width ? *visual_viewport_width : 0,
+                     visual_viewport_height ? *visual_viewport_height : 0);
+  params.visualViewportPosition = blink::WebFloatPoint(
+      visual_viewport_position_x ? *visual_viewport_position_x : -1,
+      visual_viewport_position_y ? *visual_viewport_position_y : -1);
+  params.visualViewportScale =
+      visual_viewport_scale ? *visual_viewport_scale : 0;
+  params.resizeWindow = resize_window ? *resize_window : false;
 
   if (device_emulation_enabled_ && params == device_emulation_params_)
     return Response::OK();
 
   device_emulation_enabled_ = true;
   device_emulation_params_ = params;
   UpdateDeviceEmulationState();
   return Response::OK();
 }
 
@@ skipping 23 matching lines @@
   widget_host->SetTouchEventEmulationEnabled(enabled, config_type);
   if (GetWebContents())
     GetWebContents()->SetForceDisableOverscrollContent(enabled);
 }
 
 void EmulationHandler::UpdateDeviceEmulationState() {
   RenderWidgetHostImpl* widget_host =
       host_ ? host_->GetRenderWidgetHost() : nullptr;
   if (!widget_host)
     return;
+
+  // TODO(eseckler) handle |resize_window|
+
   if (device_emulation_enabled_) {
     widget_host->Send(new ViewMsg_EnableDeviceEmulation(
         widget_host->GetRoutingID(), device_emulation_params_));
   } else {
     widget_host->Send(new ViewMsg_DisableDeviceEmulation(
         widget_host->GetRoutingID()));
   }
 }
 
 }  // namespace emulation
 }  // namespace devtools
 }  // namespace content