chore: bump chromium to f30828899e4cd7161f6dc6507023f (master) (#20824)
* chore: bump chromium in DEPS to 0476932294da8809a19189b9f54cee11d50cc512 * update chromium patches (#20838) * chore: bump chromium in DEPS to 838863f5ec9e8a12132a10bb47be8382ad9756a7 * IsRendererTransferNeededForNavigation went away1867031
* [arraybuffer] Move the ArrayBuffer implementation from wtf to core1875731
* URLLoaderRequest new mojo types * context menu enums moved around1872004
1876088
1866520
* chore: bump chromium in DEPS to dc9525d251bf30828899e4cd7161f6dc6507023f * update chromium patches * [WIP] Convert network hints IPC to Mojo1881967
* jumbo build is no longer supported1881967
* fix disable-color-correct-rendering * [FIXME] fix printing patch compiles but prob doesn't work * explicitly include ax_enums1759821
* fixup! [WIP] Convert network hints IPC to Mojo * fix base::span * fix AsarURLLoader to not double-std::move * fix debug build * fix msstl patch * lint * more fix msstl * mooooore fix msstl * fix compile * update backport_fix_msstl_compat_in_ui_events.patch * update msstl compat patch * don't try to build chrome's prefetch predictor * build: fix compilation on windows * Fixup patches for MAS build * Free up disk space for mac debug builds * fix: apply custom site instance only for main frame * Fixup from rebase * Try not generating symbols for mac debug builds * Remove double entry of patch * FIx compile errors * Trigger CI * Set symbol_level to 1 for mac debug builds
This commit is contained in:
parent
f18fca0729
commit
9a198e8ef4
60 changed files with 759 additions and 686 deletions
|
@ -18,6 +18,7 @@
|
|||
#include "shell/common/gin_converters/value_converter.h"
|
||||
#include "shell/common/gin_helper/dictionary.h"
|
||||
#include "shell/common/keyboard_util.h"
|
||||
#include "third_party/blink/public/common/context_menu_data/edit_flags.h"
|
||||
#include "third_party/blink/public/platform/web_input_event.h"
|
||||
#include "third_party/blink/public/platform/web_keyboard_event.h"
|
||||
#include "third_party/blink/public/platform/web_mouse_event.h"
|
||||
|
@ -345,21 +346,21 @@ bool Converter<blink::WebDeviceEmulationParams>::FromV8(
|
|||
}
|
||||
|
||||
// static
|
||||
v8::Local<v8::Value> Converter<blink::WebContextMenuData::MediaType>::ToV8(
|
||||
v8::Local<v8::Value> Converter<blink::ContextMenuDataMediaType>::ToV8(
|
||||
v8::Isolate* isolate,
|
||||
const blink::WebContextMenuData::MediaType& in) {
|
||||
const blink::ContextMenuDataMediaType& in) {
|
||||
switch (in) {
|
||||
case blink::WebContextMenuData::kMediaTypeImage:
|
||||
case blink::ContextMenuDataMediaType::kImage:
|
||||
return StringToV8(isolate, "image");
|
||||
case blink::WebContextMenuData::kMediaTypeVideo:
|
||||
case blink::ContextMenuDataMediaType::kVideo:
|
||||
return StringToV8(isolate, "video");
|
||||
case blink::WebContextMenuData::kMediaTypeAudio:
|
||||
case blink::ContextMenuDataMediaType::kAudio:
|
||||
return StringToV8(isolate, "audio");
|
||||
case blink::WebContextMenuData::kMediaTypeCanvas:
|
||||
case blink::ContextMenuDataMediaType::kCanvas:
|
||||
return StringToV8(isolate, "canvas");
|
||||
case blink::WebContextMenuData::kMediaTypeFile:
|
||||
case blink::ContextMenuDataMediaType::kFile:
|
||||
return StringToV8(isolate, "file");
|
||||
case blink::WebContextMenuData::kMediaTypePlugin:
|
||||
case blink::ContextMenuDataMediaType::kPlugin:
|
||||
return StringToV8(isolate, "plugin");
|
||||
default:
|
||||
return StringToV8(isolate, "none");
|
||||
|
@ -367,15 +368,15 @@ v8::Local<v8::Value> Converter<blink::WebContextMenuData::MediaType>::ToV8(
|
|||
}
|
||||
|
||||
// static
|
||||
v8::Local<v8::Value> Converter<blink::WebContextMenuData::InputFieldType>::ToV8(
|
||||
v8::Local<v8::Value> Converter<blink::ContextMenuDataInputFieldType>::ToV8(
|
||||
v8::Isolate* isolate,
|
||||
const blink::WebContextMenuData::InputFieldType& in) {
|
||||
const blink::ContextMenuDataInputFieldType& in) {
|
||||
switch (in) {
|
||||
case blink::WebContextMenuData::kInputFieldTypePlainText:
|
||||
case blink::ContextMenuDataInputFieldType::kPlainText:
|
||||
return StringToV8(isolate, "plainText");
|
||||
case blink::WebContextMenuData::kInputFieldTypePassword:
|
||||
case blink::ContextMenuDataInputFieldType::kPassword:
|
||||
return StringToV8(isolate, "password");
|
||||
case blink::WebContextMenuData::kInputFieldTypeOther:
|
||||
case blink::ContextMenuDataInputFieldType::kOther:
|
||||
return StringToV8(isolate, "other");
|
||||
default:
|
||||
return StringToV8(isolate, "none");
|
||||
|
@ -384,13 +385,16 @@ v8::Local<v8::Value> Converter<blink::WebContextMenuData::InputFieldType>::ToV8(
|
|||
|
||||
v8::Local<v8::Value> EditFlagsToV8(v8::Isolate* isolate, int editFlags) {
|
||||
gin_helper::Dictionary dict = gin::Dictionary::CreateEmpty(isolate);
|
||||
dict.Set("canUndo", !!(editFlags & blink::WebContextMenuData::kCanUndo));
|
||||
dict.Set("canRedo", !!(editFlags & blink::WebContextMenuData::kCanRedo));
|
||||
dict.Set("canCut", !!(editFlags & blink::WebContextMenuData::kCanCut));
|
||||
dict.Set("canCopy", !!(editFlags & blink::WebContextMenuData::kCanCopy));
|
||||
dict.Set("canUndo",
|
||||
!!(editFlags & blink::ContextMenuDataEditFlags::kCanUndo));
|
||||
dict.Set("canRedo",
|
||||
!!(editFlags & blink::ContextMenuDataEditFlags::kCanRedo));
|
||||
dict.Set("canCut", !!(editFlags & blink::ContextMenuDataEditFlags::kCanCut));
|
||||
dict.Set("canCopy",
|
||||
!!(editFlags & blink::ContextMenuDataEditFlags::kCanCopy));
|
||||
|
||||
bool pasteFlag = false;
|
||||
if (editFlags & blink::WebContextMenuData::kCanPaste) {
|
||||
if (editFlags & blink::ContextMenuDataEditFlags::kCanPaste) {
|
||||
std::vector<base::string16> types;
|
||||
bool ignore;
|
||||
ui::Clipboard::GetForCurrentThread()->ReadAvailableTypes(
|
||||
|
@ -399,9 +403,10 @@ v8::Local<v8::Value> EditFlagsToV8(v8::Isolate* isolate, int editFlags) {
|
|||
}
|
||||
dict.Set("canPaste", pasteFlag);
|
||||
|
||||
dict.Set("canDelete", !!(editFlags & blink::WebContextMenuData::kCanDelete));
|
||||
dict.Set("canDelete",
|
||||
!!(editFlags & blink::ContextMenuDataEditFlags::kCanDelete));
|
||||
dict.Set("canSelectAll",
|
||||
!!(editFlags & blink::WebContextMenuData::kCanSelectAll));
|
||||
!!(editFlags & blink::ContextMenuDataEditFlags::kCanSelectAll));
|
||||
|
||||
return ConvertToV8(isolate, dict);
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue