Home Explore 引导页 在线工具 Blog
Register Sign In
Pchen0
/
electron
1
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Tree: c9b7806418
Branches Tags
electron
/
patches
/
chromium
/
picture-in-picture.patch

picture-in-picture.patch 3.4 KB
History Raw

1234567891011121314151617181920212223242526272829303132333435363738394041424344454647484950515253545556575859606162636465666768697071727374 
  1. From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
    2. 

  2. From: Heilig Benedek <[email protected]>
    3. 

  3. Date: Sat, 10 Aug 2019 00:41:50 +0200
    4. 

  4. Subject: feat: enable picture in picture mode for video players
    5. 

  5. 

  6. These files are needed to implement PiP, but the Electron build patches out
    7. 

  7. chrome's generated resources for our own. This updates the #include so that we
    8. 

  8. don't get errors for Chrome's generated resources, which are non-existent
    9. 

  9. because we don't generate them in our build.
    10. 

  10. 

  11. diff --git a/chrome/browser/ui/views/overlay/close_image_button.cc b/chrome/browser/ui/views/overlay/close_image_button.cc
    12. 

  12. index d236578cefc347e772305ac7ec54b9734e4aa20b..6bb89cea3b6b91ec8ea351ed60c4e4056a6340bb 100644
    13. 

  13. --- a/chrome/browser/ui/views/overlay/close_image_button.cc
    14. 

  14. +++ b/chrome/browser/ui/views/overlay/close_image_button.cc
    15. 

  15. @@ -4,10 +4,13 @@
    16. 

  16.  
    17. 

  17.  #include "chrome/browser/ui/views/overlay/close_image_button.h"
    18. 

  18.  
    19. 

  19. +#include "build/branding_buildflags.h"
    20. 

  20.  #include "build/chromeos_buildflags.h"
    21. 

  21.  #include "chrome/browser/ui/color/chrome_color_id.h"
    22. 

  22.  #include "chrome/grit/generated_resources.h"
    23. 

  23. +#if BUILDFLAG(GOOGLE_CHROME_BRANDING)
    24. 

  24.  #include "components/vector_icons/vector_icons.h"
    25. 

  25. +#endif  // BUILDFLAG(GOOGLE_CHROME_BRANDING)
    26. 

  26.  #include "ui/base/l10n/l10n_util.h"
    27. 

  27.  #include "ui/base/metadata/metadata_impl_macros.h"
    28. 

  28.  #include "ui/base/models/image_model.h"
    29. 

  29. @@ -27,7 +30,10 @@ CloseImageButton::CloseImageButton(PressedCallback callback)
    30. 

  30.      : OverlayWindowImageButton(std::move(callback)) {
    31. 

  31.    SetSize(gfx::Size(kCloseButtonSize, kCloseButtonSize));
    32. 

  32.  
    33. 

  33. -  auto* icon = &vector_icons::kCloseChromeRefreshIcon;
    34. 

  34. +  auto* icon = &views::kIcCloseIcon;
    35. 

  35. +#if BUILDFLAG(GOOGLE_CHROME_BRANDING)
    36. 

  36. +  icon = &vector_icons::kCloseChromeRefreshIcon;
    37. 

  37. +#endif  // BUILDFLAG(GOOGLE_CHROME_BRANDING)
    38. 

  38.    SetImageModel(views::Button::STATE_NORMAL,
    39. 

  39.                  ui::ImageModel::FromVectorIcon(*icon, kColorPipWindowForeground,
    40. 

  40.                                                 kCloseButtonIconSize));
    41. 

  41. diff --git a/chrome/browser/ui/views/overlay/video_overlay_window_views.cc b/chrome/browser/ui/views/overlay/video_overlay_window_views.cc
    42. 

  42. index 2ff9c6dbcb1f6010b39389d0d35662408dd53aaa..8e96d85a16ce8b5e679df52860db6773c76b49f8 100644
    43. 

  43. --- a/chrome/browser/ui/views/overlay/video_overlay_window_views.cc
    44. 

  44. +++ b/chrome/browser/ui/views/overlay/video_overlay_window_views.cc
    45. 

  45. @@ -17,9 +17,11 @@
    46. 

  46.  #include "build/build_config.h"
    47. 

  47.  #include "chrome/browser/picture_in_picture/picture_in_picture_occlusion_tracker.h"
    48. 

  48.  #include "chrome/browser/picture_in_picture/picture_in_picture_window_manager.h"
    49. 

  49. +#if 0
    50. 

  50.  #include "chrome/browser/profiles/profile.h"
    51. 

  51.  #include "chrome/browser/ui/browser.h"
    52. 

  52.  #include "chrome/browser/ui/browser_finder.h"
    53. 

  53. +#endif
    54. 

  54.  #include "chrome/browser/ui/color/chrome_color_id.h"
    55. 

  55.  #include "chrome/browser/ui/views/overlay/back_to_tab_label_button.h"
    56. 

  56.  #include "chrome/browser/ui/views/overlay/close_image_button.h"
    57. 

  57. @@ -61,7 +63,7 @@
    58. 

  58.  #include "ui/aura/window.h"
    59. 

  59.  #endif
    60. 

  60.  
    61. 

  61. -#if BUILDFLAG(IS_WIN)
    62. 

  62. +#if 0
    63. 

  63.  #include "chrome/browser/shell_integration_win.h"
    64. 

  64.  #include "content/public/browser/render_widget_host_view.h"
    65. 

  65.  #include "ui/aura/window.h"
    66. 

  66. @@ -314,7 +316,7 @@ std::unique_ptr<VideoOverlayWindowViews> VideoOverlayWindowViews::Create(
    67. 

  67.    overlay_window->Init(std::move(params));
    68. 

  68.    overlay_window->OnRootViewReady();
    69. 

  69.  
    70. 

  70. -#if BUILDFLAG(IS_WIN)
    71. 

  71. +#if 0
    72. 

  72.    std::wstring app_user_model_id;
    73. 

  73.    Browser* browser = chrome::FindBrowserWithTab(controller->GetWebContents());
    74. 

  74.    if (browser) {
    75.