chore: bump chromium to 107.0.5274.0 (main) (#35375)
* chore: bump chromium in DEPS to 106.0.5247.1 * chore: update can_create_window.patch Xref:3805043
content/renderer/render_view_impl.cc was removed * chore: update patches/chromium/printing.patch Normal code shear. * chore: update patches/chromium/add_contentgpuclient_precreatemessageloop_callback.patch Xref:3764862
fix minor code shear that caused the patch to not apply * chore: update patches/chromium/picture-in-picture.patch Xref:3781646
Normal code shear. * chore: update patches/chromium/allow_disabling_blink_scheduler_throttling_per_renderview.patch Xref:3805043
content/renderer/render_view_impl.cc was removed Xref:3792324
Normal code shear. * chore: update patches/chromium/feat_add_streaming-protocol_registry_to_multibuffer_data_source.patch Normal code shear. * chore: update patches/chromium/fix_patch_out_profile_refs_in_accessibility_ui.patch Xref:3798548
Normal code shear. * chore: update patches/chromium/build_disable_print_content_analysis.patch Xref:3810473
Normal code shear. * chore: short-circuit_permissions_checks_in_mediastreamdevicescontroller.patch Xref:3807504
Normal code shear. * chore: update patches * chore: bump chromium in DEPS to 106.0.5249.0 * chore: bump chromium in DEPS to 107.0.5250.0 * chore: bump chromium in DEPS to 107.0.5252.0 * chore: bump chromium in DEPS to 107.0.5254.0 * chore: bump chromium in DEPS to 107.0.5256.1 * chore: update v8 patches * chore: update chromium patches * [CodeHealthRotation] base::Value::Dict (v2) migration for //c/b/ui/zoom Refs3778239
* Add support for snapped window states for lacros3810538
* webui: Migrate /chrome/browser/ui/webui URLDataSources to GetMimeType(GURL) Refs3774560
* Provide explicit template arguments to blink::AssociatedInterfaceRegistry::AddInterface Refs3773459
* Make WebScriptExecutionCallback base::OnceCallback Refs3676532
3724623
3675752
* Add implementation of reduce accept language service Refs3687391
* Add PermissionResult in //content/public. Refs3807504
* [Extensions] Add new Webstore domain to extension URLs and clients Refs3793043
* chore: update node patches * chore: fix lint * chore: update filenames.libcxx.gni * fixup! Make WebScriptExecutionCallback base::OnceCallback * chore: bump chromium in DEPS to 107.0.5266.1 * chore: bump chromium in DEPS to 107.0.5268.0 * chore: bump chromium in DEPS to 107.0.5270.1 * chore: update patches * 3848842: [DevTools] Added 'printing-in-progress' error code. https://chromium-review.googlesource.com/c/chromium/src/+/38488 * 3855766: PA: Move the allocator shim files into partition_allocator/shim/ |3855766
* Change gfx::Rect to blink::mojom::WindowFeatures in AddNewContents and some related functions.3835666
* Use base::FunctionRef for the various ForEachRenderFrameHost helpers.3767487
* [loader] Send cached metadata as part of OnReceiveResponse3811219
* 3832927: [json-schema-compiler] Support abs::optional<int>3832927
* Use unique_ptr for BrowserPluginGuestDelegate::CreateNewGuestWindow3847070
* 3847044: [Android] Dismiss select popup upon entering fullscreen3847044
* chore: update patches * chore: add missing header * Migration of chrome/ BrowserContextKeyedServiceFactory to ProfileKeyedServiceFactory Part 123804581
* 3786946: cast pwrite64 arg to long to avoid compilation error on arm3786946
* chore: update patches after rebase * 3846114: float: Implement for lacros p2.3846114
* 3825237: Enable -Wunqualified-std-cast-call3825237
* chore: bump chromium in DEPS to 107.0.5272.0 * chore: update patches * 3835746: Rename PepperPluginInfo to ContentPluginInfo3835746
* 3852542: Plumb drag-image rect from blink to browser to RenderWidgetHostImpl3852542
* 3826169: [json-schema-compiler] Support abs::optional<bool>3826169
Also 3840687: [json-schema-compiler] Support abs::optional<double>3840687
* 3857319: Reland "Remove PrefService::Get"3857319
* 3854614: Rework LinuxUi ownership and creation3854614
* chore: bump chromium in DEPS to 107.0.5274.0 * 3866104: [DownloadBubble] Change download notifications in exclusive_access3866104
* chore: update patches * chore: disable optimization guide for preconnect feature * 3860569: Enable -Wshadow on Linux.3860569
* chore: update patches after rebase * fixup: update to accomodate Wc++98-compat-extra-semi flag * Revert "fixup! Make WebScriptExecutionCallback base::OnceCallback" This reverts commit 0866fe8648671f04e4ea45ceed85db6e4a3b260b. * fixup! Make WebScriptExecutionCallback base::OnceCallback * fixup! Make WebScriptExecutionCallback base::OnceCallback * 3840937: [sandbox] Merge V8_SANDBOXED_POINTERS into V8_ENABLE_SANDBOX3840937
* fixup! chore: update can_create_window.patch * chore: update patches * 53946: Track SSL_ERROR_ZERO_RETURN explicitly. https://boringssl-review.googlesource.com/c/boringssl/+/53946 * fixup: Migration of chrome/ BrowserContextKeyedServiceFactory to ProfileKeyedServiceFactory Part 123804581
* 3805932: [headless] Added print compositor support for OOPIF printing.3805932
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: deepak1556 <hop2deep@gmail.com> Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org> Co-authored-by: PatchUp <73610968+patchup[bot]@users.noreply.github.com> Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com>
This commit is contained in:
parent
f53ca20d41
commit
08ccc81574
154 changed files with 1403 additions and 907 deletions
|
@ -23,6 +23,7 @@
|
|||
#include "shell/common/gin_converters/blink_converter.h"
|
||||
#include "shell/common/gin_converters/callback_converter.h"
|
||||
#include "shell/common/gin_converters/file_path_converter.h"
|
||||
#include "shell/common/gin_converters/value_converter.h"
|
||||
#include "shell/common/gin_helper/dictionary.h"
|
||||
#include "shell/common/gin_helper/error_thrower.h"
|
||||
#include "shell/common/gin_helper/function_template_extensions.h"
|
||||
|
@ -56,27 +57,6 @@
|
|||
|
||||
namespace gin {
|
||||
|
||||
template <>
|
||||
struct Converter<blink::WebLocalFrame::ScriptExecutionType> {
|
||||
static bool FromV8(v8::Isolate* isolate,
|
||||
v8::Local<v8::Value> val,
|
||||
blink::WebLocalFrame::ScriptExecutionType* out) {
|
||||
std::string execution_type;
|
||||
if (!ConvertFromV8(isolate, val, &execution_type))
|
||||
return false;
|
||||
if (execution_type == "asynchronous") {
|
||||
*out = blink::WebLocalFrame::kAsynchronous;
|
||||
} else if (execution_type == "asynchronousBlockingOnload") {
|
||||
*out = blink::WebLocalFrame::kAsynchronousBlockingOnload;
|
||||
} else if (execution_type == "synchronous") {
|
||||
*out = blink::WebLocalFrame::kSynchronous;
|
||||
} else {
|
||||
return false;
|
||||
}
|
||||
return true;
|
||||
}
|
||||
};
|
||||
|
||||
template <>
|
||||
struct Converter<blink::WebCssOrigin> {
|
||||
static bool FromV8(v8::Isolate* isolate,
|
||||
|
@ -132,7 +112,7 @@ bool SpellCheckWord(content::RenderFrame* render_frame,
|
|||
|
||||
#endif
|
||||
|
||||
class ScriptExecutionCallback : public blink::WebScriptExecutionCallback {
|
||||
class ScriptExecutionCallback {
|
||||
public:
|
||||
// for compatibility with the older version of this, error is after result
|
||||
using CompletionCallback =
|
||||
|
@ -144,7 +124,7 @@ class ScriptExecutionCallback : public blink::WebScriptExecutionCallback {
|
|||
CompletionCallback callback)
|
||||
: promise_(std::move(promise)), callback_(std::move(callback)) {}
|
||||
|
||||
~ScriptExecutionCallback() override = default;
|
||||
~ScriptExecutionCallback() = default;
|
||||
|
||||
// disable copy
|
||||
ScriptExecutionCallback(const ScriptExecutionCallback&) = delete;
|
||||
|
@ -193,8 +173,7 @@ class ScriptExecutionCallback : public blink::WebScriptExecutionCallback {
|
|||
}
|
||||
}
|
||||
|
||||
void Completed(
|
||||
const blink::WebVector<v8::Local<v8::Value>>& result) override {
|
||||
void Completed(const blink::WebVector<v8::Local<v8::Value>>& result) {
|
||||
v8::Isolate* isolate = promise_.isolate();
|
||||
if (!result.empty()) {
|
||||
if (!result[0].IsEmpty()) {
|
||||
|
@ -660,13 +639,21 @@ class WebFrameRenderer : public gin::Wrappable<WebFrameRenderer>,
|
|||
ScriptExecutionCallback::CompletionCallback completion_callback;
|
||||
args->GetNext(&completion_callback);
|
||||
|
||||
auto* self = new ScriptExecutionCallback(std::move(promise),
|
||||
std::move(completion_callback));
|
||||
|
||||
render_frame->GetWebFrame()->RequestExecuteScript(
|
||||
blink::DOMWrapperWorld::kMainWorldId, base::make_span(&source, 1),
|
||||
has_user_gesture, blink::WebLocalFrame::kSynchronous,
|
||||
new ScriptExecutionCallback(std::move(promise),
|
||||
std::move(completion_callback)),
|
||||
has_user_gesture ? blink::mojom::UserActivationOption::kActivate
|
||||
: blink::mojom::UserActivationOption::kDoNotActivate,
|
||||
blink::mojom::EvaluationTiming::kSynchronous,
|
||||
blink::mojom::LoadEventBlockingOption::kDoNotBlock,
|
||||
base::NullCallback(),
|
||||
base::BindOnce(&ScriptExecutionCallback::Completed,
|
||||
base::Unretained(self)),
|
||||
blink::BackForwardCacheAware::kAllow,
|
||||
blink::WebLocalFrame::PromiseBehavior::kDontWait);
|
||||
blink::mojom::WantResultOption::kWantResult,
|
||||
blink::mojom::PromiseResultOption::kDoNotWait);
|
||||
|
||||
return handle;
|
||||
}
|
||||
|
@ -692,9 +679,19 @@ class WebFrameRenderer : public gin::Wrappable<WebFrameRenderer>,
|
|||
bool has_user_gesture = false;
|
||||
args->GetNext(&has_user_gesture);
|
||||
|
||||
blink::WebLocalFrame::ScriptExecutionType scriptExecutionType =
|
||||
blink::WebLocalFrame::kSynchronous;
|
||||
args->GetNext(&scriptExecutionType);
|
||||
blink::mojom::EvaluationTiming script_execution_type =
|
||||
blink::mojom::EvaluationTiming::kSynchronous;
|
||||
blink::mojom::LoadEventBlockingOption load_blocking_option =
|
||||
blink::mojom::LoadEventBlockingOption::kDoNotBlock;
|
||||
std::string execution_type;
|
||||
args->GetNext(&execution_type);
|
||||
|
||||
if (execution_type == "asynchronous") {
|
||||
script_execution_type = blink::mojom::EvaluationTiming::kAsynchronous;
|
||||
} else if (execution_type == "asynchronousBlockingOnload") {
|
||||
script_execution_type = blink::mojom::EvaluationTiming::kAsynchronous;
|
||||
load_blocking_option = blink::mojom::LoadEventBlockingOption::kBlock;
|
||||
}
|
||||
|
||||
ScriptExecutionCallback::CompletionCallback completion_callback;
|
||||
args->GetNext(&completion_callback);
|
||||
|
@ -724,13 +721,20 @@ class WebFrameRenderer : public gin::Wrappable<WebFrameRenderer>,
|
|||
blink::WebURL(GURL(url)));
|
||||
}
|
||||
|
||||
// Deletes itself.
|
||||
auto* self = new ScriptExecutionCallback(std::move(promise),
|
||||
std::move(completion_callback));
|
||||
|
||||
render_frame->GetWebFrame()->RequestExecuteScript(
|
||||
world_id, base::make_span(sources), has_user_gesture,
|
||||
scriptExecutionType,
|
||||
new ScriptExecutionCallback(std::move(promise),
|
||||
std::move(completion_callback)),
|
||||
world_id, base::make_span(sources),
|
||||
has_user_gesture ? blink::mojom::UserActivationOption::kActivate
|
||||
: blink::mojom::UserActivationOption::kDoNotActivate,
|
||||
script_execution_type, load_blocking_option, base::NullCallback(),
|
||||
base::BindOnce(&ScriptExecutionCallback::Completed,
|
||||
base::Unretained(self)),
|
||||
blink::BackForwardCacheAware::kPossiblyDisallow,
|
||||
blink::WebLocalFrame::PromiseBehavior::kDontWait);
|
||||
blink::mojom::WantResultOption::kWantResult,
|
||||
blink::mojom::PromiseResultOption::kDoNotWait);
|
||||
|
||||
return handle;
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue