BASELINE: Update Chromium to 68.0.3440.125

Change-Id: I23f19369e01f688e496f5bf179abb521ad73874f
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>

3 files changed, 38 insertions, 40 deletions

diff --git a/chromium/content/renderer/devtools/render_widget_screen_metrics_emulator.cc b/chromium/content/renderer/devtools/render_widget_screen_metrics_emulator.cc
index 52ac6da18f1..dcab57919fd 100644
--- a/chromium/content/renderer/devtools/render_widget_screen_metrics_emulator.cc
+++ b/chromium/content/renderer/devtools/render_widget_screen_metrics_emulator.cc
@@ -4,7 +4,7 @@
 
 #include "content/renderer/devtools/render_widget_screen_metrics_emulator.h"
 
-#include "content/common/resize_params.h"
+#include "content/common/visual_properties.h"
 #include "content/public/common/context_menu_params.h"
 #include "content/renderer/devtools/render_widget_screen_metrics_emulator_delegate.h"
 
@@ -13,22 +13,18 @@ namespace content {
 RenderWidgetScreenMetricsEmulator::RenderWidgetScreenMetricsEmulator(
     RenderWidgetScreenMetricsEmulatorDelegate* delegate,
     const blink::WebDeviceEmulationParams& params,
-    const ResizeParams& resize_params,
+    const VisualProperties& visual_properties,
     const gfx::Rect& view_screen_rect,
     const gfx::Rect& window_screen_rect)
     : delegate_(delegate),
       emulation_params_(params),
       scale_(1.f),
-      original_resize_params_(resize_params),
+      original_visual_properties_(visual_properties),
       original_view_screen_rect_(view_screen_rect),
-      original_window_screen_rect_(window_screen_rect) {
-}
+      original_window_screen_rect_(window_screen_rect) {}
 
 RenderWidgetScreenMetricsEmulator::~RenderWidgetScreenMetricsEmulator() {
-  // needs_resize_ack was handled during OnResize() and may cause a DCHECK to
-  // fail in RenderWidget if not cleared (crbug.com/635560).
-  original_resize_params_.needs_resize_ack = false;
-  delegate_->Resize(original_resize_params_);
+  delegate_->SynchronizeVisualProperties(original_visual_properties_);
   delegate_->SetScreenMetricsEmulationParameters(false, emulation_params_);
   delegate_->SetScreenRects(original_view_screen_rect_,
                             original_window_screen_rect_);
@@ -41,7 +37,7 @@ void RenderWidgetScreenMetricsEmulator::ChangeEmulationParams(
 }
 
 void RenderWidgetScreenMetricsEmulator::Apply() {
-  ResizeParams modified_resize_params = original_resize_params_;
+  VisualProperties modified_visual_properties = original_visual_properties_;
   applied_widget_rect_.set_size(gfx::Size(emulation_params_.view_size));
 
   if (!applied_widget_rect_.width())
@@ -60,8 +56,8 @@ void RenderWidgetScreenMetricsEmulator::Apply() {
   gfx::Rect window_screen_rect;
   if (emulation_params_.screen_position ==
       blink::WebDeviceEmulationParams::kDesktop) {
-    modified_resize_params.screen_info.rect = original_screen_info().rect;
-    modified_resize_params.screen_info.available_rect =
+    modified_visual_properties.screen_info.rect = original_screen_info().rect;
+    modified_visual_properties.screen_info.available_rect =
         original_screen_info().available_rect;
     window_screen_rect = original_window_screen_rect_;
     if (emulation_params_.view_position) {
@@ -73,19 +69,20 @@ void RenderWidgetScreenMetricsEmulator::Apply() {
   } else {
     applied_widget_rect_.set_origin(
         emulation_params_.view_position.value_or(blink::WebPoint()));
-    modified_resize_params.screen_info.rect = applied_widget_rect_;
-    modified_resize_params.screen_info.available_rect = applied_widget_rect_;
+    modified_visual_properties.screen_info.rect = applied_widget_rect_;
+    modified_visual_properties.screen_info.available_rect =
+        applied_widget_rect_;
     window_screen_rect = applied_widget_rect_;
   }
 
   if (!emulation_params_.screen_size.IsEmpty()) {
     gfx::Rect screen_rect = gfx::Rect(0, 0, emulation_params_.screen_size.width,
                                       emulation_params_.screen_size.height);
-    modified_resize_params.screen_info.rect = screen_rect;
-    modified_resize_params.screen_info.available_rect = screen_rect;
+    modified_visual_properties.screen_info.rect = screen_rect;
+    modified_visual_properties.screen_info.available_rect = screen_rect;
   }
 
-  modified_resize_params.screen_info.device_scale_factor =
+  modified_visual_properties.screen_info.device_scale_factor =
       emulation_params_.device_scale_factor
           ? emulation_params_.device_scale_factor
           : original_screen_info().device_scale_factor;
@@ -94,27 +91,27 @@ void RenderWidgetScreenMetricsEmulator::Apply() {
       blink::kWebScreenOrientationUndefined) {
     switch (emulation_params_.screen_orientation_type) {
       case blink::kWebScreenOrientationPortraitPrimary:
-        modified_resize_params.screen_info.orientation_type =
+        modified_visual_properties.screen_info.orientation_type =
             SCREEN_ORIENTATION_VALUES_PORTRAIT_PRIMARY;
         break;
       case blink::kWebScreenOrientationPortraitSecondary:
-        modified_resize_params.screen_info.orientation_type =
+        modified_visual_properties.screen_info.orientation_type =
             SCREEN_ORIENTATION_VALUES_PORTRAIT_SECONDARY;
         break;
       case blink::kWebScreenOrientationLandscapePrimary:
-        modified_resize_params.screen_info.orientation_type =
+        modified_visual_properties.screen_info.orientation_type =
             SCREEN_ORIENTATION_VALUES_LANDSCAPE_PRIMARY;
         break;
       case blink::kWebScreenOrientationLandscapeSecondary:
-        modified_resize_params.screen_info.orientation_type =
+        modified_visual_properties.screen_info.orientation_type =
             SCREEN_ORIENTATION_VALUES_LANDSCAPE_SECONDARY;
         break;
       default:
-        modified_resize_params.screen_info.orientation_type =
+        modified_visual_properties.screen_info.orientation_type =
             SCREEN_ORIENTATION_VALUES_DEFAULT;
         break;
     }
-    modified_resize_params.screen_info.orientation_angle =
+    modified_visual_properties.screen_info.orientation_angle =
         emulation_params_.screen_orientation_angle;
   }
 
@@ -132,18 +129,18 @@ void RenderWidgetScreenMetricsEmulator::Apply() {
 
   delegate_->SetScreenRects(applied_widget_rect_, window_screen_rect);
 
-  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);
+  modified_visual_properties.new_size = applied_widget_rect_.size();
+  modified_visual_properties.visible_viewport_size =
+      applied_widget_rect_.size();
+  delegate_->SynchronizeVisualProperties(modified_visual_properties);
 }
 
-void RenderWidgetScreenMetricsEmulator::OnResize(const ResizeParams& params) {
-  original_resize_params_ = params;
+void RenderWidgetScreenMetricsEmulator::OnSynchronizeVisualProperties(
+    const VisualProperties& params) {
+  original_visual_properties_ = params;
   Apply();
 
-  if (params.needs_resize_ack)
-    delegate_->Redraw();
+  delegate_->Redraw();
 }
 
 void RenderWidgetScreenMetricsEmulator::OnUpdateWindowScreenRect(
diff --git a/chromium/content/renderer/devtools/render_widget_screen_metrics_emulator.h b/chromium/content/renderer/devtools/render_widget_screen_metrics_emulator.h
index 3497fe04752..54040dde1ea 100644
--- a/chromium/content/renderer/devtools/render_widget_screen_metrics_emulator.h
+++ b/chromium/content/renderer/devtools/render_widget_screen_metrics_emulator.h
@@ -7,7 +7,7 @@
 
 #include <memory>
 
-#include "content/common/resize_params.h"
+#include "content/common/visual_properties.h"
 #include "third_party/blink/public/web/web_device_emulation_params.h"
 
 namespace gfx {
@@ -28,7 +28,7 @@ class CONTENT_EXPORT RenderWidgetScreenMetricsEmulator {
   RenderWidgetScreenMetricsEmulator(
       RenderWidgetScreenMetricsEmulatorDelegate* delegate,
       const blink::WebDeviceEmulationParams& params,
-      const ResizeParams& resize_params,
+      const VisualProperties& visual_properties,
       const gfx::Rect& view_screen_rect,
       const gfx::Rect& window_screen_rect);
   virtual ~RenderWidgetScreenMetricsEmulator();
@@ -36,13 +36,13 @@ class CONTENT_EXPORT RenderWidgetScreenMetricsEmulator {
   // Scale and offset used to convert between host coordinates
   // and webwidget coordinates.
   const gfx::Size& original_size() const {
-    return original_resize_params_.new_size;
+    return original_visual_properties_.new_size;
   }
 
   float scale() const { return scale_; }
   const gfx::Rect& applied_widget_rect() const { return applied_widget_rect_; }
   const ScreenInfo& original_screen_info() const {
-    return original_resize_params_.screen_info;
+    return original_visual_properties_.screen_info;
   }
   const gfx::Rect& original_screen_rect() const {
     return original_view_screen_rect_;
@@ -52,7 +52,7 @@ class CONTENT_EXPORT RenderWidgetScreenMetricsEmulator {
 
   // The following methods alter handlers' behavior for messages related to
   // widget size and position.
-  void OnResize(const ResizeParams& params);
+  void OnSynchronizeVisualProperties(const VisualProperties& params);
   void OnUpdateWindowScreenRect(const gfx::Rect& window_screen_rect);
   void OnUpdateScreenRects(const gfx::Rect& view_screen_rect,
                            const gfx::Rect& window_screen_rect);
@@ -75,7 +75,7 @@ class CONTENT_EXPORT RenderWidgetScreenMetricsEmulator {
   gfx::Rect applied_widget_rect_;
 
   // Original values to restore back after emulation ends.
-  ResizeParams original_resize_params_;
+  VisualProperties original_visual_properties_;
   gfx::Rect original_view_screen_rect_;
   gfx::Rect original_window_screen_rect_;
 
diff --git a/chromium/content/renderer/devtools/render_widget_screen_metrics_emulator_delegate.h b/chromium/content/renderer/devtools/render_widget_screen_metrics_emulator_delegate.h
index af79f1967b6..ac7c8e62bff 100644
--- a/chromium/content/renderer/devtools/render_widget_screen_metrics_emulator_delegate.h
+++ b/chromium/content/renderer/devtools/render_widget_screen_metrics_emulator_delegate.h
@@ -13,7 +13,7 @@ struct WebDeviceEmulationParams;
 
 namespace content {
 
-struct ResizeParams;
+struct VisualProperties;
 
 // Consumers of RenderWidgetScreenMetricsEmulatorDelegate implement this
 // delegate in order to transport emulation information across processes.
@@ -22,8 +22,9 @@ class CONTENT_EXPORT RenderWidgetScreenMetricsEmulatorDelegate {
   // Requests a full redraw of the contents of the renderer.
   virtual void Redraw() = 0;
 
-  // Resizes the Widget with the provided |resize_params|.
-  virtual void Resize(const ResizeParams& resize_params) = 0;
+  // Synchronize visual properties with the widget.
+  virtual void SynchronizeVisualProperties(
+      const VisualProperties& visual_properties) = 0;
 
   // Passes device emulation parameters to the delegate.
   virtual void SetScreenMetricsEmulationParameters(