[DevTools] Implement screen size and position in Emulation.setDeviceMetricsOverrides.

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 "base/strings/string_number_conversions.h"
 #include "content/browser/frame_host/render_frame_host_impl.h"
 #include "content/browser/geolocation/geolocation_service_context.h"
 #include "content/browser/renderer_host/render_widget_host_impl.h"
@@ skipping 107 matching lines @@
   *result = true;
   if (WebContentsImpl* web_contents = GetWebContents())
     *result &= !web_contents->GetVisibleURL().SchemeIs(kChromeDevToolsScheme);
   if (host_ && host_->GetRenderWidgetHost())
     *result &= !host_->GetRenderWidgetHost()->auto_resize_enabled();
 #endif  // defined(OS_ANDROID)
   return Response::OK();
 }
 
 Response EmulationHandler::SetDeviceMetricsOverride(
     int width, int height, double device_scale_factor, bool mobile,

[nasko, 2015/06/23 10:44:44]

nit: All parameters should be on a new line.

[dgozman, 2015/06/23 12:03:15]

Done.

     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) {
-  return SetDeviceMetricsOverride(width, height, device_scale_factor, mobile,
-      fit_window, optional_scale, optional_offset_x, optional_offset_y);
-}
-
-Response EmulationHandler::SetDeviceMetricsOverride(
-    int width, int height, double device_scale_factor, bool mobile,
-    bool fit_window, const double* optional_scale,
-    const double* optional_offset_x, const double* optional_offset_y) {
   const static int max_size = 10000000;
   const static double max_scale = 10;
 
   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)) {
+    return Response::InvalidParams(
+        "Screen width and height values must be positive, not greater than " +
+        base::IntToString(max_size));
+  }
+
+  if (screen_width && screen_height && position_x && position_y &&
+      (*position_x < 0 || *position_y < 0 ||
+           *position_x > *screen_width || *position_y > *screen_height)) {
+    return Response::InvalidParams("View position should be on the screen");
+  }
+
   if (width < 0 || height < 0 || width > max_size || height > max_size) {
     return Response::InvalidParams(
         "Width and height values must be positive, not greater than " +
         base::IntToString(max_size));
   }
 
   if (device_scale_factor < 0)
     return Response::InvalidParams("deviceScaleFactor must be non-negative");
 
   if (optional_scale && (*optional_scale <= 0 || *optional_scale > max_scale)) {
     return Response::InvalidParams(
         "scale must be positive, not greater than " +
         base::IntToString(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);
 
   if (device_emulation_enabled_ && params == device_emulation_params_)
     return Response::OK();
@@ skipping 43 matching lines @@
         widget_host->GetRoutingID(), device_emulation_params_));
   } else {
     widget_host->Send(new ViewMsg_DisableDeviceEmulation(
         widget_host->GetRoutingID()));
   }
 }
 
 }  // namespace emulation
 }  // namespace devtools
 }  // namespace content