chore: bump chromium to e836cbe709f3cd703f233de8eb6cc6ec99b72c9d (#27475)
Co-authored-by: deepak1556 <hop2deep@gmail.com> Co-authored-by: Jeremy Rose <nornagon@nornagon.net>
This commit is contained in:
parent
44460e84c0
commit
e46446e7e4
93 changed files with 705 additions and 896 deletions
|
@ -14,8 +14,6 @@ interface ElectronRenderer {
|
|||
|
||||
ReceivePostMessage(string channel, blink.mojom.TransferableMessage message);
|
||||
|
||||
NotifyUserActivation();
|
||||
|
||||
TakeHeapSnapshot(handle file) => (bool success);
|
||||
};
|
||||
|
||||
|
|
|
@ -347,15 +347,16 @@ v8::Local<v8::Value> Converter<blink::mojom::ContextMenuDataMediaType>::ToV8(
|
|||
}
|
||||
|
||||
// static
|
||||
v8::Local<v8::Value> Converter<blink::ContextMenuDataInputFieldType>::ToV8(
|
||||
v8::Local<v8::Value>
|
||||
Converter<blink::mojom::ContextMenuDataInputFieldType>::ToV8(
|
||||
v8::Isolate* isolate,
|
||||
const blink::ContextMenuDataInputFieldType& in) {
|
||||
const blink::mojom::ContextMenuDataInputFieldType& in) {
|
||||
switch (in) {
|
||||
case blink::ContextMenuDataInputFieldType::kPlainText:
|
||||
case blink::mojom::ContextMenuDataInputFieldType::kPlainText:
|
||||
return StringToV8(isolate, "plainText");
|
||||
case blink::ContextMenuDataInputFieldType::kPassword:
|
||||
case blink::mojom::ContextMenuDataInputFieldType::kPassword:
|
||||
return StringToV8(isolate, "password");
|
||||
case blink::ContextMenuDataInputFieldType::kOther:
|
||||
case blink::mojom::ContextMenuDataInputFieldType::kOther:
|
||||
return StringToV8(isolate, "other");
|
||||
default:
|
||||
return StringToV8(isolate, "none");
|
||||
|
@ -393,31 +394,24 @@ v8::Local<v8::Value> EditFlagsToV8(v8::Isolate* isolate, int editFlags) {
|
|||
|
||||
v8::Local<v8::Value> MediaFlagsToV8(v8::Isolate* isolate, int mediaFlags) {
|
||||
gin_helper::Dictionary dict = gin::Dictionary::CreateEmpty(isolate);
|
||||
dict.Set("inError",
|
||||
!!(mediaFlags & blink::WebContextMenuData::kMediaInError));
|
||||
dict.Set("isPaused",
|
||||
!!(mediaFlags & blink::WebContextMenuData::kMediaPaused));
|
||||
dict.Set("isMuted", !!(mediaFlags & blink::WebContextMenuData::kMediaMuted));
|
||||
dict.Set("canSave",
|
||||
!!(mediaFlags & blink::WebContextMenuData::kMediaCanSave));
|
||||
dict.Set("hasAudio",
|
||||
!!(mediaFlags & blink::WebContextMenuData::kMediaHasAudio));
|
||||
dict.Set("isLooping", !!(mediaFlags & blink::WebContextMenuData::kMediaLoop));
|
||||
dict.Set("inError", !!(mediaFlags & blink::ContextMenuData::kMediaInError));
|
||||
dict.Set("isPaused", !!(mediaFlags & blink::ContextMenuData::kMediaPaused));
|
||||
dict.Set("isMuted", !!(mediaFlags & blink::ContextMenuData::kMediaMuted));
|
||||
dict.Set("canSave", !!(mediaFlags & blink::ContextMenuData::kMediaCanSave));
|
||||
dict.Set("hasAudio", !!(mediaFlags & blink::ContextMenuData::kMediaHasAudio));
|
||||
dict.Set("isLooping", !!(mediaFlags & blink::ContextMenuData::kMediaLoop));
|
||||
dict.Set("isControlsVisible",
|
||||
!!(mediaFlags & blink::WebContextMenuData::kMediaControls));
|
||||
!!(mediaFlags & blink::ContextMenuData::kMediaControls));
|
||||
dict.Set("canToggleControls",
|
||||
!!(mediaFlags & blink::WebContextMenuData::kMediaCanToggleControls));
|
||||
dict.Set("canPrint",
|
||||
!!(mediaFlags & blink::WebContextMenuData::kMediaCanPrint));
|
||||
!!(mediaFlags & blink::ContextMenuData::kMediaCanToggleControls));
|
||||
dict.Set("canPrint", !!(mediaFlags & blink::ContextMenuData::kMediaCanPrint));
|
||||
dict.Set("canRotate",
|
||||
!!(mediaFlags & blink::WebContextMenuData::kMediaCanRotate));
|
||||
dict.Set(
|
||||
"canShowPictureInPicture",
|
||||
!!(mediaFlags & blink::WebContextMenuData::kMediaCanPictureInPicture));
|
||||
!!(mediaFlags & blink::ContextMenuData::kMediaCanRotate));
|
||||
dict.Set("canShowPictureInPicture",
|
||||
!!(mediaFlags & blink::ContextMenuData::kMediaCanPictureInPicture));
|
||||
dict.Set("isShowingPictureInPicture",
|
||||
!!(mediaFlags & blink::WebContextMenuData::kMediaPictureInPicture));
|
||||
dict.Set("canLoop",
|
||||
!!(mediaFlags & blink::WebContextMenuData::kMediaCanLoop));
|
||||
!!(mediaFlags & blink::ContextMenuData::kMediaPictureInPicture));
|
||||
dict.Set("canLoop", !!(mediaFlags & blink::ContextMenuData::kMediaCanLoop));
|
||||
return ConvertToV8(isolate, dict);
|
||||
}
|
||||
|
||||
|
|
|
@ -6,10 +6,10 @@
|
|||
#define SHELL_COMMON_GIN_CONVERTERS_BLINK_CONVERTER_H_
|
||||
|
||||
#include "gin/converter.h"
|
||||
#include "third_party/blink/public/common/context_menu_data/context_menu_data.h"
|
||||
#include "third_party/blink/public/common/input/web_input_event.h"
|
||||
#include "third_party/blink/public/common/messaging/cloneable_message.h"
|
||||
#include "third_party/blink/public/common/web_cache/web_cache_resource_type_stats.h"
|
||||
#include "third_party/blink/public/web/web_context_menu_data.h"
|
||||
|
||||
namespace blink {
|
||||
class WebMouseEvent;
|
||||
|
@ -74,10 +74,10 @@ struct Converter<blink::mojom::ContextMenuDataMediaType> {
|
|||
};
|
||||
|
||||
template <>
|
||||
struct Converter<blink::ContextMenuDataInputFieldType> {
|
||||
struct Converter<blink::mojom::ContextMenuDataInputFieldType> {
|
||||
static v8::Local<v8::Value> ToV8(
|
||||
v8::Isolate* isolate,
|
||||
const blink::ContextMenuDataInputFieldType& in);
|
||||
const blink::mojom::ContextMenuDataInputFieldType& in);
|
||||
};
|
||||
|
||||
template <>
|
||||
|
|
|
@ -10,7 +10,6 @@
|
|||
#include "content/public/browser/context_menu_params.h"
|
||||
#include "content/public/browser/native_web_keyboard_event.h"
|
||||
#include "content/public/browser/web_contents.h"
|
||||
#include "content/public/common/untrustworthy_context_menu_params.h"
|
||||
#include "shell/browser/api/electron_api_web_contents.h"
|
||||
#include "shell/browser/web_contents_permission_helper.h"
|
||||
#include "shell/common/gin_converters/blink_converter.h"
|
||||
|
@ -18,6 +17,7 @@
|
|||
#include "shell/common/gin_converters/gfx_converter.h"
|
||||
#include "shell/common/gin_converters/gurl_converter.h"
|
||||
#include "shell/common/gin_helper/dictionary.h"
|
||||
#include "third_party/blink/public/common/context_menu_data/untrustworthy_context_menu_params.h"
|
||||
#include "ui/events/keycodes/dom/keycode_converter.h"
|
||||
#include "ui/events/keycodes/keyboard_code_conversion.h"
|
||||
|
||||
|
@ -25,36 +25,36 @@ namespace {
|
|||
|
||||
void ExecuteCommand(content::WebContents* web_contents,
|
||||
int action,
|
||||
const content::CustomContextMenuContext& context) {
|
||||
const blink::CustomContextMenuContext& context) {
|
||||
web_contents->ExecuteCustomContextMenuCommand(action, context);
|
||||
}
|
||||
|
||||
// Forward declaration for nested recursive call.
|
||||
v8::Local<v8::Value> MenuToV8(v8::Isolate* isolate,
|
||||
content::WebContents* web_contents,
|
||||
const content::CustomContextMenuContext& context,
|
||||
const std::vector<content::MenuItem>& menu);
|
||||
const blink::CustomContextMenuContext& context,
|
||||
const std::vector<blink::MenuItem>& menu);
|
||||
|
||||
v8::Local<v8::Value> MenuItemToV8(
|
||||
v8::Isolate* isolate,
|
||||
content::WebContents* web_contents,
|
||||
const content::CustomContextMenuContext& context,
|
||||
const content::MenuItem& item) {
|
||||
const blink::CustomContextMenuContext& context,
|
||||
const blink::MenuItem& item) {
|
||||
gin_helper::Dictionary v8_item = gin::Dictionary::CreateEmpty(isolate);
|
||||
switch (item.type) {
|
||||
case content::MenuItem::CHECKABLE_OPTION:
|
||||
case content::MenuItem::GROUP:
|
||||
case blink::MenuItem::CHECKABLE_OPTION:
|
||||
case blink::MenuItem::GROUP:
|
||||
v8_item.Set("checked", item.checked);
|
||||
FALLTHROUGH;
|
||||
case content::MenuItem::OPTION:
|
||||
case content::MenuItem::SUBMENU:
|
||||
case blink::MenuItem::OPTION:
|
||||
case blink::MenuItem::SUBMENU:
|
||||
v8_item.Set("label", item.label);
|
||||
v8_item.Set("enabled", item.enabled);
|
||||
FALLTHROUGH;
|
||||
default:
|
||||
v8_item.Set("type", item.type);
|
||||
}
|
||||
if (item.type == content::MenuItem::SUBMENU)
|
||||
if (item.type == blink::MenuItem::SUBMENU)
|
||||
v8_item.Set("submenu",
|
||||
MenuToV8(isolate, web_contents, context, item.submenu));
|
||||
else if (item.action > 0)
|
||||
|
@ -65,8 +65,8 @@ v8::Local<v8::Value> MenuItemToV8(
|
|||
|
||||
v8::Local<v8::Value> MenuToV8(v8::Isolate* isolate,
|
||||
content::WebContents* web_contents,
|
||||
const content::CustomContextMenuContext& context,
|
||||
const std::vector<content::MenuItem>& menu) {
|
||||
const blink::CustomContextMenuContext& context,
|
||||
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)
|
||||
|
@ -110,19 +110,19 @@ struct Converter<ui::MenuSourceType> {
|
|||
};
|
||||
|
||||
// static
|
||||
v8::Local<v8::Value> Converter<content::MenuItem::Type>::ToV8(
|
||||
v8::Local<v8::Value> Converter<blink::MenuItem::Type>::ToV8(
|
||||
v8::Isolate* isolate,
|
||||
const content::MenuItem::Type& val) {
|
||||
const blink::MenuItem::Type& val) {
|
||||
switch (val) {
|
||||
case content::MenuItem::CHECKABLE_OPTION:
|
||||
case blink::MenuItem::CHECKABLE_OPTION:
|
||||
return StringToV8(isolate, "checkbox");
|
||||
case content::MenuItem::GROUP:
|
||||
case blink::MenuItem::GROUP:
|
||||
return StringToV8(isolate, "radio");
|
||||
case content::MenuItem::SEPARATOR:
|
||||
case blink::MenuItem::SEPARATOR:
|
||||
return StringToV8(isolate, "separator");
|
||||
case content::MenuItem::SUBMENU:
|
||||
case blink::MenuItem::SUBMENU:
|
||||
return StringToV8(isolate, "submenu");
|
||||
case content::MenuItem::OPTION:
|
||||
case blink::MenuItem::OPTION:
|
||||
default:
|
||||
return StringToV8(isolate, "normal");
|
||||
}
|
||||
|
|
|
@ -8,10 +8,10 @@
|
|||
#include <utility>
|
||||
|
||||
#include "content/public/browser/permission_type.h"
|
||||
#include "content/public/common/menu_item.h"
|
||||
#include "content/public/common/referrer.h"
|
||||
#include "content/public/common/stop_find_action.h"
|
||||
#include "gin/converter.h"
|
||||
#include "third_party/blink/public/common/context_menu_data/menu_item.h"
|
||||
#include "third_party/blink/public/mojom/permissions/permission_status.mojom.h"
|
||||
|
||||
namespace content {
|
||||
|
@ -26,9 +26,9 @@ using ContextMenuParamsWithWebContents =
|
|||
namespace gin {
|
||||
|
||||
template <>
|
||||
struct Converter<content::MenuItem::Type> {
|
||||
struct Converter<blink::MenuItem::Type> {
|
||||
static v8::Local<v8::Value> ToV8(v8::Isolate* isolate,
|
||||
const content::MenuItem::Type& val);
|
||||
const blink::MenuItem::Type& val);
|
||||
};
|
||||
|
||||
template <>
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue