Skip to content

Commit

Permalink
chore: update patches
Browse files Browse the repository at this point in the history
  • Loading branch information
jkleinsc committed May 17, 2024
1 parent 6af59fd commit 9a77e51
Show file tree
Hide file tree
Showing 9 changed files with 115 additions and 277 deletions.
1 change: 0 additions & 1 deletion patches/chromium/.patches
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,6 @@ build_run_reclient_cfg_generator_after_chrome.patch
fix_getcursorscreenpoint_wrongly_returns_0_0.patch
fix_add_support_for_skipping_first_2_no-op_refreshes_in_thumb_cap.patch
refactor_expose_file_system_access_blocklist.patch
cherry-pick-b2cc7b7ac538.patch
partially_revert_is_newly_created_to_allow_for_browser_initiated.patch
feat_add_support_for_missing_dialog_features_to_shell_dialogs.patch
fix_partially_revert_invalidate_focusring.patch
99 changes: 0 additions & 99 deletions patches/chromium/cherry-pick-b2cc7b7ac538.patch

This file was deleted.

10 changes: 6 additions & 4 deletions patches/chromium/feat_allow_code_cache_in_custom_schemes.patch
Original file line number Diff line number Diff line change
Expand Up @@ -54,12 +54,13 @@ index 8fc176cfd3a0411521c0f5e4f60b70ca333f60c8..e43f09d80bc9472a027bb11325803aab
- DCHECK(resource_url.SchemeIsHTTPOrHTTPS() ||
- resource_url_is_chrome_or_chrome_untrusted ||
- blink::CommonSchemeRegistry::IsExtensionScheme(resource_url.scheme()));
-
- // |origin_lock| should be either empty or should have
- // Http/Https/chrome/chrome-untrusted schemes and it should not be a URL with
- // opaque origin. Empty origin_locks are allowed when the renderer is not
- // locked to an origin.
- bool origin_lock_is_chrome_or_chrome_untrusted =
+
+ const bool resource_url_embedder =
+ base::Contains(url::GetCodeCacheSchemes(), resource_url.scheme());
+ DCHECK(resource_url_http || resource_url_webui || resource_url_embedder);
Expand All @@ -80,15 +81,16 @@ index 8fc176cfd3a0411521c0f5e4f60b70ca333f60c8..e43f09d80bc9472a027bb11325803aab
- origin_lock_is_chrome_or_chrome_untrusted ||
- blink::CommonSchemeRegistry::IsExtensionScheme(origin_lock.scheme())) &&
- !url::Origin::Create(origin_lock).opaque()));
+ const bool origin_lock_for_embedder =
+ base::Contains(url::GetCodeCacheSchemes(), origin_lock.scheme());

-
- // The chrome and chrome-untrusted schemes are only used with the WebUI
- // code cache type.
- DCHECK_EQ(origin_lock_is_chrome_or_chrome_untrusted,
- cache_type == GeneratedCodeCache::kWebUIJavaScript);
- DCHECK_EQ(resource_url_is_chrome_or_chrome_untrusted,
- cache_type == GeneratedCodeCache::kWebUIJavaScript);
+ const bool origin_lock_for_embedder =
+ base::Contains(url::GetCodeCacheSchemes(), origin_lock.scheme());
+
+ DCHECK(origin_lock_empty || ((origin_lock_for_http || origin_lock_for_webui ||
+ origin_lock_for_embedder) &&
+ !url::Origin::Create(origin_lock).opaque()));
Expand Down
20 changes: 3 additions & 17 deletions patches/chromium/fix_partially_revert_invalidate_focusring.patch
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@ distros. This patch can be reverted when the issue is fixed upstream, or
when the crash is addressed.

diff --git a/ui/views/view.cc b/ui/views/view.cc
index 4116b2a3fad02e1060bb7b137804753cf97dd7ca..46d3b426f54041efe4270bfda453358418fff160 100644
index 30c3972943e7b5eaaf741b1410dc5220636a496f..a291b9f1b2d0de974a859499f5494309b89b3111 100644
--- a/ui/views/view.cc
+++ b/ui/views/view.cc
@@ -928,16 +928,6 @@ void View::Layout(PassKey) {
@@ -943,16 +943,6 @@ void View::SetLayoutManagerUseConstrainedSpace(
}

void View::InvalidateLayout() {
Expand All @@ -30,7 +30,7 @@ index 4116b2a3fad02e1060bb7b137804753cf97dd7ca..46d3b426f54041efe4270bfda4533584
// We should never need to invalidate during a layout call; this tracks
// how many times that is happening.
++invalidates_during_layout_;
@@ -945,11 +935,6 @@ void View::InvalidateLayout() {
@@ -960,11 +950,6 @@ void View::InvalidateLayout() {
// Always invalidate up. This is needed to handle the case of us already being
// valid, but not our parent.
needs_layout_ = true;
Expand All @@ -42,17 +42,3 @@ index 4116b2a3fad02e1060bb7b137804753cf97dd7ca..46d3b426f54041efe4270bfda4533584
if (HasLayoutManager()) {
GetLayoutManager()->InvalidateLayout();
}
diff --git a/ui/views/view.h b/ui/views/view.h
index 8f377e417231698b9146d5b79dc14730e34260f7..9936899e10505f57d3b465d5613d90df8d18ded3 100644
--- a/ui/views/view.h
+++ b/ui/views/view.h
@@ -2339,9 +2339,6 @@ class VIEWS_EXPORT View : public ui::LayerDelegate,
// it is happening.
int invalidates_during_layout_ = 0;

- // Whether this view is in the middle of InvalidateLayout().
- bool invalidating_ = false;
-
// The View's LayoutManager defines the sizing heuristics applied to child
// Views. The default is absolute positioning according to bounds_.
std::unique_ptr<LayoutManager> layout_manager_;
Loading

0 comments on commit 9a77e51

Please sign in to comment.