mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

chore: bump chromium to 134.0.6998.3 (35-x-y) (#45460)

Browse source 
* chore: bump chromium in DEPS to 134.0.6998.1

* chore: bump chromium in DEPS to 134.0.6998.5

* chore: bump chromium in DEPS to 134.0.6998.3

* chore: bump chromium to 134.0.6988.0 (main) (#45334)

* chore: bump chromium in DEPS to 134.0.6976.0

* chore: update mas_avoid_private_macos_api_usage.patch.patch
6171046
process_info_mac.cc -> process_info_mac.mm

* chore: update build_do_not_depend_on_packed_resource_integrity.patch
6196857

* chore: update feat_add_support_for_missing_dialog_features_to_shell_dialogs.patch
6182296
6183404
6187853

A lot changed in the upstream implementation. There's a good chance I got
this wrong as threading has changed and moved some variables into globals.

* chore: remove build_remove_vr_directx_helpers_dependency.patch
6186102
This landed upstream

* chore: e patches all

* chore: update net::CookieInclusionStatus::ExclusionReason enum
6183252
6185544

* chore: update content::WebAuthenticationDelegate import
6189769

* Revert "chore: disable focus handling test due to win32/ia32 regression"

This reverts commit 1a57ba5d59848d0c841ddda59c9299a4f957452a.

* chore: bump chromium in DEPS to 134.0.6978.0

* chore: bump chromium in DEPS to 134.0.6980.0

* chore: bump chromium in DEPS to 134.0.6982.0

* chore: bump chromium in DEPS to 134.0.6984.0

* 6196281: Allow direct embedder IsPdfInternalPluginAllowedOrigin() interaction
6196281

* 6196283: Delete PdfInternalPluginDelegate
6196283

* chore: update patches

* chore: bump chromium in DEPS to 134.0.6986.0

* chore: update patches

* 6205762: Support option to use window.showSaveFilePicker() in PDF attachment code
6205762

See also:
* https://issues.chromium.org/issues/373852607
* 5939153: [PDF] Add PdfUseShowSaveFilePicker feature flag | 5939153
* 6205761: Delete spurious Ink-specific code in pdf_viewer.ts | 6205761

* 6209609: Remove WebVector: Automatic changes
6209609

* 6205488: UI: make QT5 optional
6205488

* 6178281: Rename pak files from branding strings
6178281

* fixup! 6209609: Remove WebVector: Automatic changes 6209609

* 6193249: Switch from safe_browsing::EventResult to enterprise_connectors:EventResult
6193249

* 6197457: Remove Pause/ResumeReadingBodyFromNet IPCs
6197457

* 6191230: Record total time spent on a picture in picture window
6191230

* chore: bump chromium in DEPS to 134.0.6988.0

* chore: update patches

* 6215440: Remove base/ranges/.
6215440

* Disable unsafe buffers error

Not sure what changed, but we're now seeing unsafe buffer errors in Chromium code, at least when using reclient. Will update this comment if we find out the cause.

* 6187853: SelectFileDialogLinuxPortal: Use dbus_xdg::Request and DbusType
6187853

* fix `setDisplayMediaRequestHandler` test

Given how this test is written, I would expect this assertion to be false. It seems the oppositue was true before, but that was also acknowledged to be suprising. Seems that the underlying implementation is now fixed and works as expected.

* fixup! 6187853: SelectFileDialogLinuxPortal: Use dbus_xdg::Request and DbusType 6187853

* chore: udpate patches

* Multiple PRS: 6185544 | 6183252

* fix: cast enum class to numeric type

* fix: add 1 to MAX_EXCLUSION_REASON because enum values are zero-based, and we want the total count of reasons.

* Reapply "chore: disable focus handling test due to win32/ia32 regression"

This reverts commit 760b1a519b5919b483c66bc3096eeefb4d7011f4.

* refactor: use ExclusionReasonBitset::kValueCount for size

---------

Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com>
Co-authored-by: Samuel Maddock <smaddock@slack-corp.com>
Co-authored-by: clavin <clavin@electronjs.org>
Co-authored-by: alice <alice@makenotion.com>
Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org>
(cherry picked from commit 213165a467)

---------

Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com>
This commit is contained in:
electron-roller[bot] 2025-02-07 11:14:12 -05:00 • committed by GitHub
parent 9d9d1afb2e
commit 3b421ef77f
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
96 changed files with 542 additions and 679 deletions
Download patch file Download diff file Expand all files Collapse all files

63
shell/browser/api/electron_api_cookies.cc
View file

@ -178,85 +178,88 @@ base::Time ParseTimeProperty(const std::optional<double>& value) {
const std::string InclusionStatusToString(net::CookieInclusionStatus status) {
// See net/cookies/cookie_inclusion_status.h for cookie error descriptions.
using Status = net::CookieInclusionStatus;
using Reason = net::CookieInclusionStatus::ExclusionReason;
static constexpr auto Reasons =
base::MakeFixedFlatMap<Reason, std::string_view>(
{{Status::EXCLUDE_UNKNOWN_ERROR, "Unknown error"},
{Status::EXCLUDE_HTTP_ONLY,
{{Reason::EXCLUDE_UNKNOWN_ERROR, "Unknown error"},
{Reason::EXCLUDE_HTTP_ONLY,
"The cookie was HttpOnly, but the attempted access was through a "
"non-HTTP API."},
{Status::EXCLUDE_SECURE_ONLY,
{Reason::EXCLUDE_SECURE_ONLY,
"The cookie was Secure, but the URL was not allowed to access "
"Secure cookies."},
{Status::EXCLUDE_DOMAIN_MISMATCH,
{Reason::EXCLUDE_DOMAIN_MISMATCH,
"The cookie's domain attribute did not match the domain of the URL "
"attempting access."},
{Status::EXCLUDE_NOT_ON_PATH,
{Reason::EXCLUDE_NOT_ON_PATH,
"The cookie's path attribute did not match the path of the URL "
"attempting access."},
{Status::EXCLUDE_SAMESITE_STRICT,
{Reason::EXCLUDE_SAMESITE_STRICT,
"The cookie had SameSite=Strict, and the attempted access did not "
"have an appropriate SameSiteCookieContext"},
{Status::EXCLUDE_SAMESITE_LAX,
{Reason::EXCLUDE_SAMESITE_LAX,
"The cookie had SameSite=Lax, and the attempted access did not "
"have "
"an appropriate SameSiteCookieContext"},
{Status::EXCLUDE_SAMESITE_UNSPECIFIED_TREATED_AS_LAX,
{Reason::EXCLUDE_SAMESITE_UNSPECIFIED_TREATED_AS_LAX,
"The cookie did not specify a SameSite attribute, and therefore "
"was treated as if it were SameSite=Lax, and the attempted "
"access did not have an appropriate SameSiteCookieContext."},
{Status::EXCLUDE_SAMESITE_NONE_INSECURE,
{Reason::EXCLUDE_SAMESITE_NONE_INSECURE,
"The cookie specified SameSite=None, but it was not Secure."},
{Status::EXCLUDE_USER_PREFERENCES,
{Reason::EXCLUDE_USER_PREFERENCES,
"Caller did not allow access to the cookie."},
{Status::EXCLUDE_FAILURE_TO_STORE,
{Reason::EXCLUDE_FAILURE_TO_STORE,
"The cookie was malformed and could not be stored"},
{Status::EXCLUDE_NONCOOKIEABLE_SCHEME,
{Reason::EXCLUDE_NONCOOKIEABLE_SCHEME,
"Attempted to set a cookie from a scheme that does not support "
"cookies."},
{Status::EXCLUDE_OVERWRITE_SECURE,
{Reason::EXCLUDE_OVERWRITE_SECURE,
"The cookie would have overwritten a Secure cookie, and was not "
"allowed to do so."},
{Status::EXCLUDE_OVERWRITE_HTTP_ONLY,
{Reason::EXCLUDE_OVERWRITE_HTTP_ONLY,
"The cookie would have overwritten an HttpOnly cookie, and was not "
"allowed to do so."},
{Status::EXCLUDE_INVALID_DOMAIN,
{Reason::EXCLUDE_INVALID_DOMAIN,
"The cookie was set with an invalid Domain attribute."},
{Status::EXCLUDE_INVALID_PREFIX,
{Reason::EXCLUDE_INVALID_PREFIX,
"The cookie was set with an invalid __Host- or __Secure- prefix."},
{Status::EXCLUDE_INVALID_PARTITIONED,
{Reason::EXCLUDE_INVALID_PARTITIONED,
"Cookie was set with an invalid Partitioned attribute, which is "
"only valid if the cookie has a __Host- prefix."},
{Status::EXCLUDE_NAME_VALUE_PAIR_EXCEEDS_MAX_SIZE,
{Reason::EXCLUDE_NAME_VALUE_PAIR_EXCEEDS_MAX_SIZE,
"The cookie exceeded the name/value pair size limit."},
{Status::EXCLUDE_ATTRIBUTE_VALUE_EXCEEDS_MAX_SIZE,
{Reason::EXCLUDE_ATTRIBUTE_VALUE_EXCEEDS_MAX_SIZE,
"Cookie exceeded the attribute size limit."},
{Status::EXCLUDE_DOMAIN_NON_ASCII,
{Reason::EXCLUDE_DOMAIN_NON_ASCII,
"The cookie was set with a Domain attribute containing non ASCII "
"characters."},
{Status::EXCLUDE_THIRD_PARTY_BLOCKED_WITHIN_FIRST_PARTY_SET,
{Reason::EXCLUDE_THIRD_PARTY_BLOCKED_WITHIN_FIRST_PARTY_SET,
"The cookie is blocked by third-party cookie blocking but the two "
"sites are in the same First-Party Set"},
{Status::EXCLUDE_PORT_MISMATCH,
{Reason::EXCLUDE_PORT_MISMATCH,
"The cookie's source_port did not match the port of the request."},
{Status::EXCLUDE_SCHEME_MISMATCH,
{Reason::EXCLUDE_SCHEME_MISMATCH,
"The cookie's source_scheme did not match the scheme of the "
"request."},
{Status::EXCLUDE_SHADOWING_DOMAIN,
{Reason::EXCLUDE_SHADOWING_DOMAIN,
"The cookie is a domain cookie and has the same name as an origin "
"cookie on this origin."},
{Status::EXCLUDE_DISALLOWED_CHARACTER,
{Reason::EXCLUDE_DISALLOWED_CHARACTER,
"The cookie contains ASCII control characters"},
{Status::EXCLUDE_THIRD_PARTY_PHASEOUT,
{Reason::EXCLUDE_THIRD_PARTY_PHASEOUT,
"The cookie is blocked for third-party cookie phaseout."},
{Status::EXCLUDE_NO_COOKIE_CONTENT,
{Reason::EXCLUDE_NO_COOKIE_CONTENT,
"The cookie contains no content or only whitespace."},
{Status::EXCLUDE_ALIASING,
{Reason::EXCLUDE_ALIASING,
"Cookie aliases that of another with a different source_port or "
"source scheme. I.e.: Two or more cookies share the same name "
"but have different ports/schemes."}});
static_assert(Reasons.size() == Status::NUM_EXCLUSION_REASONS);
static_assert(
Reasons.size() ==
net::CookieInclusionStatus::ExclusionReasonBitset::kValueCount,
"Please ensure all ExclusionReason variants are enumerated in "
"GetDebugString");
std::ostringstream reason;
reason << "Failed to set cookie - ";