Change blink::WebScreenInfo to content::ScreenInfo

content/renderer/devtools/render_widget_screen_metrics_emulator.cc

 // Copyright 2016 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/renderer/devtools/render_widget_screen_metrics_emulator.h"
 
 #include "content/common/resize_params.h"
 #include "content/public/common/context_menu_params.h"
 #include "content/renderer/devtools/render_widget_screen_metrics_emulator_delegate.h"
 
@@ skipping 63 matching lines @@
       applied_widget_rect_.set_size(
           gfx::ScaleToRoundedSize(original_size(), 1.f / scale_));
     }
   }
 
   gfx::Rect window_screen_rect;
   if (emulation_params_.screenPosition ==
       blink::WebDeviceEmulationParams::Desktop) {
     applied_widget_rect_.set_origin(original_view_screen_rect_.origin());
     modified_resize_params.screen_info.rect = original_screen_info().rect;
-    modified_resize_params.screen_info.availableRect =
-        original_screen_info().availableRect;
+    modified_resize_params.screen_info.available_rect =
+        original_screen_info().available_rect;
     window_screen_rect = original_window_screen_rect_;
   } else {
     applied_widget_rect_.set_origin(emulation_params_.viewPosition);
     gfx::Rect screen_rect = applied_widget_rect_;
     if (!emulation_params_.screenSize.isEmpty()) {
       screen_rect = gfx::Rect(0, 0, emulation_params_.screenSize.width,
                               emulation_params_.screenSize.height);
     }
     modified_resize_params.screen_info.rect = screen_rect;
-    modified_resize_params.screen_info.availableRect = screen_rect;
+    modified_resize_params.screen_info.available_rect = screen_rect;
     window_screen_rect = applied_widget_rect_;
   }
 
-  modified_resize_params.screen_info.deviceScaleFactor =
+  modified_resize_params.screen_info.device_scale_factor =
       emulation_params_.deviceScaleFactor
           ? emulation_params_.deviceScaleFactor
-          : original_screen_info().deviceScaleFactor;
+          : original_screen_info().device_scale_factor;
 
   if (emulation_params_.screenOrientationType !=
       blink::WebScreenOrientationUndefined) {
-    modified_resize_params.screen_info.orientationType =
-        emulation_params_.screenOrientationType;
-    modified_resize_params.screen_info.orientationAngle =
+    switch (emulation_params_.screenOrientationType) {
+      case blink::WebScreenOrientationPortraitPrimary:
+        modified_resize_params.screen_info.orientation_type =
+            SCREEN_ORIENTATION_VALUES_PORTRAIT_PRIMARY;
+        break;
+      case blink::WebScreenOrientationPortraitSecondary:
+        modified_resize_params.screen_info.orientation_type =
+            SCREEN_ORIENTATION_VALUES_PORTRAIT_SECONDARY;
+        break;
+      case blink::WebScreenOrientationLandscapePrimary:
+        modified_resize_params.screen_info.orientation_type =
+            SCREEN_ORIENTATION_VALUES_LANDSCAPE_PRIMARY;
+        break;
+      case blink::WebScreenOrientationLandscapeSecondary:
+        modified_resize_params.screen_info.orientation_type =
+            SCREEN_ORIENTATION_VALUES_LANDSCAPE_SECONDARY;
+        break;
+      default:
+        modified_resize_params.screen_info.orientation_type =
+            SCREEN_ORIENTATION_VALUES_DEFAULT;
+        break;
+    }
+    modified_resize_params.screen_info.orientation_angle =
         emulation_params_.screenOrientationAngle;
   }
 
   // Pass three emulation parameters to the blink side:
   // - we keep the real device scale factor in compositor to produce sharp image
   //   even when emulating different scale factor;
   // - in order to fit into view, WebView applies offset and scale to the
   //   root layer.
   blink::WebDeviceEmulationParams modified_emulation_params = emulation_params_;
   modified_emulation_params.deviceScaleFactor =
-      original_screen_info().deviceScaleFactor;
+      original_screen_info().device_scale_factor;
   modified_emulation_params.offset =
       blink::WebFloatPoint(offset_.x(), offset_.y());
   modified_emulation_params.scale = scale_;
   delegate_->SetScreenMetricsEmulationParameters(true,
                                                  modified_emulation_params);
 
   delegate_->SetScreenRects(applied_widget_rect_, window_screen_rect);
 
   modified_resize_params.physical_backing_size =
       gfx::ScaleToCeiledSize(original_resize_params_.new_size,
-                             original_screen_info().deviceScaleFactor);
+                             original_screen_info().device_scale_factor);
   modified_resize_params.new_size = applied_widget_rect_.size();
   modified_resize_params.visible_viewport_size = applied_widget_rect_.size();
   modified_resize_params.needs_resize_ack = false;
   delegate_->Resize(modified_resize_params);
 }
 
 void RenderWidgetScreenMetricsEmulator::OnResize(const ResizeParams& params) {
   original_resize_params_ = params;
   Apply();
 
@@ skipping 30 matching lines @@
 
 gfx::Rect RenderWidgetScreenMetricsEmulator::AdjustValidationMessageAnchor(
     const gfx::Rect& anchor) {
   gfx::Rect scaled = gfx::ScaleToEnclosedRect(anchor, scale_);
   scaled.set_x(scaled.x() + offset_.x());
   scaled.set_y(scaled.y() + offset_.y());
   return scaled;
 }
 
 }  // namespace content