mirror of
https://github.com/electron/electron.git
synced 2026-01-09 15:38:08 -05:00
8a8241163d
* chore: bump chromium in DEPS to 127.0.6526.0
* chore: update network_service_allow_remote_certificate_verification_logic.patch
manually apply patch due to minor upstream shear
Xref: https://chromium-review.googlesource.com/c/chromium/src/+/5598454
* chore: update fix_move_autopipsettingshelper_behind_branding_buildflag.patch
No manual changes; patch applied with fuzz 1
* chore: update refactor_expose_file_system_access_blocklist.patch
No manual changes; patch applied with fuzz 2
* chore: update revert_heap_add_checks_position_info.patch
No manual changes; patch applied with fuzz 1
* chore: e patches all
* chore: bump chromium in DEPS to 127.0.6527.0
* chore: update patches
* chore: bump chromium in DEPS to 127.0.6529.0
* chore: bump chromium in DEPS to 127.0.6531.0
* chore: update patches
* 5596349: Remove PDF OCR toggle from settings.
https://chromium-review.googlesource.com/c/chromium/src/+/5596349
* 5585932: [video-pip] Add minimize button to video picture-in-picture window
https://chromium-review.googlesource.com/c/chromium/src/+/5585932
* 5604487: Reland "[api] Deprecate v8::FunctionCallbackInfo::Holder() for real"
https://chromium-review.googlesource.com/c/v8/v8/+/5604487
* 5581721: [DEPS] Update clang-format location
https://chromium-review.googlesource.com/c/chromium/src/+/5581721
* 5597904: [Windows] Remove ConvertToLongPath from Sandbox Utilities.
https://chromium-review.googlesource.com/c/chromium/src/+/5597904
ResolveNTFunctionPtr was removed in this CL.
* fix: visibility state specs on macOS
Refs https://chromium-review.googlesource.com/c/chromium/src/+/5605407
* Revert "fix: visibility state specs on macOS"
This reverts commit 1eee30a33d.
* temp: disable occlusion checker on macOS
* chore: bump chromium in DEPS to 128.0.6535.0
* chore: update patches
* [Extensions] Move some scriptings files out of the API directory.
Refs https://chromium-review.googlesource.com/c/chromium/src/+/5606682
* fix[node]: do not use soon-to-be-deprecated V8 API
* fix: update api_remove_allcan_read_write.patch
* chore: update patches
* chore: update patches
* chore: fix lf mismatch in api_remove_allcan_read_write.patch
* chore: update patches
* chore: bump chromium in DEPS to 128.0.6538.0
* chore: update v8 patches
* chore: update patches
* ui/gl/features.gni: Set use_egl=true unconditionally.
Refs https://chromium-review.googlesource.com/c/chromium/src/+/5569748
Refs https://issues.chromium.org/issues/344606399
* chore: bump chromium in DEPS to 128.0.6540.0
* chore: bump chromium in DEPS to 128.0.6541.0
* chore: update patches
* chore: fix nan read/write patch
* chore: bump chromium in DEPS to 128.0.6543.0
* 5626254: Use sandbox_type instead of process_type | https://chromium-review.googlesource.com/c/chromium/src/+/5626254
* chore: update patches
* rework nan patches
* 5621488: Apply consistent naming conventions to zoom values | https://chromium-review.googlesource.com/c/chromium/src/+/5621488
* chore: bump chromium in DEPS to 128.0.6544.0
* 5605693: Remove files from third_party/ninja | https://chromium-review.googlesource.com/c/chromium/src/+/5605693
* chore: update patches
* chore: maybe fix nan patch, part 3
* chore: delete nan patch
* chore: re-add nan patch (attempt 2)
* chore: add test patch
* fixup! add test patch
* chore: bump chromium in DEPS to 128.0.6549.0
* chore: bump chromium in DEPS to 128.0.6551.0
* 5637699: Add command line to ASAN Additional Info section | https://chromium-review.googlesource.com/c/chromium/src/+/5637699
* chore: update patches
* chore: bump chromium in DEPS to 128.0.6553.0
* chore: bump chromium in DEPS to 128.0.6555.0
* fix: add property query interceptors
* chore: bump chromium in DEPS to 128.0.6557.0
* 5583182: Automatic Fullscreen: Prototype Permissions API query support | https://chromium-review.googlesource.com/c/chromium/src/+/5583182
* 5613297: Move render input router and related dependencies to //components/input | https://chromium-review.googlesource.com/c/chromium/src/+/5613297
* chore: update patches
* test: skip methodswithdata-test.js nan test
* chore: bump chromium in DEPS to 128.0.6558.0
* chore: update patches
* build: reference correct ninja cipd ref
Ref: https://chromium-review.googlesource.com/c/chromium/src/+/5605693
* update libcxx filenames
* refactor: CursorManager moved to //components/input
Ref: https://chromium-review.googlesource.com/c/chromium/src/+/5613297
* refactor: spanify mojo Read/WriteData methods
Ref: https://chromium-review.googlesource.com/c/chromium/src/+/5619291
* refactor: remove constexpr from KeyboardCodeFromKeyIdentifier
Ref: unknown
Added TODO to investigate after
* chore: update patches
* refactor: improve type safety of a11y ids
Ref: https://chromium-review.googlesource.com/c/chromium/src/+/5614590
* chore: disable tls node tests that don't apply given boringssl tls configuration
Ref: https://boringssl-review.googlesource.com/c/boringssl/+/68487
* chore: add patch to fix nan v8 incompat with NamedPropertyHandlerConfiguration and IndexedPropertyHandlerConfiguration
Ref: https://chromium-review.googlesource.com/c/v8/v8/+/5630388
* fix: limit subspan length per feedback
* Fix incorrect CalculateInsetsInDIP check
* 5645742: Reland "Reland "Add toolchains without PartitionAlloc-Everywhere for dump_syms et al""
https://chromium-review.googlesource.com/c/chromium/src/+/5645742
* chore: more Windows logging
* 5617471: Add NPU blocking to chromium blocklist
https://chromium-review.googlesource.com/c/chromium/src/+/5617471
---------
Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com>
Co-authored-by: Charles Kerr <charles@charleskerr.com>
Co-authored-by: PatchUp <73610968+patchup[bot]@users.noreply.github.com>
Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org>
Co-authored-by: deepak1556 <hop2deep@gmail.com>
Co-authored-by: Keeley Hammond <khammond@slack-corp.com>
Co-authored-by: Alice Zhao <alice@makenotion.com>
Co-authored-by: Samuel Attard <marshallofsound@electronjs.org>
Co-authored-by: VerteDinde <vertedinde@electronjs.org>
Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com>
75 lines
3.4 KiB
Diff
75 lines
3.4 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Heilig Benedek <benecene@gmail.com>
|
|
Date: Sat, 10 Aug 2019 00:41:50 +0200
|
|
Subject: feat: enable picture in picture mode for video players
|
|
|
|
These files are needed to implement PiP, but the Electron build patches out
|
|
chrome's generated resources for our own. This updates the #include so that we
|
|
don't get errors for Chrome's generated resources, which are non-existent
|
|
because we don't generate them in our build.
|
|
|
|
diff --git a/chrome/browser/ui/views/overlay/close_image_button.cc b/chrome/browser/ui/views/overlay/close_image_button.cc
|
|
index d236578cefc347e772305ac7ec54b9734e4aa20b..6bb89cea3b6b91ec8ea351ed60c4e4056a6340bb 100644
|
|
--- a/chrome/browser/ui/views/overlay/close_image_button.cc
|
|
+++ b/chrome/browser/ui/views/overlay/close_image_button.cc
|
|
@@ -4,10 +4,13 @@
|
|
|
|
#include "chrome/browser/ui/views/overlay/close_image_button.h"
|
|
|
|
+#include "build/branding_buildflags.h"
|
|
#include "build/chromeos_buildflags.h"
|
|
#include "chrome/browser/ui/color/chrome_color_id.h"
|
|
#include "chrome/grit/generated_resources.h"
|
|
+#if BUILDFLAG(GOOGLE_CHROME_BRANDING)
|
|
#include "components/vector_icons/vector_icons.h"
|
|
+#endif // BUILDFLAG(GOOGLE_CHROME_BRANDING)
|
|
#include "ui/base/l10n/l10n_util.h"
|
|
#include "ui/base/metadata/metadata_impl_macros.h"
|
|
#include "ui/base/models/image_model.h"
|
|
@@ -27,7 +30,10 @@ CloseImageButton::CloseImageButton(PressedCallback callback)
|
|
: OverlayWindowImageButton(std::move(callback)) {
|
|
SetSize(gfx::Size(kCloseButtonSize, kCloseButtonSize));
|
|
|
|
- auto* icon = &vector_icons::kCloseChromeRefreshIcon;
|
|
+ auto* icon = &views::kIcCloseIcon;
|
|
+#if BUILDFLAG(GOOGLE_CHROME_BRANDING)
|
|
+ icon = &vector_icons::kCloseChromeRefreshIcon;
|
|
+#endif // BUILDFLAG(GOOGLE_CHROME_BRANDING)
|
|
SetImageModel(views::Button::STATE_NORMAL,
|
|
ui::ImageModel::FromVectorIcon(*icon, kColorPipWindowForeground,
|
|
kCloseButtonIconSize));
|
|
diff --git a/chrome/browser/ui/views/overlay/video_overlay_window_views.cc b/chrome/browser/ui/views/overlay/video_overlay_window_views.cc
|
|
index c67f93efc462c2ac7b15ecb3a2ffb2daaccbd1cc..507a695ba97c6321c4d1aa662bdd0206991e6c69 100644
|
|
--- a/chrome/browser/ui/views/overlay/video_overlay_window_views.cc
|
|
+++ b/chrome/browser/ui/views/overlay/video_overlay_window_views.cc
|
|
@@ -17,9 +17,11 @@
|
|
#include "build/build_config.h"
|
|
#include "chrome/browser/picture_in_picture/picture_in_picture_occlusion_tracker.h"
|
|
#include "chrome/browser/picture_in_picture/picture_in_picture_window_manager.h"
|
|
+#if 0
|
|
#include "chrome/browser/profiles/profile.h"
|
|
#include "chrome/browser/ui/browser.h"
|
|
#include "chrome/browser/ui/browser_finder.h"
|
|
+#endif
|
|
#include "chrome/browser/ui/color/chrome_color_id.h"
|
|
#include "chrome/browser/ui/views/overlay/back_to_tab_label_button.h"
|
|
#include "chrome/browser/ui/views/overlay/close_image_button.h"
|
|
@@ -60,7 +62,7 @@
|
|
#include "ui/aura/window.h"
|
|
#endif
|
|
|
|
-#if BUILDFLAG(IS_WIN)
|
|
+#if 0
|
|
#include "chrome/browser/shell_integration_win.h"
|
|
#include "ui/aura/window.h"
|
|
#include "ui/aura/window_tree_host.h"
|
|
@@ -310,7 +312,7 @@ std::unique_ptr<VideoOverlayWindowViews> VideoOverlayWindowViews::Create(
|
|
overlay_window->Init(std::move(params));
|
|
overlay_window->OnRootViewReady();
|
|
|
|
-#if BUILDFLAG(IS_WIN)
|
|
+#if 0
|
|
std::wstring app_user_model_id;
|
|
Browser* browser = chrome::FindBrowserWithTab(controller->GetWebContents());
|
|
if (browser) {
|