webview_cross_drag.patch 1.8 KB

12345678910111213141516171819202122232425262728293031323334353637383940
  1. From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
  2. From: Anonymous <[email protected]>
  3. Date: Thu, 20 Sep 2018 17:47:04 -0700
  4. Subject: webview_cross_drag.patch
  5. This allows dragging and dropping between <webview>s.
  6. Originally landed in https://github.com/electron/libchromiumcontent/pull/267
  7. diff --git a/content/browser/web_contents/web_contents_view_aura.cc b/content/browser/web_contents/web_contents_view_aura.cc
  8. index 8a6fd2e52b81f1f541d88c795fbc2697a58f0ea9..9d3efca9c19c9c97c636258017cc16c8bf94b5b1 100644
  9. --- a/content/browser/web_contents/web_contents_view_aura.cc
  10. +++ b/content/browser/web_contents/web_contents_view_aura.cc
  11. @@ -884,10 +884,7 @@ bool WebContentsViewAura::IsValidDragTarget(
  12. // for the outermost view. Inner `WebContents` will have a
  13. // `WebContentsViewChildFrame` so when dragging between an inner
  14. // `WebContents` and its embedder the view IDs will be the same.
  15. - bool cross_tab_drag =
  16. - GetRenderViewHostID(web_contents_->GetRenderViewHost()) !=
  17. - drag_start_->view_id;
  18. - return cross_tab_drag;
  19. + return true;
  20. }
  21. ////////////////////////////////////////////////////////////////////////////////
  22. diff --git a/content/browser/web_contents/web_drag_dest_mac.mm b/content/browser/web_contents/web_drag_dest_mac.mm
  23. index 808e3103cd12d32b54dc80dc122746923db83138..298ad238a2d26603b2af8f9143fa5881ba09184a 100644
  24. --- a/content/browser/web_contents/web_drag_dest_mac.mm
  25. +++ b/content/browser/web_contents/web_drag_dest_mac.mm
  26. @@ -422,9 +422,7 @@ - (void)resetDragStartTrackers {
  27. }
  28. - (bool)isValidDragTarget:(content::RenderWidgetHostImpl*)targetRWH {
  29. - return targetRWH->GetProcess()->GetID() == _dragStartProcessID ||
  30. - GetRenderViewHostID(_webContents->GetRenderViewHost()) !=
  31. - _dragStartViewID;
  32. + return YES;
  33. }
  34. @end