chore: bump chromium to 90.0.4415.0 (master) (#27694)
* chore: bump chromium in DEPS to 520c02b46668fc608927e0fcd79b6a90885a48bf * chore: bump chromium in DEPS to 90.0.4414.0 * resolve chromium conflicts * resolve v8 conflicts * fix node gn files * 2673502: Remove RenderViewCreated use from ExtensionHost.2673502
* 2676903: [mojo] Remove most legacy Binding classes.2676903
* 2644847: Move self-deleting URLLoaderFactory base into //services/network.2644847
* 2664006: Remove from mojo::DataPipe.2664006
* 2674530: Remove CertVerifierService feature2674530
* 2668748: Move OnSSLCertificateError to a new interface.2668748
* 2672923: Remove RAPPOR reporting infrastructure.2672923
* 2673502: Remove RenderViewCreated use from ExtensionHost.2673502
* 2655126: Convert FrameHostMsg_ContextMenu and FrameMsg_ContextMenuClosed|CustomContextMenuAction to Mojo2655126
* 2628705: Window Placement: Implement screen.isExtended and change event2628705
* 2643161: Refactor storage::kFileSystem*Native*2643161
* fix build * only remove the biggest subdir of //ios * chore: bump chromium in DEPS to 90.0.4415.0 * update patches * update sysroots * 2686147: Remove WebContentsObserver::RenderViewCreated().2686147
* 2596429: Fixing how extension's split and spanning modes affect OriginAccessList.2596429
* 2686026: [mojo] Delete AssociatedInterfacePtr (replaced by AssociatedRemote)2686026
* 2651705: Move ui/base/dragdrop/file_info to ui/base/clipboard2651705
* 358217: drawBitmap is deprecated https://skia-review.googlesource.com/c/skia/+/358217 * fix gn check * 2678098: Use gen/front_end as input to generate_devtools_grd2678098
* 2674530: Remove CertVerifierService feature2674530
* fixup 2664006: Remove from mojo::DataPipe.2664006
* fixup build_add_electron_tracing_category.patch * 2673415: [base] Prepare CrashReporterClient for string16 switch2673415
* 2673413: Add CursorFactoryWin to handle Cursors on Windows2673413
* 2668748: Move OnSSLCertificateError to a new interface.2668748
* fix mas gn check * update patch after merge * Update node for .mjs files * build: load v8_prof_processor dependencies as ESM * chore: add patch to fix linux 32bit Co-authored-by: Jeremy Rose <nornagon@nornagon.net> Co-authored-by: Jeremy Rose <jeremya@chromium.org> Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org> Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com> Co-authored-by: Samuel Attard <samuel.r.attard@gmail.com>
This commit is contained in:
parent
0b042d3b1c
commit
ca75bca667
119 changed files with 746 additions and 633 deletions
|
@ -25,21 +25,20 @@ namespace {
|
|||
|
||||
void ExecuteCommand(content::WebContents* web_contents,
|
||||
int action,
|
||||
const blink::CustomContextMenuContext& context) {
|
||||
web_contents->ExecuteCustomContextMenuCommand(action, context);
|
||||
const GURL& link_followed) {
|
||||
web_contents->ExecuteCustomContextMenuCommand(action, link_followed);
|
||||
}
|
||||
|
||||
// Forward declaration for nested recursive call.
|
||||
v8::Local<v8::Value> MenuToV8(v8::Isolate* isolate,
|
||||
content::WebContents* web_contents,
|
||||
const blink::CustomContextMenuContext& context,
|
||||
const GURL& link_followed,
|
||||
const std::vector<blink::MenuItem>& menu);
|
||||
|
||||
v8::Local<v8::Value> MenuItemToV8(
|
||||
v8::Isolate* isolate,
|
||||
content::WebContents* web_contents,
|
||||
const blink::CustomContextMenuContext& context,
|
||||
const blink::MenuItem& item) {
|
||||
v8::Local<v8::Value> MenuItemToV8(v8::Isolate* isolate,
|
||||
content::WebContents* web_contents,
|
||||
const GURL& link_followed,
|
||||
const blink::MenuItem& item) {
|
||||
gin_helper::Dictionary v8_item = gin::Dictionary::CreateEmpty(isolate);
|
||||
switch (item.type) {
|
||||
case blink::MenuItem::CHECKABLE_OPTION:
|
||||
|
@ -56,21 +55,22 @@ v8::Local<v8::Value> MenuItemToV8(
|
|||
}
|
||||
if (item.type == blink::MenuItem::SUBMENU)
|
||||
v8_item.Set("submenu",
|
||||
MenuToV8(isolate, web_contents, context, item.submenu));
|
||||
MenuToV8(isolate, web_contents, link_followed, item.submenu));
|
||||
else if (item.action > 0)
|
||||
v8_item.Set("click", base::BindRepeating(ExecuteCommand, web_contents,
|
||||
item.action, context));
|
||||
item.action, link_followed));
|
||||
return v8_item.GetHandle();
|
||||
}
|
||||
|
||||
v8::Local<v8::Value> MenuToV8(v8::Isolate* isolate,
|
||||
content::WebContents* web_contents,
|
||||
const blink::CustomContextMenuContext& context,
|
||||
const GURL& link_followed,
|
||||
const std::vector<blink::MenuItem>& menu) {
|
||||
std::vector<v8::Local<v8::Value>> v8_menu;
|
||||
v8_menu.reserve(menu.size());
|
||||
for (const auto& menu_item : menu)
|
||||
v8_menu.push_back(MenuItemToV8(isolate, web_contents, context, menu_item));
|
||||
v8_menu.push_back(
|
||||
MenuItemToV8(isolate, web_contents, link_followed, menu_item));
|
||||
return gin::ConvertToV8(isolate, v8_menu);
|
||||
}
|
||||
|
||||
|
@ -166,9 +166,6 @@ v8::Local<v8::Value> Converter<ContextMenuParamsWithWebContents>::ToV8(
|
|||
dict.Set("inputFieldType", params.input_field_type);
|
||||
dict.Set("menuSourceType", params.source_type);
|
||||
|
||||
if (params.custom_context.is_pepper_menu)
|
||||
dict.Set("menu", MenuToV8(isolate, val.second, params.custom_context,
|
||||
params.custom_items));
|
||||
return gin::ConvertToV8(isolate, dict);
|
||||
}
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue