Update to Chromium version 82.0.4085.0 (#749737)

- Building on macOS now requires the 10.15 SDK. Xcode 11.3 is recommended as
  Xcode 11.4 is not currently supported (see https://crbug.com/1065146).
- Jumbo build configuration is no longer supported.

Chromium is skipping the M82 release and consequently no CEF 4085 branch will
be created. For details on the Chromium decision see
https://groups.google.com/a/chromium.org/d/msg/chromium-dev/Vn7uzglqLz0/JItlSrZxBAAJ

libcef/browser/osr/render_widget_host_view_osr.cc

@@ -25,10 +25,8 @@
 #include "components/viz/common/frame_sinks/begin_frame_args.h"
 #include "components/viz/common/frame_sinks/copy_output_request.h"
 #include "components/viz/common/frame_sinks/delay_based_time_source.h"
-#include "components/viz/common/gl_helper.h"
 #include "components/viz/common/switches.h"
 #include "content/browser/bad_message.h"
-#include "content/browser/compositor/image_transport_factory.h"
 #include "content/browser/gpu/gpu_data_manager_impl.h"
 #include "content/browser/renderer_host/cursor_manager.h"
 #include "content/browser/renderer_host/delegated_frame_host.h"
@@ -48,7 +46,6 @@
 #include "content/public/browser/render_view_host.h"
 #include "content/public/common/content_switches.h"
 #include "media/base/video_frame.h"
-#include "ui/base/cursor/types/cursor_types.h"
 #include "ui/compositor/compositor.h"
 #include "ui/events/blink/blink_event_util.h"
 #include "ui/events/gesture_detection/gesture_provider_config_helper.h"
@@ -236,15 +233,11 @@ CefRenderWidgetHostViewOSR::CefRenderWidgetHostViewOSR(
 
   external_begin_frame_enabled_ = use_external_begin_frame;
 
-  content::ImageTransportFactory* factory =
-      content::ImageTransportFactory::GetInstance();
-  ui::ContextFactoryPrivate* context_factory_private =
-      factory->GetContextFactoryPrivate();
+  auto context_factory = content::GetContextFactory();
 
   // Matching the attributes from RecyclableCompositorMac.
   compositor_.reset(new ui::Compositor(
-      context_factory_private->AllocateFrameSinkId(),
-      content::GetContextFactory(), context_factory_private,
+      context_factory->AllocateFrameSinkId(), context_factory,
       base::ThreadTaskRunnerHandle::Get(), false /* enable_pixel_canvas */,
       use_external_begin_frame));
   compositor_->SetAcceleratedWidget(gfx::kNullAcceleratedWidget);
@@ -447,8 +440,9 @@ base::Optional<SkColor> CefRenderWidgetHostViewOSR::GetBackgroundColor() {
 
 void CefRenderWidgetHostViewOSR::UpdateBackgroundColor() {}
 
-bool CefRenderWidgetHostViewOSR::LockMouse(bool request_unadjusted_movement) {
-  return false;
+blink::mojom::PointerLockResult CefRenderWidgetHostViewOSR::LockMouse(
+    bool request_unadjusted_movement) {
+  return blink::mojom::PointerLockResult::kPermissionDenied;
 }
 
 void CefRenderWidgetHostViewOSR::UnlockMouse() {}
@@ -588,39 +582,29 @@ void CefRenderWidgetHostViewOSR::UpdateCursor(
       browser_impl_->GetClient()->GetRenderHandler();
   CHECK(handler);
 
-  const content::CursorInfo& cursor_info = cursor.info();
+  const auto& ui_cursor = cursor.cursor();
 
   const cef_cursor_type_t cursor_type =
-      static_cast<cef_cursor_type_t>(cursor_info.type);
+      static_cast<cef_cursor_type_t>(ui_cursor.type());
   CefCursorInfo custom_cursor_info;
-  if (cursor_info.type == ui::CursorType::kCustom) {
-    custom_cursor_info.hotspot.x = cursor_info.hotspot.x();
-    custom_cursor_info.hotspot.y = cursor_info.hotspot.y();
-    custom_cursor_info.image_scale_factor = cursor_info.image_scale_factor;
-    custom_cursor_info.buffer = cursor_info.custom_image.getPixels();
-    custom_cursor_info.size.width = cursor_info.custom_image.width();
-    custom_cursor_info.size.height = cursor_info.custom_image.height();
+  if (ui_cursor.type() == ui::mojom::CursorType::kCustom) {
+    custom_cursor_info.hotspot.x = ui_cursor.custom_hotspot().x();
+    custom_cursor_info.hotspot.y = ui_cursor.custom_hotspot().y();
+    custom_cursor_info.image_scale_factor = ui_cursor.image_scale_factor();
+    custom_cursor_info.buffer = ui_cursor.custom_bitmap().getPixels();
+    custom_cursor_info.size.width = ui_cursor.custom_bitmap().width();
+    custom_cursor_info.size.height = ui_cursor.custom_bitmap().height();
   }
 
 #if defined(USE_AURA)
-  content::WebCursor web_cursor(cursor_info);
+  content::WebCursor web_cursor(ui_cursor);
 
   ui::PlatformCursor platform_cursor;
-  if (cursor_info.type == ui::CursorType::kCustom) {
-    ui::Cursor ui_cursor(ui::CursorType::kCustom);
-    SkBitmap bitmap;
-    gfx::Point hotspot;
-    float scale_factor;
-    web_cursor.CreateScaledBitmapAndHotspotFromCustomData(&bitmap, &hotspot,
-                                                          &scale_factor);
-    ui_cursor.set_custom_bitmap(bitmap);
-    ui_cursor.set_custom_hotspot(hotspot);
-    ui_cursor.set_device_scale_factor(scale_factor);
-
+  if (ui_cursor.type() == ui::mojom::CursorType::kCustom) {
     // |web_cursor| owns the resulting |platform_cursor|.
     platform_cursor = web_cursor.GetPlatformCursor(ui_cursor);
   } else {
-    platform_cursor = GetPlatformCursor(cursor_info.type);
+    platform_cursor = GetPlatformCursor(ui_cursor.type());
   }
 
   handler->OnCursorChange(browser_impl_.get(), platform_cursor, cursor_type,
@@ -1065,8 +1049,8 @@ void CefRenderWidgetHostViewOSR::SendExternalBeginFrame() {
   if (render_widget_host_)
     render_widget_host_->ProgressFlingIfNeeded(frame_time);
 
-  compositor_->context_factory_private()->IssueExternalBeginFrame(
-      compositor_.get(), begin_frame_args, /* force= */ true,
+  compositor_->IssueExternalBeginFrame(
+      begin_frame_args, /* force= */ true,
       base::BindOnce(&CefRenderWidgetHostViewOSR::OnFrameComplete,
                      weak_ptr_factory_.GetWeakPtr()));
 

libcef/browser/osr/render_widget_host_view_osr.h

@@ -28,7 +28,7 @@
 #include "content/browser/renderer_host/render_widget_host_view_base.h"
 #include "content/browser/renderer_host/text_input_manager.h"
 #include "content/public/common/widget_type.h"
-#include "ui/base/cursor/types/cursor_types.h"
+#include "ui/base/mojom/cursor_type.mojom-shared.h"
 #include "ui/compositor/compositor.h"
 #include "ui/events/base_event_utils.h"
 #include "ui/events/gesture_detection/filtered_gesture_provider.h"
@@ -49,7 +49,6 @@
 #endif
 
 #if defined(USE_AURA)
-#include "third_party/blink/public/platform/web_cursor_info.h"
 #include "ui/base/cursor/cursor.h"
 #endif
 
@@ -124,7 +123,8 @@ class CefRenderWidgetHostViewOSR : public content::RenderWidgetHostViewBase,
   void SetBackgroundColor(SkColor color) override;
   base::Optional<SkColor> GetBackgroundColor() override;
   void UpdateBackgroundColor() override;
-  bool LockMouse(bool request_unadjusted_movement) override;
+  blink::mojom::PointerLockResult LockMouse(
+      bool request_unadjusted_movement) override;
   void UnlockMouse() override;
   void TakeFallbackContentFrom(content::RenderWidgetHostView* view) override;
 
@@ -321,7 +321,7 @@ class CefRenderWidgetHostViewOSR : public content::RenderWidgetHostViewBase,
   void UpdateBackgroundColorFromRenderer(SkColor color);
 
 #if defined(USE_AURA)
-  ui::PlatformCursor GetPlatformCursor(ui::CursorType type);
+  ui::PlatformCursor GetPlatformCursor(ui::mojom::CursorType type);
 #endif
 
   // The background color of the web content.

libcef/browser/osr/render_widget_host_view_osr_linux.cc

@@ -5,8 +5,6 @@
 
 #include "libcef/browser/osr/render_widget_host_view_osr.h"
 
-#include "third_party/blink/public/platform/web_cursor_info.h"
-
 #if defined(USE_X11)
 #include <X11/Xlib.h>
 #include <X11/cursorfont.h>
@@ -23,110 +21,108 @@ namespace {
 
 // Based on ui/base/cursor/cursor_loader_x11.cc.
 
-using blink::WebCursorInfo;
-
-int ToCursorID(ui::CursorType type) {
+int ToCursorID(ui::mojom::CursorType type) {
   switch (type) {
-    case ui::CursorType::kPointer:
+    case ui::mojom::CursorType::kPointer:
       return XC_left_ptr;
-    case ui::CursorType::kCross:
+    case ui::mojom::CursorType::kCross:
       return XC_crosshair;
-    case ui::CursorType::kHand:
+    case ui::mojom::CursorType::kHand:
       return XC_hand2;
-    case ui::CursorType::kIBeam:
+    case ui::mojom::CursorType::kIBeam:
       return XC_xterm;
-    case ui::CursorType::kWait:
+    case ui::mojom::CursorType::kWait:
       return XC_watch;
-    case ui::CursorType::kHelp:
+    case ui::mojom::CursorType::kHelp:
       return XC_question_arrow;
-    case ui::CursorType::kEastResize:
+    case ui::mojom::CursorType::kEastResize:
       return XC_right_side;
-    case ui::CursorType::kNorthResize:
+    case ui::mojom::CursorType::kNorthResize:
       return XC_top_side;
-    case ui::CursorType::kNorthEastResize:
+    case ui::mojom::CursorType::kNorthEastResize:
       return XC_top_right_corner;
-    case ui::CursorType::kNorthWestResize:
+    case ui::mojom::CursorType::kNorthWestResize:
       return XC_top_left_corner;
-    case ui::CursorType::kSouthResize:
+    case ui::mojom::CursorType::kSouthResize:
       return XC_bottom_side;
-    case ui::CursorType::kSouthEastResize:
+    case ui::mojom::CursorType::kSouthEastResize:
       return XC_bottom_right_corner;
-    case ui::CursorType::kSouthWestResize:
+    case ui::mojom::CursorType::kSouthWestResize:
       return XC_bottom_left_corner;
-    case ui::CursorType::kWestResize:
+    case ui::mojom::CursorType::kWestResize:
       return XC_left_side;
-    case ui::CursorType::kNorthSouthResize:
+    case ui::mojom::CursorType::kNorthSouthResize:
       return XC_sb_v_double_arrow;
-    case ui::CursorType::kEastWestResize:
+    case ui::mojom::CursorType::kEastWestResize:
       return XC_sb_h_double_arrow;
-    case ui::CursorType::kNorthEastSouthWestResize:
+    case ui::mojom::CursorType::kNorthEastSouthWestResize:
       return XC_left_ptr;
-    case ui::CursorType::kNorthWestSouthEastResize:
+    case ui::mojom::CursorType::kNorthWestSouthEastResize:
       return XC_left_ptr;
-    case ui::CursorType::kColumnResize:
+    case ui::mojom::CursorType::kColumnResize:
       return XC_sb_h_double_arrow;
-    case ui::CursorType::kRowResize:
+    case ui::mojom::CursorType::kRowResize:
       return XC_sb_v_double_arrow;
-    case ui::CursorType::kMiddlePanning:
+    case ui::mojom::CursorType::kMiddlePanning:
       return XC_fleur;
-    case ui::CursorType::kEastPanning:
+    case ui::mojom::CursorType::kEastPanning:
       return XC_sb_right_arrow;
-    case ui::CursorType::kNorthPanning:
+    case ui::mojom::CursorType::kNorthPanning:
       return XC_sb_up_arrow;
-    case ui::CursorType::kNorthEastPanning:
+    case ui::mojom::CursorType::kNorthEastPanning:
       return XC_top_right_corner;
-    case ui::CursorType::kNorthWestPanning:
+    case ui::mojom::CursorType::kNorthWestPanning:
       return XC_top_left_corner;
-    case ui::CursorType::kSouthPanning:
+    case ui::mojom::CursorType::kSouthPanning:
       return XC_sb_down_arrow;
-    case ui::CursorType::kSouthEastPanning:
+    case ui::mojom::CursorType::kSouthEastPanning:
       return XC_bottom_right_corner;
-    case ui::CursorType::kSouthWestPanning:
+    case ui::mojom::CursorType::kSouthWestPanning:
       return XC_bottom_left_corner;
-    case ui::CursorType::kWestPanning:
+    case ui::mojom::CursorType::kWestPanning:
       return XC_sb_left_arrow;
-    case ui::CursorType::kMove:
+    case ui::mojom::CursorType::kMove:
       return XC_fleur;
-    case ui::CursorType::kVerticalText:
+    case ui::mojom::CursorType::kVerticalText:
       return XC_left_ptr;
-    case ui::CursorType::kCell:
+    case ui::mojom::CursorType::kCell:
       return XC_left_ptr;
-    case ui::CursorType::kContextMenu:
+    case ui::mojom::CursorType::kContextMenu:
       return XC_left_ptr;
-    case ui::CursorType::kAlias:
+    case ui::mojom::CursorType::kAlias:
       return XC_left_ptr;
-    case ui::CursorType::kProgress:
+    case ui::mojom::CursorType::kProgress:
       return XC_left_ptr;
-    case ui::CursorType::kNoDrop:
+    case ui::mojom::CursorType::kNoDrop:
       return XC_left_ptr;
-    case ui::CursorType::kCopy:
+    case ui::mojom::CursorType::kCopy:
       return XC_left_ptr;
-    case ui::CursorType::kNotAllowed:
+    case ui::mojom::CursorType::kNotAllowed:
       return XC_left_ptr;
-    case ui::CursorType::kZoomIn:
+    case ui::mojom::CursorType::kZoomIn:
       return XC_left_ptr;
-    case ui::CursorType::kZoomOut:
+    case ui::mojom::CursorType::kZoomOut:
       return XC_left_ptr;
-    case ui::CursorType::kGrab:
+    case ui::mojom::CursorType::kGrab:
       return XC_left_ptr;
-    case ui::CursorType::kGrabbing:
+    case ui::mojom::CursorType::kGrabbing:
       return XC_left_ptr;
-    case ui::CursorType::kMiddlePanningVertical:
+    case ui::mojom::CursorType::kMiddlePanningVertical:
       return XC_left_ptr;
-    case ui::CursorType::kMiddlePanningHorizontal:
+    case ui::mojom::CursorType::kMiddlePanningHorizontal:
       return XC_left_ptr;
-    case ui::CursorType::kDndNone:
+    case ui::mojom::CursorType::kDndNone:
       return XC_left_ptr;
-    case ui::CursorType::kDndMove:
+    case ui::mojom::CursorType::kDndMove:
       return XC_left_ptr;
-    case ui::CursorType::kDndCopy:
+    case ui::mojom::CursorType::kDndCopy:
       return XC_left_ptr;
-    case ui::CursorType::kDndLink:
+    case ui::mojom::CursorType::kDndLink:
       return XC_left_ptr;
-    case ui::CursorType::kNull:
+    case ui::mojom::CursorType::kNull:
       return XC_left_ptr;
-    case ui::CursorType::kCustom:
-    case ui::CursorType::kNone:
+    case ui::mojom::CursorType::kCustom:
+    case ui::mojom::CursorType::kNone:
       break;
   }
   NOTREACHED();
@@ -184,9 +180,9 @@ XCursorCache* cursor_cache = nullptr;
 #endif  // defined(USE_X11)
 
 ui::PlatformCursor CefRenderWidgetHostViewOSR::GetPlatformCursor(
-    ui::CursorType type) {
+    ui::mojom::CursorType type) {
 #if defined(USE_X11)
-  if (type == ui::CursorType::kNone) {
+  if (type == ui::mojom::CursorType::kNone) {
     if (!invisible_cursor_) {
       invisible_cursor_.reset(new ui::XScopedCursor(ui::CreateInvisibleCursor(),
                                                     gfx::GetXDisplay()));

libcef/browser/osr/render_widget_host_view_osr_win.cc

@@ -10,7 +10,6 @@
 #include "libcef/browser/browser_host_impl.h"
 #include "libcef/browser/content_browser_client.h"
 
-#include "third_party/blink/public/platform/web_cursor_info.h"
 #include "ui/resources/grit/ui_unscaled_resources.h"
 
 namespace {
@@ -39,112 +38,110 @@ class CefCompositorHostWin : public gfx::WindowImpl {
 
 // From content/common/cursors/webcursor_win.cc.
 
-using blink::WebCursorInfo;
-
-LPCWSTR ToCursorID(ui::CursorType type) {
+LPCWSTR ToCursorID(ui::mojom::CursorType type) {
   switch (type) {
-    case ui::CursorType::kPointer:
+    case ui::mojom::CursorType::kPointer:
       return IDC_ARROW;
-    case ui::CursorType::kCross:
+    case ui::mojom::CursorType::kCross:
       return IDC_CROSS;
-    case ui::CursorType::kHand:
+    case ui::mojom::CursorType::kHand:
       return IDC_HAND;
-    case ui::CursorType::kIBeam:
+    case ui::mojom::CursorType::kIBeam:
       return IDC_IBEAM;
-    case ui::CursorType::kWait:
+    case ui::mojom::CursorType::kWait:
       return IDC_WAIT;
-    case ui::CursorType::kHelp:
+    case ui::mojom::CursorType::kHelp:
       return IDC_HELP;
-    case ui::CursorType::kEastResize:
+    case ui::mojom::CursorType::kEastResize:
       return IDC_SIZEWE;
-    case ui::CursorType::kNorthResize:
+    case ui::mojom::CursorType::kNorthResize:
       return IDC_SIZENS;
-    case ui::CursorType::kNorthEastResize:
+    case ui::mojom::CursorType::kNorthEastResize:
       return IDC_SIZENESW;
-    case ui::CursorType::kNorthWestResize:
+    case ui::mojom::CursorType::kNorthWestResize:
       return IDC_SIZENWSE;
-    case ui::CursorType::kSouthResize:
+    case ui::mojom::CursorType::kSouthResize:
       return IDC_SIZENS;
-    case ui::CursorType::kSouthEastResize:
+    case ui::mojom::CursorType::kSouthEastResize:
       return IDC_SIZENWSE;
-    case ui::CursorType::kSouthWestResize:
+    case ui::mojom::CursorType::kSouthWestResize:
       return IDC_SIZENESW;
-    case ui::CursorType::kWestResize:
+    case ui::mojom::CursorType::kWestResize:
       return IDC_SIZEWE;
-    case ui::CursorType::kNorthSouthResize:
+    case ui::mojom::CursorType::kNorthSouthResize:
       return IDC_SIZENS;
-    case ui::CursorType::kEastWestResize:
+    case ui::mojom::CursorType::kEastWestResize:
       return IDC_SIZEWE;
-    case ui::CursorType::kNorthEastSouthWestResize:
+    case ui::mojom::CursorType::kNorthEastSouthWestResize:
       return IDC_SIZENESW;
-    case ui::CursorType::kNorthWestSouthEastResize:
+    case ui::mojom::CursorType::kNorthWestSouthEastResize:
       return IDC_SIZENWSE;
-    case ui::CursorType::kColumnResize:
+    case ui::mojom::CursorType::kColumnResize:
       return MAKEINTRESOURCE(IDC_COLRESIZE);
-    case ui::CursorType::kRowResize:
+    case ui::mojom::CursorType::kRowResize:
       return MAKEINTRESOURCE(IDC_ROWRESIZE);
-    case ui::CursorType::kMiddlePanning:
+    case ui::mojom::CursorType::kMiddlePanning:
       return MAKEINTRESOURCE(IDC_PAN_MIDDLE);
-    case ui::CursorType::kEastPanning:
+    case ui::mojom::CursorType::kEastPanning:
       return MAKEINTRESOURCE(IDC_PAN_EAST);
-    case ui::CursorType::kNorthPanning:
+    case ui::mojom::CursorType::kNorthPanning:
       return MAKEINTRESOURCE(IDC_PAN_NORTH);
-    case ui::CursorType::kNorthEastPanning:
+    case ui::mojom::CursorType::kNorthEastPanning:
       return MAKEINTRESOURCE(IDC_PAN_NORTH_EAST);
-    case ui::CursorType::kNorthWestPanning:
+    case ui::mojom::CursorType::kNorthWestPanning:
       return MAKEINTRESOURCE(IDC_PAN_NORTH_WEST);
-    case ui::CursorType::kSouthPanning:
+    case ui::mojom::CursorType::kSouthPanning:
       return MAKEINTRESOURCE(IDC_PAN_SOUTH);
-    case ui::CursorType::kSouthEastPanning:
+    case ui::mojom::CursorType::kSouthEastPanning:
       return MAKEINTRESOURCE(IDC_PAN_SOUTH_EAST);
-    case ui::CursorType::kSouthWestPanning:
+    case ui::mojom::CursorType::kSouthWestPanning:
       return MAKEINTRESOURCE(IDC_PAN_SOUTH_WEST);
-    case ui::CursorType::kWestPanning:
+    case ui::mojom::CursorType::kWestPanning:
       return MAKEINTRESOURCE(IDC_PAN_WEST);
-    case ui::CursorType::kMove:
+    case ui::mojom::CursorType::kMove:
       return IDC_SIZEALL;
-    case ui::CursorType::kVerticalText:
+    case ui::mojom::CursorType::kVerticalText:
       return MAKEINTRESOURCE(IDC_VERTICALTEXT);
-    case ui::CursorType::kCell:
+    case ui::mojom::CursorType::kCell:
       return MAKEINTRESOURCE(IDC_CELL);
-    case ui::CursorType::kContextMenu:
+    case ui::mojom::CursorType::kContextMenu:
       return IDC_ARROW;
-    case ui::CursorType::kAlias:
+    case ui::mojom::CursorType::kAlias:
       return MAKEINTRESOURCE(IDC_ALIAS);
-    case ui::CursorType::kProgress:
+    case ui::mojom::CursorType::kProgress:
       return IDC_APPSTARTING;
-    case ui::CursorType::kNoDrop:
+    case ui::mojom::CursorType::kNoDrop:
       return IDC_NO;
-    case ui::CursorType::kCopy:
+    case ui::mojom::CursorType::kCopy:
       return MAKEINTRESOURCE(IDC_COPYCUR);
-    case ui::CursorType::kNone:
+    case ui::mojom::CursorType::kNone:
       return MAKEINTRESOURCE(IDC_CURSOR_NONE);
-    case ui::CursorType::kNotAllowed:
+    case ui::mojom::CursorType::kNotAllowed:
       return IDC_NO;
-    case ui::CursorType::kZoomIn:
+    case ui::mojom::CursorType::kZoomIn:
       return MAKEINTRESOURCE(IDC_ZOOMIN);
-    case ui::CursorType::kZoomOut:
+    case ui::mojom::CursorType::kZoomOut:
       return MAKEINTRESOURCE(IDC_ZOOMOUT);
-    case ui::CursorType::kGrab:
+    case ui::mojom::CursorType::kGrab:
       return MAKEINTRESOURCE(IDC_HAND_GRAB);
-    case ui::CursorType::kGrabbing:
+    case ui::mojom::CursorType::kGrabbing:
       return MAKEINTRESOURCE(IDC_HAND_GRABBING);
-    case ui::CursorType::kNull:
+    case ui::mojom::CursorType::kNull:
       return IDC_NO;
-    case ui::CursorType::kMiddlePanningVertical:
+    case ui::mojom::CursorType::kMiddlePanningVertical:
       return MAKEINTRESOURCE(IDC_PAN_MIDDLE_VERTICAL);
-    case ui::CursorType::kMiddlePanningHorizontal:
+    case ui::mojom::CursorType::kMiddlePanningHorizontal:
       return MAKEINTRESOURCE(IDC_PAN_MIDDLE_HORIZONTAL);
     // TODO(cef): Find better cursors for these things
-    case ui::CursorType::kDndNone:
+    case ui::mojom::CursorType::kDndNone:
       return IDC_ARROW;
-    case ui::CursorType::kDndMove:
+    case ui::mojom::CursorType::kDndMove:
       return IDC_ARROW;
-    case ui::CursorType::kDndCopy:
+    case ui::mojom::CursorType::kDndCopy:
       return IDC_ARROW;
-    case ui::CursorType::kDndLink:
+    case ui::mojom::CursorType::kDndLink:
       return IDC_ARROW;
-    case ui::CursorType::kCustom:
+    case ui::mojom::CursorType::kCustom:
       break;
   }
   NOTREACHED();
@@ -158,7 +155,7 @@ bool IsSystemCursorID(LPCWSTR cursor_id) {
 }  // namespace
 
 ui::PlatformCursor CefRenderWidgetHostViewOSR::GetPlatformCursor(
-    ui::CursorType type) {
+    ui::mojom::CursorType type) {
   HMODULE module_handle = NULL;
   const wchar_t* cursor_id = ToCursorID(type);
   if (!IsSystemCursorID(cursor_id)) {

libcef/browser/osr/web_contents_view_osr.cc

@@ -29,8 +29,11 @@ void CefWebContentsViewOSR::WebContentsCreated(
   DCHECK(!web_contents_);
   web_contents_ = web_contents;
 
-  // Call this again for popup browsers now that the view should exist.
-  RenderViewCreated(web_contents_->GetRenderViewHost());
+  auto host = web_contents_->GetRenderViewHost();
+  CefRenderWidgetHostViewOSR* view =
+      static_cast<CefRenderWidgetHostViewOSR*>(host->GetWidget()->GetView());
+  if (view)
+    view->InstallTransparency();
 }
 
 gfx::NativeView CefWebContentsViewOSR::GetNativeView() const {
@@ -123,15 +126,6 @@ CefWebContentsViewOSR::CreateViewForChildWidget(
 
 void CefWebContentsViewOSR::SetPageTitle(const base::string16& title) {}
 
-void CefWebContentsViewOSR::RenderViewCreated(content::RenderViewHost* host) {
-  if (!host)
-    return;
-  CefRenderWidgetHostViewOSR* view =
-      static_cast<CefRenderWidgetHostViewOSR*>(host->GetWidget()->GetView());
-  if (view)
-    view->InstallTransparency();
-}
-
 void CefWebContentsViewOSR::RenderViewReady() {}
 
 void CefWebContentsViewOSR::RenderViewHostChanged(

libcef/browser/osr/web_contents_view_osr.h

@@ -50,7 +50,6 @@ class CefWebContentsViewOSR : public content::WebContentsView,
   content::RenderWidgetHostViewBase* CreateViewForChildWidget(
       content::RenderWidgetHost* render_widget_host) override;
   void SetPageTitle(const base::string16& title) override;
-  void RenderViewCreated(content::RenderViewHost* host) override;
   void RenderViewReady() override;
   void RenderViewHostChanged(content::RenderViewHost* old_host,
                              content::RenderViewHost* new_host) override;