Skip to content

Commit

Permalink
[AUTO] Patches auto-rebase
Browse files Browse the repository at this point in the history
  • Loading branch information
uazo authored and github-actions[bot] committed Dec 4, 2024
1 parent 47640b5 commit 1612575
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 14 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
diff --git a/components/omnibox/browser/autocomplete_result.cc b/components/omnibox/browser/autocomplete_result.cc
--- a/components/omnibox/browser/autocomplete_result.cc
+++ b/components/omnibox/browser/autocomplete_result.cc
@@ -89,10 +89,11 @@ constexpr size_t kMaxPedalMatchIndex =
@@ -90,10 +90,11 @@ constexpr size_t kMaxPedalMatchIndex =

// static
size_t AutocompleteResult::GetMaxMatches(bool is_zero_suggest) {
Expand Down
4 changes: 2 additions & 2 deletions build/patches/Multiple-fingerprinting-mitigations.patch
Original file line number Diff line number Diff line change
Expand Up @@ -481,7 +481,7 @@ diff --git a/third_party/blink/renderer/modules/canvas/canvas2d/base_rendering_c
#include "ui/gfx/geometry/vector2d.h"
#include "ui/gfx/geometry/vector2d_f.h"
#include "v8/include/v8-local-handle.h"
@@ -2928,6 +2933,10 @@ ImageData* BaseRenderingContext2D::getImageDataInternal(
@@ -2918,6 +2923,10 @@ ImageData* BaseRenderingContext2D::getImageDataInternal(
snapshot->PaintImageForCurrentFrame().GetSkImageInfo().bounds();
DCHECK(!bounds.intersect(SkIRect::MakeXYWH(sx, sy, sw, sh)));
}
Expand All @@ -492,7 +492,7 @@ diff --git a/third_party/blink/renderer/modules/canvas/canvas2d/base_rendering_c
}

return image_data;
@@ -3618,8 +3627,22 @@ TextMetrics* BaseRenderingContext2D::measureText(const String& text) {
@@ -3608,8 +3617,22 @@ TextMetrics* BaseRenderingContext2D::measureText(const String& text) {
const CanvasRenderingContext2DState& state = GetState();
TextDirection direction = ToTextDirection(state.GetDirection(), canvas);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -268,63 +268,63 @@ diff --git a/third_party/blink/renderer/core/loader/modulescript/worker_module_s
diff --git a/third_party/blink/renderer/core/workers/dedicated_worker.cc b/third_party/blink/renderer/core/workers/dedicated_worker.cc
--- a/third_party/blink/renderer/core/workers/dedicated_worker.cc
+++ b/third_party/blink/renderer/core/workers/dedicated_worker.cc
@@ -370,6 +370,7 @@ void DedicatedWorker::OnHostCreated(
@@ -371,6 +371,7 @@ void DedicatedWorker::OnHostCreated(
nullptr /* worker_main_script_load_params */,
network::mojom::ReferrerPolicy::kDefault,
Vector<network::mojom::blink::ContentSecurityPolicyPtr>(),
+ std::nullopt /* response_address_space */,
String() /* source_code */, reject_coep_unsafe_none,
std::move(back_forward_cache_controller_host));
return;
@@ -427,6 +428,7 @@ void DedicatedWorker::OnScriptLoadStarted(
@@ -430,6 +431,7 @@ void DedicatedWorker::OnScriptLoadStarted(
ContinueStart(script_request_url_, std::move(worker_main_script_load_params),
network::mojom::ReferrerPolicy::kDefault,
Vector<network::mojom::blink::ContentSecurityPolicyPtr>(),
+ std::nullopt /* response_address_space */,
String() /* source_code */, RejectCoepUnsafeNone(false),
std::move(back_forward_cache_controller_host));
}
@@ -499,6 +501,7 @@ void DedicatedWorker::OnFinished(
@@ -502,6 +504,7 @@ void DedicatedWorker::OnFinished(
? mojo::Clone(classic_script_loader_->GetContentSecurityPolicy()
->GetParsedPolicies())
: Vector<network::mojom::blink::ContentSecurityPolicyPtr>(),
+ classic_script_loader_->ResponseAddressSpace(),
classic_script_loader_->SourceText(), RejectCoepUnsafeNone(false),
std::move(back_forward_cache_controller_host));
probe::ScriptImported(GetExecutionContext(),
@@ -515,6 +518,7 @@ void DedicatedWorker::ContinueStart(
@@ -518,6 +521,7 @@ void DedicatedWorker::ContinueStart(
network::mojom::ReferrerPolicy referrer_policy,
Vector<network::mojom::blink::ContentSecurityPolicyPtr>
response_content_security_policies,
+ std::optional<network::mojom::IPAddressSpace> response_address_space,
const String& source_code,
RejectCoepUnsafeNone reject_coep_unsafe_none,
mojo::PendingRemote<mojom::blink::BackForwardCacheControllerHost>
@@ -537,6 +541,7 @@ void DedicatedWorker::ContinueStart(
@@ -540,6 +544,7 @@ void DedicatedWorker::ContinueStart(
std::move(worker_main_script_load_params),
std::move(referrer_policy),
std::move(response_content_security_policies),
+ response_address_space,
source_code, reject_coep_unsafe_none,
std::move(back_forward_cache_controller_host)),
base::Milliseconds(features::kDedicatedWorkerStartDelayInMs.Get()));
@@ -545,6 +550,7 @@ void DedicatedWorker::ContinueStart(
@@ -548,6 +553,7 @@ void DedicatedWorker::ContinueStart(
ContinueStartInternal(script_url, std::move(worker_main_script_load_params),
std::move(referrer_policy),
std::move(response_content_security_policies),
+ response_address_space,
source_code, reject_coep_unsafe_none,
std::move(back_forward_cache_controller_host));
}
@@ -556,6 +562,7 @@ void DedicatedWorker::ContinueStartInternal(
@@ -559,6 +565,7 @@ void DedicatedWorker::ContinueStartInternal(
network::mojom::ReferrerPolicy referrer_policy,
Vector<network::mojom::blink::ContentSecurityPolicyPtr>
response_content_security_policies,
+ std::optional<network::mojom::IPAddressSpace> response_address_space,
const String& source_code,
RejectCoepUnsafeNone reject_coep_unsafe_none,
mojo::PendingRemote<mojom::blink::BackForwardCacheControllerHost>
@@ -567,7 +574,8 @@ void DedicatedWorker::ContinueStartInternal(
@@ -570,7 +577,8 @@ void DedicatedWorker::ContinueStartInternal(
context_proxy_->StartWorkerGlobalScope(
CreateGlobalScopeCreationParams(
script_url, referrer_policy,
Expand All @@ -334,7 +334,7 @@ diff --git a/third_party/blink/renderer/core/workers/dedicated_worker.cc b/third
std::move(worker_main_script_load_params), options_, script_url,
*outside_fetch_client_settings_object_, v8_stack_trace_id_, source_code,
reject_coep_unsafe_none, token_,
@@ -604,7 +612,8 @@ DedicatedWorker::CreateGlobalScopeCreationParams(
@@ -607,7 +615,8 @@ DedicatedWorker::CreateGlobalScopeCreationParams(
const KURL& script_url,
network::mojom::ReferrerPolicy referrer_policy,
Vector<network::mojom::blink::ContentSecurityPolicyPtr>
Expand All @@ -344,7 +344,7 @@ diff --git a/third_party/blink/renderer/core/workers/dedicated_worker.cc b/third
base::UnguessableToken parent_devtools_token;
std::unique_ptr<WorkerSettings> settings;
ExecutionContext* execution_context = GetExecutionContext();
@@ -653,6 +662,7 @@ DedicatedWorker::CreateGlobalScopeCreationParams(
@@ -656,6 +665,7 @@ DedicatedWorker::CreateGlobalScopeCreationParams(
execution_context->GetSecurityOrigin(),
execution_context->IsSecureContext(), execution_context->GetHttpsState(),
MakeGarbageCollected<WorkerClients>(), CreateWebContentSettingsClient(),
Expand Down
2 changes: 1 addition & 1 deletion build/patches/Viewport-Protection-flag.patch
Original file line number Diff line number Diff line change
Expand Up @@ -313,7 +313,7 @@ diff --git a/third_party/blink/renderer/core/css/media_values.cc b/third_party/b
diff --git a/third_party/blink/renderer/core/css/resolver/style_resolver.cc b/third_party/blink/renderer/core/css/resolver/style_resolver.cc
--- a/third_party/blink/renderer/core/css/resolver/style_resolver.cc
+++ b/third_party/blink/renderer/core/css/resolver/style_resolver.cc
@@ -2145,7 +2145,12 @@ ComputedStyleBuilder StyleResolver::InitialStyleBuilderForElement() const {
@@ -2210,7 +2210,12 @@ ComputedStyleBuilder StyleResolver::InitialStyleBuilderForElement() const {
ComputedStyleBuilder builder = CreateComputedStyleBuilder();
builder.SetRtlOrdering(GetDocument().VisuallyOrdered() ? EOrder::kVisual
: EOrder::kLogical);
Expand Down

0 comments on commit 1612575

Please sign in to comment.