Add support for MimeHandlerViewInCrossProcessFrame (fixes issue #2727)

The PDF loading documentation in extension_system.cc has be updated to describe the new code paths. To support delivery of input events to the mime handler renderer process it is now necessary to route events via the correct RWHV interface. For Aura-based platforms (Windows/Linux) this means RWHVAura::On*Event and for macOS this means RWHVMac::RouteOrProcess*Event. Since Aura uses UI event types these have become the source of truth on Aura-based platforms with conversion to Web event types when needed (primarily for OSR). This change also adds a timeout for CefProcessHostMsg_GetNewBrowserInfo to avoid a hung renderer process if the guest WebContents route is not registered via CefMimeHandlerViewGuestDelegate::OnGuestDetached as expected prior to CefBrowserInfoManager::OnGetNewBrowserInfo being called. This timeout can be disabled for testing purposes by passing the `--disable-new-browser-info-timeout` command-line flag. The `--disable-features=MimeHandlerViewInCrossProcessFrame` command-line flag can be used for a limited time to restore the previous implementation based on BrowserPlugin. That implementation will be deleted starting with the 3897 branch update. Known issues: - ExecuteJavaScript calls on the frame hosting the PDF extension will not be routed to the mime handler renderer process. - The PDF extension will not load successfully if blocked by ChromePluginPlaceholder and then manually continued via the "Run this plugin" context menu option (see https://crbug.com/533069#c41).
2025-06-05 21:39:12 +02:00 · 2020-01-23 16:58:01 -05:00
parent f2f6ae4f29
commit a12c2ab3e1
38 changed files with 1030 additions and 917 deletions
--- a/libcef/browser/native/browser_platform_delegate_native_mac.mm
+++ b/libcef/browser/native/browser_platform_delegate_native_mac.mm
@@ -17,6 +17,7 @@
 #include "base/mac/scoped_nsautorelease_pool.h"
 #include "base/memory/ptr_util.h"
 #include "base/threading/thread_restrictions.h"
+#include "content/browser/renderer_host/render_widget_host_view_mac.h"
 #include "content/public/browser/native_web_keyboard_event.h"
 #include "content/public/browser/render_widget_host_view.h"
 #include "content/public/browser/web_contents.h"
@@ -25,6 +26,7 @@
 #include "third_party/blink/public/platform/web_mouse_wheel_event.h"
 #import "ui/base/cocoa/cocoa_base_utils.h"
 #import "ui/base/cocoa/underlay_opengl_hosting_window.h"
+#include "ui/events/base_event_utils.h"
 #include "ui/events/keycodes/keyboard_codes_posix.h"
 #include "ui/gfx/geometry/rect.h"

@@ -255,9 +257,61 @@ CefWindowHandle CefBrowserPlatformDelegateNativeMac::GetHostWindowHandle()
  return window_info_.view;
 }

+void CefBrowserPlatformDelegateNativeMac::SendKeyEvent(
+    const CefKeyEvent& event) {
+  auto view = GetHostView();
+  if (!view)
+    return;
+
+  content::NativeWebKeyboardEvent web_event = TranslateWebKeyEvent(event);
+  view->ForwardKeyboardEvent(web_event, ui::LatencyInfo());
+}
+
+void CefBrowserPlatformDelegateNativeMac::SendMouseClickEvent(
+    const CefMouseEvent& event,
+    CefBrowserHost::MouseButtonType type,
+    bool mouseUp,
+    int clickCount) {
+  auto view = GetHostView();
+  if (!view)
+    return;
+
+  blink::WebMouseEvent web_event =
+      TranslateWebClickEvent(event, type, mouseUp, clickCount);
+  view->RouteOrProcessMouseEvent(web_event);
+}
+
+void CefBrowserPlatformDelegateNativeMac::SendMouseMoveEvent(
+    const CefMouseEvent& event,
+    bool mouseLeave) {
+  auto view = GetHostView();
+  if (!view)
+    return;
+
+  blink::WebMouseEvent web_event = TranslateWebMoveEvent(event, mouseLeave);
+  view->RouteOrProcessMouseEvent(web_event);
+}
+
+void CefBrowserPlatformDelegateNativeMac::SendMouseWheelEvent(
+    const CefMouseEvent& event,
+    int deltaX,
+    int deltaY) {
+  auto view = GetHostView();
+  if (!view)
+    return;
+
+  blink::WebMouseWheelEvent web_event =
+      TranslateWebWheelEvent(event, deltaX, deltaY);
+  view->RouteOrProcessMouseEvent(web_event);
+}
+
+void CefBrowserPlatformDelegateNativeMac::SendTouchEvent(
+    const CefTouchEvent& event) {
+  NOTIMPLEMENTED();
+}
+
 void CefBrowserPlatformDelegateNativeMac::SendFocusEvent(bool setFocus) {
-  content::RenderWidgetHostView* view =
-      browser_->web_contents()->GetRenderWidgetHostView();
+  auto view = GetHostView();
  if (view) {
    view->SetActive(setFocus);

@@ -304,15 +358,51 @@ bool CefBrowserPlatformDelegateNativeMac::HandleKeyboardEvent(
 // static
 void CefBrowserPlatformDelegate::HandleExternalProtocol(const GURL& url) {}

-void CefBrowserPlatformDelegateNativeMac::TranslateKeyEvent(
-    content::NativeWebKeyboardEvent& result,
+CefEventHandle CefBrowserPlatformDelegateNativeMac::GetEventHandle(
+    const content::NativeWebKeyboardEvent& event) const {
+  return event.os_event;
+}
+
+std::unique_ptr<CefFileDialogRunner>
+CefBrowserPlatformDelegateNativeMac::CreateFileDialogRunner() {
+  return base::WrapUnique(new CefFileDialogRunnerMac);
+}
+
+std::unique_ptr<CefJavaScriptDialogRunner>
+CefBrowserPlatformDelegateNativeMac::CreateJavaScriptDialogRunner() {
+  return base::WrapUnique(new CefJavaScriptDialogRunnerMac);
+}
+
+std::unique_ptr<CefMenuRunner>
+CefBrowserPlatformDelegateNativeMac::CreateMenuRunner() {
+  return base::WrapUnique(new CefMenuRunnerMac);
+}
+
+gfx::Point CefBrowserPlatformDelegateNativeMac::GetDialogPosition(
+    const gfx::Size& size) {
+  // Dialogs are always re-positioned by the constrained window sheet controller
+  // so nothing interesting to return yet.
+  return gfx::Point();
+}
+
+gfx::Size CefBrowserPlatformDelegateNativeMac::GetMaximumDialogSize() {
+  // The dialog should try to fit within the overlay for the web contents.
+  // Note that, for things like print preview, this is just a suggested maximum.
+  return browser_->web_contents()->GetContainerBounds().size();
+}
+
+content::NativeWebKeyboardEvent
+CefBrowserPlatformDelegateNativeMac::TranslateWebKeyEvent(
    const CefKeyEvent& key_event) const {
+  content::NativeWebKeyboardEvent result(blink::WebInputEvent::kUndefined,
+                                         blink::WebInputEvent::kNoModifiers,
+                                         ui::EventTimeForNow());
+
  // Use a synthetic NSEvent in order to obtain the windowsKeyCode member from
  // the NativeWebKeyboardEvent constructor. This is the only member which can
  // not be easily translated (without hardcoding keyCodes)
  // Determining whether a modifier key is left or right seems to be done
  // through the key code as well.
-
  NSEventType event_type;
  if (key_event.character == 0 && key_event.unmodified_character == 0) {
    // Check if both character and unmodified_characther are empty to determine
@@ -357,15 +447,18 @@ void CefBrowserPlatformDelegateNativeMac::TranslateKeyEvent(
    result.SetType(blink::WebInputEvent::kChar);

  result.is_system_key = key_event.is_system_key;
+
+  return result;
 }

-void CefBrowserPlatformDelegateNativeMac::TranslateClickEvent(
-    blink::WebMouseEvent& result,
+blink::WebMouseEvent
+CefBrowserPlatformDelegateNativeMac::TranslateWebClickEvent(
    const CefMouseEvent& mouse_event,
    CefBrowserHost::MouseButtonType type,
    bool mouseUp,
    int clickCount) const {
-  TranslateMouseEvent(result, mouse_event);
+  blink::WebMouseEvent result;
+  TranslateWebMouseEvent(result, mouse_event);

  switch (type) {
    case MBT_LEFT:
@@ -388,13 +481,15 @@ void CefBrowserPlatformDelegateNativeMac::TranslateClickEvent(
  }

  result.click_count = clickCount;
+
+  return result;
 }

-void CefBrowserPlatformDelegateNativeMac::TranslateMoveEvent(
-    blink::WebMouseEvent& result,
+blink::WebMouseEvent CefBrowserPlatformDelegateNativeMac::TranslateWebMoveEvent(
    const CefMouseEvent& mouse_event,
    bool mouseLeave) const {
-  TranslateMouseEvent(result, mouse_event);
+  blink::WebMouseEvent result;
+  TranslateWebMouseEvent(result, mouse_event);

  if (!mouseLeave) {
    result.SetType(blink::WebInputEvent::kMouseMove);
@@ -412,15 +507,17 @@ void CefBrowserPlatformDelegateNativeMac::TranslateMoveEvent(
  }

  result.click_count = 0;
+
+  return result;
 }

-void CefBrowserPlatformDelegateNativeMac::TranslateWheelEvent(
-    blink::WebMouseWheelEvent& result,
+blink::WebMouseWheelEvent
+CefBrowserPlatformDelegateNativeMac::TranslateWebWheelEvent(
    const CefMouseEvent& mouse_event,
    int deltaX,
    int deltaY) const {
-  result = blink::WebMouseWheelEvent();
-  TranslateMouseEvent(result, mouse_event);
+  blink::WebMouseWheelEvent result;
+  TranslateWebMouseEvent(result, mouse_event);

  result.SetType(blink::WebInputEvent::kMouseWheel);

@@ -429,7 +526,8 @@ void CefBrowserPlatformDelegateNativeMac::TranslateWheelEvent(
  result.delta_y = deltaY;
  result.wheel_ticks_x = deltaX / scrollbarPixelsPerCocoaTick;
  result.wheel_ticks_y = deltaY / scrollbarPixelsPerCocoaTick;
-  result.delta_units = ui::input_types::ScrollGranularity::kScrollByPrecisePixel;
+  result.delta_units =
+      ui::input_types::ScrollGranularity::kScrollByPrecisePixel;

  if (mouse_event.modifiers & EVENTFLAG_LEFT_MOUSE_BUTTON)
    result.button = blink::WebMouseEvent::Button::kLeft;
@@ -439,29 +537,11 @@ void CefBrowserPlatformDelegateNativeMac::TranslateWheelEvent(
    result.button = blink::WebMouseEvent::Button::kRight;
  else
    result.button = blink::WebMouseEvent::Button::kNoButton;
+
+  return result;
 }

-CefEventHandle CefBrowserPlatformDelegateNativeMac::GetEventHandle(
-    const content::NativeWebKeyboardEvent& event) const {
-  return event.os_event;
-}
-
-std::unique_ptr<CefFileDialogRunner>
-CefBrowserPlatformDelegateNativeMac::CreateFileDialogRunner() {
-  return base::WrapUnique(new CefFileDialogRunnerMac);
-}
-
-std::unique_ptr<CefJavaScriptDialogRunner>
-CefBrowserPlatformDelegateNativeMac::CreateJavaScriptDialogRunner() {
-  return base::WrapUnique(new CefJavaScriptDialogRunnerMac);
-}
-
-std::unique_ptr<CefMenuRunner>
-CefBrowserPlatformDelegateNativeMac::CreateMenuRunner() {
-  return base::WrapUnique(new CefMenuRunnerMac);
-}
-
-void CefBrowserPlatformDelegateNativeMac::TranslateMouseEvent(
+void CefBrowserPlatformDelegateNativeMac::TranslateWebMouseEvent(
    blink::WebMouseEvent& result,
    const CefMouseEvent& mouse_event) const {
  // position
@@ -473,24 +553,17 @@ void CefBrowserPlatformDelegateNativeMac::TranslateMouseEvent(

  // modifiers
  result.SetModifiers(result.GetModifiers() |
-                      TranslateModifiers(mouse_event.modifiers));
+                      TranslateWebEventModifiers(mouse_event.modifiers));

-  // timestamp - Mac OSX specific
+  // timestamp
  result.SetTimeStamp(base::TimeTicks() +
                      base::TimeDelta::FromSeconds(currentEventTimestamp()));

  result.pointer_type = blink::WebPointerProperties::PointerType::kMouse;
 }

-gfx::Point CefBrowserPlatformDelegateNativeMac::GetDialogPosition(
-    const gfx::Size& size) {
-  // Dialogs are always re-positioned by the constrained window sheet controller
-  // so nothing interesting to return yet.
-  return gfx::Point();
-}
-
-gfx::Size CefBrowserPlatformDelegateNativeMac::GetMaximumDialogSize() {
-  // The dialog should try to fit within the overlay for the web contents.
-  // Note that, for things like print preview, this is just a suggested maximum.
-  return browser_->web_contents()->GetContainerBounds().size();
+content::RenderWidgetHostViewMac*
+CefBrowserPlatformDelegateNativeMac::GetHostView() const {
+  return static_cast<content::RenderWidgetHostViewMac*>(
+      browser_->web_contents()->GetRenderWidgetHostView());
 }