2015-09-18 03:06:38 +00:00
|
|
|
// Copyright (c) 2015 GitHub, Inc.
|
|
|
|
// Use of this source code is governed by the MIT license that can be
|
|
|
|
// found in the LICENSE file.
|
|
|
|
|
2019-10-31 07:56:00 +00:00
|
|
|
#include "shell/common/gin_converters/blink_converter.h"
|
2015-09-18 03:06:38 +00:00
|
|
|
|
2016-08-01 00:14:11 +00:00
|
|
|
#include <algorithm>
|
2015-09-18 03:10:32 +00:00
|
|
|
#include <string>
|
2024-01-11 01:00:37 +00:00
|
|
|
#include <string_view>
|
2015-09-18 05:33:06 +00:00
|
|
|
#include <vector>
|
2015-09-18 03:10:32 +00:00
|
|
|
|
2023-06-19 08:33:09 +00:00
|
|
|
#include "base/containers/fixed_flat_map.h"
|
2015-09-18 03:06:38 +00:00
|
|
|
#include "base/strings/string_util.h"
|
2023-09-12 09:28:45 +00:00
|
|
|
#include "base/strings/utf_string_conversion_utils.h"
|
2015-09-28 00:41:06 +00:00
|
|
|
#include "base/strings/utf_string_conversions.h"
|
2018-11-29 01:55:03 +00:00
|
|
|
#include "gin/converter.h"
|
2022-09-27 19:47:46 +00:00
|
|
|
#include "gin/data_object_builder.h"
|
2020-01-29 12:01:37 +00:00
|
|
|
#include "shell/common/gin_converters/gfx_converter.h"
|
2021-04-13 19:35:27 +00:00
|
|
|
#include "shell/common/gin_converters/gurl_converter.h"
|
2023-06-19 08:33:09 +00:00
|
|
|
#include "shell/common/gin_converters/std_converter.h"
|
2019-10-31 07:56:00 +00:00
|
|
|
#include "shell/common/gin_converters/value_converter.h"
|
|
|
|
#include "shell/common/gin_helper/dictionary.h"
|
2019-06-19 20:46:59 +00:00
|
|
|
#include "shell/common/keyboard_util.h"
|
2020-03-12 01:07:54 +00:00
|
|
|
#include "shell/common/v8_value_serializer.h"
|
2019-11-05 23:41:20 +00:00
|
|
|
#include "third_party/blink/public/common/context_menu_data/edit_flags.h"
|
2020-01-17 18:41:52 +00:00
|
|
|
#include "third_party/blink/public/common/input/web_input_event.h"
|
|
|
|
#include "third_party/blink/public/common/input/web_keyboard_event.h"
|
|
|
|
#include "third_party/blink/public/common/input/web_mouse_event.h"
|
|
|
|
#include "third_party/blink/public/common/input/web_mouse_wheel_event.h"
|
2020-08-12 18:33:58 +00:00
|
|
|
#include "third_party/blink/public/common/widget/device_emulation_params.h"
|
2021-04-13 19:35:27 +00:00
|
|
|
#include "third_party/blink/public/mojom/loader/referrer.mojom.h"
|
2016-05-03 00:02:33 +00:00
|
|
|
#include "ui/base/clipboard/clipboard.h"
|
2020-09-29 15:40:31 +00:00
|
|
|
#include "ui/events/blink/blink_event_util.h"
|
2016-12-13 23:52:37 +00:00
|
|
|
#include "ui/events/keycodes/dom/keycode_converter.h"
|
2016-10-07 19:46:33 +00:00
|
|
|
#include "ui/events/keycodes/keyboard_code_conversion.h"
|
2015-09-18 05:33:06 +00:00
|
|
|
|
|
|
|
namespace {
|
|
|
|
|
2018-04-18 01:55:30 +00:00
|
|
|
template <typename T>
|
2015-09-18 05:33:06 +00:00
|
|
|
int VectorToBitArray(const std::vector<T>& vec) {
|
|
|
|
int bits = 0;
|
|
|
|
for (const T& item : vec)
|
|
|
|
bits |= item;
|
|
|
|
return bits;
|
|
|
|
}
|
|
|
|
|
|
|
|
} // namespace
|
2015-09-18 03:06:38 +00:00
|
|
|
|
2019-10-31 07:56:00 +00:00
|
|
|
namespace gin {
|
2015-09-18 03:06:38 +00:00
|
|
|
|
2018-04-18 01:55:30 +00:00
|
|
|
template <>
|
2021-03-16 01:21:27 +00:00
|
|
|
struct Converter<char16_t> {
|
2018-04-18 01:55:30 +00:00
|
|
|
static bool FromV8(v8::Isolate* isolate,
|
2024-07-24 23:24:07 +00:00
|
|
|
v8::Local<v8::Value> val,
|
2021-03-16 01:21:27 +00:00
|
|
|
char16_t* out) {
|
2021-03-16 16:18:45 +00:00
|
|
|
std::u16string code = base::UTF8ToUTF16(gin::V8ToString(isolate, val));
|
2015-09-18 05:33:06 +00:00
|
|
|
if (code.length() != 1)
|
|
|
|
return false;
|
|
|
|
*out = code[0];
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
};
|
|
|
|
|
2022-09-27 19:47:46 +00:00
|
|
|
#define BLINK_EVENT_TYPES() \
|
|
|
|
CASE_TYPE(kUndefined, "undefined") \
|
|
|
|
CASE_TYPE(kMouseDown, "mouseDown") \
|
|
|
|
CASE_TYPE(kMouseUp, "mouseUp") \
|
|
|
|
CASE_TYPE(kMouseMove, "mouseMove") \
|
|
|
|
CASE_TYPE(kMouseEnter, "mouseEnter") \
|
|
|
|
CASE_TYPE(kMouseLeave, "mouseLeave") \
|
|
|
|
CASE_TYPE(kContextMenu, "contextMenu") \
|
|
|
|
CASE_TYPE(kMouseWheel, "mouseWheel") \
|
|
|
|
CASE_TYPE(kRawKeyDown, "rawKeyDown") \
|
|
|
|
CASE_TYPE(kKeyDown, "keyDown") \
|
|
|
|
CASE_TYPE(kKeyUp, "keyUp") \
|
|
|
|
CASE_TYPE(kChar, "char") \
|
2024-07-03 15:15:35 +00:00
|
|
|
CASE_TYPE(kGestureBegin, "gestureBegin") \
|
|
|
|
CASE_TYPE(kGestureEnd, "gestureEnd") \
|
2022-09-27 19:47:46 +00:00
|
|
|
CASE_TYPE(kGestureScrollBegin, "gestureScrollBegin") \
|
|
|
|
CASE_TYPE(kGestureScrollEnd, "gestureScrollEnd") \
|
|
|
|
CASE_TYPE(kGestureScrollUpdate, "gestureScrollUpdate") \
|
|
|
|
CASE_TYPE(kGestureFlingStart, "gestureFlingStart") \
|
|
|
|
CASE_TYPE(kGestureFlingCancel, "gestureFlingCancel") \
|
|
|
|
CASE_TYPE(kGesturePinchBegin, "gesturePinchBegin") \
|
|
|
|
CASE_TYPE(kGesturePinchEnd, "gesturePinchEnd") \
|
|
|
|
CASE_TYPE(kGesturePinchUpdate, "gesturePinchUpdate") \
|
|
|
|
CASE_TYPE(kGestureTapDown, "gestureTapDown") \
|
|
|
|
CASE_TYPE(kGestureShowPress, "gestureShowPress") \
|
|
|
|
CASE_TYPE(kGestureTap, "gestureTap") \
|
|
|
|
CASE_TYPE(kGestureTapCancel, "gestureTapCancel") \
|
|
|
|
CASE_TYPE(kGestureShortPress, "gestureShortPress") \
|
|
|
|
CASE_TYPE(kGestureLongPress, "gestureLongPress") \
|
|
|
|
CASE_TYPE(kGestureLongTap, "gestureLongTap") \
|
|
|
|
CASE_TYPE(kGestureTwoFingerTap, "gestureTwoFingerTap") \
|
|
|
|
CASE_TYPE(kGestureTapUnconfirmed, "gestureTapUnconfirmed") \
|
|
|
|
CASE_TYPE(kGestureDoubleTap, "gestureDoubleTap") \
|
|
|
|
CASE_TYPE(kTouchStart, "touchStart") \
|
|
|
|
CASE_TYPE(kTouchMove, "touchMove") \
|
|
|
|
CASE_TYPE(kTouchEnd, "touchEnd") \
|
|
|
|
CASE_TYPE(kTouchCancel, "touchCancel") \
|
|
|
|
CASE_TYPE(kTouchScrollStarted, "touchScrollStarted") \
|
|
|
|
CASE_TYPE(kPointerDown, "pointerDown") \
|
|
|
|
CASE_TYPE(kPointerUp, "pointerUp") \
|
|
|
|
CASE_TYPE(kPointerMove, "pointerMove") \
|
|
|
|
CASE_TYPE(kPointerRawUpdate, "pointerRawUpdate") \
|
|
|
|
CASE_TYPE(kPointerCancel, "pointerCancel") \
|
|
|
|
CASE_TYPE(kPointerCausedUaAction, "pointerCausedUaAction")
|
|
|
|
|
|
|
|
bool Converter<blink::WebInputEvent::Type>::FromV8(
|
|
|
|
v8::Isolate* isolate,
|
2024-07-24 23:24:07 +00:00
|
|
|
v8::Local<v8::Value> val,
|
2022-09-27 19:47:46 +00:00
|
|
|
blink::WebInputEvent::Type* out) {
|
|
|
|
std::string type = gin::V8ToString(isolate, val);
|
|
|
|
#define CASE_TYPE(event_type, js_name) \
|
|
|
|
if (base::EqualsCaseInsensitiveASCII(type, js_name)) { \
|
|
|
|
*out = blink::WebInputEvent::Type::event_type; \
|
|
|
|
return true; \
|
2015-09-18 05:33:06 +00:00
|
|
|
}
|
2022-09-27 19:47:46 +00:00
|
|
|
BLINK_EVENT_TYPES()
|
|
|
|
#undef CASE_TYPE
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
|
|
|
v8::Local<v8::Value> Converter<blink::WebInputEvent::Type>::ToV8(
|
|
|
|
v8::Isolate* isolate,
|
|
|
|
const blink::WebInputEvent::Type& in) {
|
|
|
|
#define CASE_TYPE(event_type, js_name) \
|
|
|
|
case blink::WebInputEvent::Type::event_type: \
|
|
|
|
return StringToV8(isolate, js_name);
|
|
|
|
switch (in) { BLINK_EVENT_TYPES() }
|
|
|
|
#undef CASE_TYPE
|
|
|
|
}
|
2015-09-18 05:33:06 +00:00
|
|
|
|
2018-04-18 01:55:30 +00:00
|
|
|
template <>
|
2015-09-25 11:01:52 +00:00
|
|
|
struct Converter<blink::WebMouseEvent::Button> {
|
2018-04-18 01:55:30 +00:00
|
|
|
static bool FromV8(v8::Isolate* isolate,
|
2024-07-24 23:24:07 +00:00
|
|
|
v8::Local<v8::Value> val,
|
2015-09-25 11:01:52 +00:00
|
|
|
blink::WebMouseEvent::Button* out) {
|
2023-06-19 08:33:09 +00:00
|
|
|
using Val = blink::WebMouseEvent::Button;
|
|
|
|
static constexpr auto Lookup =
|
2024-01-11 01:00:37 +00:00
|
|
|
base::MakeFixedFlatMap<std::string_view, Val>({
|
2023-06-19 08:33:09 +00:00
|
|
|
{"left", Val::kLeft},
|
|
|
|
{"middle", Val::kMiddle},
|
|
|
|
{"right", Val::kRight},
|
|
|
|
});
|
|
|
|
return FromV8WithLowerLookup(isolate, val, Lookup, out);
|
2015-09-25 11:01:52 +00:00
|
|
|
}
|
|
|
|
};
|
|
|
|
|
2023-06-19 08:33:09 +00:00
|
|
|
// clang-format off
|
|
|
|
|
|
|
|
// these are the modifier names we both accept and return
|
|
|
|
static constexpr auto Modifiers =
|
2024-01-11 01:00:37 +00:00
|
|
|
base::MakeFixedFlatMap<std::string_view, blink::WebInputEvent::Modifiers>({
|
2023-06-19 08:33:09 +00:00
|
|
|
{"alt", blink::WebInputEvent::Modifiers::kAltKey},
|
|
|
|
{"capslock", blink::WebInputEvent::Modifiers::kCapsLockOn},
|
|
|
|
{"control", blink::WebInputEvent::Modifiers::kControlKey},
|
|
|
|
{"isautorepeat", blink::WebInputEvent::Modifiers::kIsAutoRepeat},
|
|
|
|
{"iskeypad", blink::WebInputEvent::Modifiers::kIsKeyPad},
|
|
|
|
{"left", blink::WebInputEvent::Modifiers::kIsLeft},
|
|
|
|
{"leftbuttondown", blink::WebInputEvent::Modifiers::kLeftButtonDown},
|
|
|
|
{"meta", blink::WebInputEvent::Modifiers::kMetaKey},
|
|
|
|
{"middlebuttondown", blink::WebInputEvent::Modifiers::kMiddleButtonDown},
|
|
|
|
{"numlock", blink::WebInputEvent::Modifiers::kNumLockOn},
|
|
|
|
{"right", blink::WebInputEvent::Modifiers::kIsRight},
|
|
|
|
{"rightbuttondown", blink::WebInputEvent::Modifiers::kRightButtonDown},
|
|
|
|
{"shift", blink::WebInputEvent::Modifiers::kShiftKey},
|
|
|
|
// TODO(nornagon): the rest of the modifiers
|
|
|
|
});
|
|
|
|
|
|
|
|
// these are the modifier names we accept but do not return
|
|
|
|
static constexpr auto ModifierAliases =
|
2024-01-11 01:00:37 +00:00
|
|
|
base::MakeFixedFlatMap<std::string_view, blink::WebInputEvent::Modifiers>({
|
2023-06-19 08:33:09 +00:00
|
|
|
{"cmd", blink::WebInputEvent::Modifiers::kMetaKey},
|
|
|
|
{"command", blink::WebInputEvent::Modifiers::kMetaKey},
|
|
|
|
{"ctrl", blink::WebInputEvent::Modifiers::kControlKey},
|
|
|
|
});
|
|
|
|
|
|
|
|
static constexpr auto ReferrerPolicies =
|
2024-01-11 01:00:37 +00:00
|
|
|
base::MakeFixedFlatMap<std::string_view, network::mojom::ReferrerPolicy>({
|
2023-06-19 08:33:09 +00:00
|
|
|
{"default", network::mojom::ReferrerPolicy::kDefault},
|
|
|
|
{"no-referrer", network::mojom::ReferrerPolicy::kNever},
|
|
|
|
{"no-referrer-when-downgrade", network::mojom::ReferrerPolicy::kNoReferrerWhenDowngrade},
|
|
|
|
{"origin", network::mojom::ReferrerPolicy::kOrigin},
|
|
|
|
{"same-origin", network::mojom::ReferrerPolicy::kSameOrigin},
|
|
|
|
{"strict-origin", network::mojom::ReferrerPolicy::kStrictOrigin},
|
|
|
|
{"strict-origin-when-cross-origin", network::mojom::ReferrerPolicy::kStrictOriginWhenCrossOrigin},
|
|
|
|
{"unsafe-url", network::mojom::ReferrerPolicy::kAlways},
|
|
|
|
});
|
|
|
|
|
|
|
|
// clang-format on
|
|
|
|
|
2018-04-18 01:55:30 +00:00
|
|
|
template <>
|
2015-09-18 05:33:06 +00:00
|
|
|
struct Converter<blink::WebInputEvent::Modifiers> {
|
2018-04-18 01:55:30 +00:00
|
|
|
static bool FromV8(v8::Isolate* isolate,
|
2024-07-24 23:24:07 +00:00
|
|
|
v8::Local<v8::Value> val,
|
2015-09-18 05:33:06 +00:00
|
|
|
blink::WebInputEvent::Modifiers* out) {
|
2023-06-19 08:33:09 +00:00
|
|
|
return FromV8WithLowerLookup(isolate, val, Modifiers, out) ||
|
|
|
|
FromV8WithLowerLookup(isolate, val, ModifierAliases, out);
|
2015-09-18 05:33:06 +00:00
|
|
|
}
|
|
|
|
};
|
|
|
|
|
2024-01-11 01:00:37 +00:00
|
|
|
std::vector<std::string_view> ModifiersToArray(int modifiers) {
|
|
|
|
std::vector<std::string_view> modifier_strings;
|
2023-06-19 08:33:09 +00:00
|
|
|
|
|
|
|
for (const auto& [name, mask] : Modifiers)
|
|
|
|
if (mask & modifiers)
|
|
|
|
modifier_strings.emplace_back(name);
|
|
|
|
|
2021-07-14 11:50:02 +00:00
|
|
|
return modifier_strings;
|
|
|
|
}
|
|
|
|
|
2017-08-08 01:06:31 +00:00
|
|
|
blink::WebInputEvent::Type GetWebInputEventType(v8::Isolate* isolate,
|
2018-04-18 01:55:30 +00:00
|
|
|
v8::Local<v8::Value> val) {
|
2020-05-26 20:06:26 +00:00
|
|
|
blink::WebInputEvent::Type type = blink::WebInputEvent::Type::kUndefined;
|
2019-10-31 07:56:00 +00:00
|
|
|
gin_helper::Dictionary dict;
|
2015-09-18 06:09:31 +00:00
|
|
|
ConvertFromV8(isolate, val, &dict) && dict.Get("type", &type);
|
|
|
|
return type;
|
|
|
|
}
|
|
|
|
|
2018-04-18 01:55:30 +00:00
|
|
|
bool Converter<blink::WebInputEvent>::FromV8(v8::Isolate* isolate,
|
|
|
|
v8::Local<v8::Value> val,
|
|
|
|
blink::WebInputEvent* out) {
|
2019-10-31 07:56:00 +00:00
|
|
|
gin_helper::Dictionary dict;
|
2015-09-18 05:33:06 +00:00
|
|
|
if (!ConvertFromV8(isolate, val, &dict))
|
|
|
|
return false;
|
2017-04-11 07:18:40 +00:00
|
|
|
blink::WebInputEvent::Type type;
|
|
|
|
if (!dict.Get("type", &type))
|
2015-09-18 05:33:06 +00:00
|
|
|
return false;
|
2017-06-16 20:42:33 +00:00
|
|
|
out->SetType(type);
|
2015-09-18 05:33:06 +00:00
|
|
|
std::vector<blink::WebInputEvent::Modifiers> modifiers;
|
|
|
|
if (dict.Get("modifiers", &modifiers))
|
2017-06-16 20:42:33 +00:00
|
|
|
out->SetModifiers(VectorToBitArray(modifiers));
|
2018-09-15 00:21:05 +00:00
|
|
|
out->SetTimeStamp(base::TimeTicks::Now());
|
2015-09-18 05:33:06 +00:00
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
2022-09-27 19:47:46 +00:00
|
|
|
v8::Local<v8::Value> Converter<blink::WebInputEvent>::ToV8(
|
|
|
|
v8::Isolate* isolate,
|
|
|
|
const blink::WebInputEvent& in) {
|
|
|
|
if (blink::WebInputEvent::IsKeyboardEventType(in.GetType()))
|
|
|
|
return gin::ConvertToV8(isolate,
|
|
|
|
*static_cast<const blink::WebKeyboardEvent*>(&in));
|
|
|
|
return gin::DataObjectBuilder(isolate)
|
|
|
|
.Set("type", in.GetType())
|
|
|
|
.Set("modifiers", ModifiersToArray(in.GetModifiers()))
|
|
|
|
.Set("_modifiers", in.GetModifiers())
|
|
|
|
.Build();
|
|
|
|
}
|
|
|
|
|
2018-04-18 01:55:30 +00:00
|
|
|
bool Converter<blink::WebKeyboardEvent>::FromV8(v8::Isolate* isolate,
|
|
|
|
v8::Local<v8::Value> val,
|
|
|
|
blink::WebKeyboardEvent* out) {
|
2019-10-31 07:56:00 +00:00
|
|
|
gin_helper::Dictionary dict;
|
2015-09-18 05:33:06 +00:00
|
|
|
if (!ConvertFromV8(isolate, val, &dict))
|
|
|
|
return false;
|
|
|
|
if (!ConvertFromV8(isolate, val, static_cast<blink::WebInputEvent*>(out)))
|
|
|
|
return false;
|
2015-11-16 03:15:13 +00:00
|
|
|
|
2016-03-06 06:04:05 +00:00
|
|
|
std::string str;
|
2016-10-07 19:46:33 +00:00
|
|
|
if (!dict.Get("keyCode", &str))
|
2015-11-16 03:15:13 +00:00
|
|
|
return false;
|
|
|
|
|
2024-01-10 22:23:35 +00:00
|
|
|
std::optional<char16_t> shifted_char;
|
2021-06-02 07:32:48 +00:00
|
|
|
ui::KeyboardCode keyCode = electron::KeyboardCodeFromStr(str, &shifted_char);
|
2017-06-16 20:42:33 +00:00
|
|
|
out->windows_key_code = keyCode;
|
2021-06-02 07:32:48 +00:00
|
|
|
if (shifted_char)
|
2020-05-26 20:06:26 +00:00
|
|
|
out->SetModifiers(out->GetModifiers() |
|
|
|
|
blink::WebInputEvent::Modifiers::kShiftKey);
|
2016-10-07 19:46:33 +00:00
|
|
|
|
|
|
|
ui::DomCode domCode = ui::UsLayoutKeyboardCodeToDomCode(keyCode);
|
2017-06-16 20:42:33 +00:00
|
|
|
out->dom_code = static_cast<int>(domCode);
|
2016-10-07 19:46:33 +00:00
|
|
|
|
|
|
|
ui::DomKey domKey;
|
|
|
|
ui::KeyboardCode dummy_code;
|
2020-09-29 15:40:31 +00:00
|
|
|
int flags = ui::WebEventModifiersToEventFlags(out->GetModifiers());
|
2016-10-07 19:46:33 +00:00
|
|
|
if (ui::DomCodeToUsLayoutDomKey(domCode, flags, &domKey, &dummy_code))
|
2017-06-16 20:42:33 +00:00
|
|
|
out->dom_key = static_cast<int>(domKey);
|
2016-10-07 19:46:33 +00:00
|
|
|
|
2020-05-26 20:06:26 +00:00
|
|
|
if ((out->GetType() == blink::WebInputEvent::Type::kChar ||
|
|
|
|
out->GetType() == blink::WebInputEvent::Type::kRawKeyDown)) {
|
2023-09-12 09:28:45 +00:00
|
|
|
// If the keyCode is e.g. Space or Plus we want to use the character
|
|
|
|
// instead of the keyCode: ' ' instead of 'Space', '+' instead of 'Plus'.
|
|
|
|
std::string character_str;
|
|
|
|
if (str.size() > 1 && domKey.IsCharacter())
|
|
|
|
base::WriteUnicodeCharacter(domKey.ToCharacter(), &character_str);
|
|
|
|
|
2016-08-01 00:14:11 +00:00
|
|
|
// Make sure to not read beyond the buffer in case some bad code doesn't
|
|
|
|
// NULL-terminate it (this is called from plugins).
|
2023-09-12 09:28:45 +00:00
|
|
|
std::u16string text16 = character_str.empty()
|
|
|
|
? base::UTF8ToUTF16(str)
|
|
|
|
: base::UTF8ToUTF16(character_str);
|
chore: bump chromium to 128.0.6611.0 (main) (#42779)
* chore: bump chromium in DEPS to 128.0.6577.0
* chore: bump chromium in DEPS to 128.0.6579.0
* 5675706: Reland "Reland "Reland "Reland "Add toolchains without PartitionAlloc-Everywhere for dump_syms et al""""
https://chromium-review.googlesource.com/c/chromium/src/+/5675706
* 5668597: [PDF Ink Signatures] Prompt download menu on save when there are edits
https://chromium-review.googlesource.com/c/chromium/src/+/5668597
* 5677014: Reland "Pull data_sharing_sdk from CIPD"
https://chromium-review.googlesource.com/c/chromium/src/+/5677014
* chore: fixup patch indices
* chore: bump chromium in DEPS to 128.0.6581.0
* chore: bump chromium in DEPS to 128.0.6583.0
* update patches
* 5455480: [Extensions] Allow service worker requests to continue without a cert
https://chromium-review.googlesource.com/c/chromium/src/+/5455480
* try to get some debugging output from script/push-patch.js
* chore: bump chromium in DEPS to 128.0.6585.0
* chore: bump chromium in DEPS to 128.0.6587.0
* update patches
* chore: bump chromium in DEPS to 128.0.6589.0
* more patch work
* maybe over here?
* chore: update patches
* 5673207: [HTTPS Upgrades] Disable in captive portal login webview
https://chromium-review.googlesource.com/c/chromium/src/+/5673207
* 5636785: Extensions: WAR: manifest.json's use_dynamic_url requires a dynamic url
https://chromium-review.googlesource.com/c/chromium/src/+/5636785
* chore: bump chromium in DEPS to 128.0.6591.0
* 5665458: Trigger WN2 page when feature is enabled
https://chromium-review.googlesource.com/c/chromium/src/+/5665458
* update patches
* chore: bump chromium in DEPS to 128.0.6593.0
* chore: bump chromium in DEPS to 128.0.6595.0
* chore: bump chromium in DEPS to 128.0.6597.0
* (patch update) 5694586: [compile hints] Remove the usage of v8::Isolate::SetJavaScriptCompileHintsMagicEnabledCallback API
https://chromium-review.googlesource.com/c/chromium/src/+/5694586
* update patches
* 5691287: Reland "Change blink::WebKeyboardEvent to use std::array in is members"
https://chromium-review.googlesource.com/c/chromium/src/+/5691287
The code changed here is modeled after code in `content/renderer/pepper/event_conversion.cc` that was also modified in this CL, so I took the same approach.
* 5529018: Cleanup EnableWebHidOnExtensionServiceWorker flag
https://chromium-review.googlesource.com/c/chromium/src/+/5529018
* 5526324: [Code Health] Add deprecation comment for base::SupportsWeakPtr.
https://chromium-review.googlesource.com/c/chromium/src/+/5526324
Note that this CL actually does make `SupportsWeakPtr` strictly restricted to existing implementations, no new ones. We could add a patch to add ourselves to this list, but it looks like we'll have to refactor this anyways in the near future. Since the refactor seems straightforward, let's try that first.
* chore: bump chromium in DEPS to 128.0.6598.0
* chore: update patches
* 5704737: Rename ExclusiveAccessContext::GetActiveWebContents to avoid conflict
https://chromium-review.googlesource.com/c/chromium/src/+/5704737
* chore: bump chromium in DEPS to 128.0.6601.0
* chore: update patches
* Add `base::StringPiece` header includes
Chromium is working on replacing `base::StringPiece` with `std::string_view`. (See the Chromium Bug below.) They're currently running mass codemods (across many multiple changes) to replace uses of `StringPiece` with `string_view`, including removing the header include for `StringPiece` in those files. This cascades down to our files that were implicitly depending on those includes through some other include.
They're on track to eventually deprecate and remove `StringPiece` so our code should be converted, but that can be done as an upgrade follow-up task. For now, adding the header back to files that need it should suffice for minimal upgrade changes.
Chromium Bug: https://issues.chromium.org/issues/40506050
* 5702737: GlobalRequestID: Avoid unwanted inlining and narrowing int conversions
https://chromium-review.googlesource.com/c/chromium/src/+/5702737
contender for smallest commit 2024
* 5706534: Rename GlobalFeatures to GlobalDesktopFeatures.
https://chromium-review.googlesource.com/c/chromium/src/+/5706534
* 5691321: ui: remove params variants of SelectFile listener functions
https://chromium-review.googlesource.com/c/chromium/src/+/5691321
* 5714949: [Extensions] Display re-enable dialog for MV2 disabled stage
https://chromium-review.googlesource.com/c/chromium/src/+/5714949
* chore: update libc++ filenames
* patch: disable scope reuse & associated dchecks in v8 (hopefully temp, upgrade follow-up)
* fixup! Add `base::StringPiece` header includes
* update MAS patch
5710330: Add crash keys to debug NativeWidgetMacNSWindowBorderlessFrame exception
https://chromium-review.googlesource.com/c/chromium/src/+/5710330
* chore: bump chromium in DEPS to 128.0.6603.0
* chore: update patches
* 5713258: Reland "Preparation for decoupling creation/initialization of context"
https://chromium-review.googlesource.com/c/chromium/src/+/5713258
When destroying a context, it must already be shutdown, and this change enforces it with a new CHECK.
We were overriding `BrowserContextKeyedServiceFactory::BrowserContextShutdown` with an empty implementation, which differed from the default implementation that notifies the `KeyedServiceFactory` that the context has shutdown. Since we were missing this notification, the CHECK would later trip when the service was being destoryed because it was not registered as shutdown when it was shutdown.
* chore: bump chromium in DEPS to 128.0.6605.2
* chore: update patches
* refactor: linux open/save dialog patch
Our existing implementation was relying on an opaque `void* params` parameter that was passed through `ui::SelectFileDialog`.
Recently, that parameter has been getting removed:
- 5691321: ui: remove params variants of SelectFile listener functions | https://chromium-review.googlesource.com/c/chromium/src/+/5691321
- 5709097: ui: remove SelectFileDialog impl params | https://chromium-review.googlesource.com/c/chromium/src/+/5709097
- https://issues.chromium.org/issues/340178601 "reconsider SelectFileDialog"
This restructures the patch to work with mostly the same mechanics, but directly on the `ui::SelectFileDialog` object. This nets us some wins in terms of a smaller patch.
* 5713262: DevTools UI binding AIDA client event returns response
https://chromium-review.googlesource.com/c/chromium/src/+/5713262
* fixup! refactor: linux open/save dialog patch
* chore: bump chromium in DEPS to 128.0.6606.0
* chore: update patches
* fixup! refactor: linux open/save dialog patch
* chore: bump chromium in DEPS to 128.0.6607.0
* chore: update printing.patch
Xref: https://chromium-review.googlesource.com/c/chromium/src/+/5722937
* fix: pwd error in electron-test, nan-test
fix: unshallow depot_tools before 3-way apply
* chore: e patches all
* fixup! fix: pwd error in electron-test, nan-test
* chore: bump chromium in DEPS to 128.0.6609.0
* chore: bump chromium in DEPS to 128.0.6611.0
* chore: update patches
* chore: update libcxx filenames
---------
Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com>
Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com>
Co-authored-by: Jeremy Rose <nornagon@nornagon.net>
Co-authored-by: PatchUp <73610968+patchup[bot]@users.noreply.github.com>
Co-authored-by: clavin <clavin@electronjs.org>
Co-authored-by: Charles Kerr <charles@charleskerr.com>
Co-authored-by: Alice Zhao <alice@makenotion.com>
2024-07-23 15:59:44 +00:00
|
|
|
std::ranges::fill(out->text, 0);
|
|
|
|
std::ranges::fill(out->unmodified_text, 0);
|
|
|
|
for (size_t i = 0; i < std::min(out->text.size() - 1, text16.size()); ++i) {
|
2016-08-01 00:14:11 +00:00
|
|
|
out->text[i] = text16[i];
|
2017-06-16 20:42:33 +00:00
|
|
|
out->unmodified_text[i] = text16[i];
|
2016-08-01 00:14:11 +00:00
|
|
|
}
|
2015-09-28 00:41:06 +00:00
|
|
|
}
|
2015-09-18 10:21:51 +00:00
|
|
|
return true;
|
2015-09-18 05:33:06 +00:00
|
|
|
}
|
|
|
|
|
2021-07-14 11:50:02 +00:00
|
|
|
int GetKeyLocationCode(const blink::WebInputEvent& key) {
|
|
|
|
// https://source.chromium.org/chromium/chromium/src/+/main:third_party/blink/renderer/core/events/keyboard_event.h;l=46;drc=1ff6437e65b183e673b7b4f25060b74dc2ba5c37
|
|
|
|
enum KeyLocationCode {
|
|
|
|
kDomKeyLocationStandard = 0x00,
|
|
|
|
kDomKeyLocationLeft = 0x01,
|
|
|
|
kDomKeyLocationRight = 0x02,
|
|
|
|
kDomKeyLocationNumpad = 0x03
|
|
|
|
};
|
|
|
|
using Modifiers = blink::WebInputEvent::Modifiers;
|
|
|
|
if (key.GetModifiers() & Modifiers::kIsKeyPad)
|
|
|
|
return kDomKeyLocationNumpad;
|
|
|
|
if (key.GetModifiers() & Modifiers::kIsLeft)
|
|
|
|
return kDomKeyLocationLeft;
|
|
|
|
if (key.GetModifiers() & Modifiers::kIsRight)
|
|
|
|
return kDomKeyLocationRight;
|
|
|
|
return kDomKeyLocationStandard;
|
|
|
|
}
|
|
|
|
|
|
|
|
v8::Local<v8::Value> Converter<blink::WebKeyboardEvent>::ToV8(
|
|
|
|
v8::Isolate* isolate,
|
|
|
|
const blink::WebKeyboardEvent& in) {
|
2023-08-21 01:43:41 +00:00
|
|
|
auto dict = gin_helper::Dictionary::CreateEmpty(isolate);
|
2021-07-14 11:50:02 +00:00
|
|
|
|
2022-09-27 19:47:46 +00:00
|
|
|
dict.Set("type", in.GetType());
|
2021-07-14 11:50:02 +00:00
|
|
|
dict.Set("key", ui::KeycodeConverter::DomKeyToKeyString(in.dom_key));
|
|
|
|
dict.Set("code", ui::KeycodeConverter::DomCodeToCodeString(
|
|
|
|
static_cast<ui::DomCode>(in.dom_code)));
|
|
|
|
|
|
|
|
using Modifiers = blink::WebInputEvent::Modifiers;
|
|
|
|
dict.Set("isAutoRepeat", (in.GetModifiers() & Modifiers::kIsAutoRepeat) != 0);
|
|
|
|
dict.Set("isComposing", (in.GetModifiers() & Modifiers::kIsComposing) != 0);
|
|
|
|
dict.Set("shift", (in.GetModifiers() & Modifiers::kShiftKey) != 0);
|
|
|
|
dict.Set("control", (in.GetModifiers() & Modifiers::kControlKey) != 0);
|
|
|
|
dict.Set("alt", (in.GetModifiers() & Modifiers::kAltKey) != 0);
|
|
|
|
dict.Set("meta", (in.GetModifiers() & Modifiers::kMetaKey) != 0);
|
|
|
|
dict.Set("location", GetKeyLocationCode(in));
|
|
|
|
dict.Set("_modifiers", in.GetModifiers());
|
|
|
|
dict.Set("modifiers", ModifiersToArray(in.GetModifiers()));
|
|
|
|
|
|
|
|
return dict.GetHandle();
|
|
|
|
}
|
|
|
|
|
2018-04-18 01:55:30 +00:00
|
|
|
bool Converter<blink::WebMouseEvent>::FromV8(v8::Isolate* isolate,
|
|
|
|
v8::Local<v8::Value> val,
|
|
|
|
blink::WebMouseEvent* out) {
|
2019-10-31 07:56:00 +00:00
|
|
|
gin_helper::Dictionary dict;
|
2015-09-18 05:33:06 +00:00
|
|
|
if (!ConvertFromV8(isolate, val, &dict))
|
|
|
|
return false;
|
|
|
|
if (!ConvertFromV8(isolate, val, static_cast<blink::WebInputEvent*>(out)))
|
|
|
|
return false;
|
2017-06-20 18:23:11 +00:00
|
|
|
|
|
|
|
float x = 0.f;
|
|
|
|
float y = 0.f;
|
|
|
|
if (!dict.Get("x", &x) || !dict.Get("y", &y))
|
2015-09-18 05:33:06 +00:00
|
|
|
return false;
|
2017-06-20 18:23:11 +00:00
|
|
|
out->SetPositionInWidget(x, y);
|
|
|
|
|
2016-05-23 05:26:38 +00:00
|
|
|
if (!dict.Get("button", &out->button))
|
2017-06-16 20:42:33 +00:00
|
|
|
out->button = blink::WebMouseEvent::Button::kLeft;
|
2017-06-20 18:23:11 +00:00
|
|
|
|
|
|
|
float global_x = 0.f;
|
|
|
|
float global_y = 0.f;
|
|
|
|
dict.Get("globalX", &global_x);
|
|
|
|
dict.Get("globalY", &global_y);
|
|
|
|
out->SetPositionInScreen(global_x, global_y);
|
|
|
|
|
2017-06-16 20:42:33 +00:00
|
|
|
dict.Get("movementX", &out->movement_x);
|
|
|
|
dict.Get("movementY", &out->movement_y);
|
|
|
|
dict.Get("clickCount", &out->click_count);
|
2015-09-18 10:21:51 +00:00
|
|
|
return true;
|
2015-09-18 05:33:06 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
bool Converter<blink::WebMouseWheelEvent>::FromV8(
|
2018-04-18 01:55:30 +00:00
|
|
|
v8::Isolate* isolate,
|
|
|
|
v8::Local<v8::Value> val,
|
2015-09-18 05:33:06 +00:00
|
|
|
blink::WebMouseWheelEvent* out) {
|
2019-10-31 07:56:00 +00:00
|
|
|
gin_helper::Dictionary dict;
|
2015-09-18 05:33:06 +00:00
|
|
|
if (!ConvertFromV8(isolate, val, &dict))
|
|
|
|
return false;
|
|
|
|
if (!ConvertFromV8(isolate, val, static_cast<blink::WebMouseEvent*>(out)))
|
|
|
|
return false;
|
2017-06-16 20:42:33 +00:00
|
|
|
dict.Get("deltaX", &out->delta_x);
|
|
|
|
dict.Get("deltaY", &out->delta_y);
|
|
|
|
dict.Get("wheelTicksX", &out->wheel_ticks_x);
|
|
|
|
dict.Get("wheelTicksY", &out->wheel_ticks_y);
|
|
|
|
dict.Get("accelerationRatioX", &out->acceleration_ratio_x);
|
|
|
|
dict.Get("accelerationRatioY", &out->acceleration_ratio_y);
|
2019-10-28 22:12:35 +00:00
|
|
|
|
|
|
|
bool has_precise_scrolling_deltas = false;
|
|
|
|
dict.Get("hasPreciseScrollingDeltas", &has_precise_scrolling_deltas);
|
|
|
|
if (has_precise_scrolling_deltas) {
|
2020-03-03 21:35:05 +00:00
|
|
|
out->delta_units = ui::ScrollGranularity::kScrollByPrecisePixel;
|
2019-10-28 22:12:35 +00:00
|
|
|
} else {
|
2020-03-03 21:35:05 +00:00
|
|
|
out->delta_units = ui::ScrollGranularity::kScrollByPixel;
|
2019-10-28 22:12:35 +00:00
|
|
|
}
|
2016-09-09 10:28:32 +00:00
|
|
|
|
|
|
|
#if defined(USE_AURA)
|
|
|
|
// Matches the behavior of ui/events/blink/web_input_event_traits.cc:
|
|
|
|
bool can_scroll = true;
|
|
|
|
if (dict.Get("canScroll", &can_scroll) && !can_scroll) {
|
2020-03-03 21:35:05 +00:00
|
|
|
out->delta_units = ui::ScrollGranularity::kScrollByPage;
|
2020-05-26 20:06:26 +00:00
|
|
|
out->SetModifiers(out->GetModifiers() &
|
|
|
|
~blink::WebInputEvent::Modifiers::kControlKey);
|
2016-09-09 10:28:32 +00:00
|
|
|
}
|
|
|
|
#endif
|
2015-09-18 10:21:51 +00:00
|
|
|
return true;
|
2015-09-18 05:33:06 +00:00
|
|
|
}
|
|
|
|
|
2020-08-12 18:33:58 +00:00
|
|
|
bool Converter<blink::DeviceEmulationParams>::FromV8(
|
2018-04-18 01:55:30 +00:00
|
|
|
v8::Isolate* isolate,
|
|
|
|
v8::Local<v8::Value> val,
|
2020-08-12 18:33:58 +00:00
|
|
|
blink::DeviceEmulationParams* out) {
|
2019-10-31 07:56:00 +00:00
|
|
|
gin_helper::Dictionary dict;
|
2015-09-18 03:06:38 +00:00
|
|
|
if (!ConvertFromV8(isolate, val, &dict))
|
|
|
|
return false;
|
|
|
|
|
2020-08-12 18:33:58 +00:00
|
|
|
std::string screen_type;
|
|
|
|
if (dict.Get("screenPosition", &screen_type)) {
|
|
|
|
screen_type = base::ToLowerASCII(screen_type);
|
|
|
|
if (screen_type == "mobile")
|
|
|
|
out->screen_type = blink::mojom::EmulatedScreenType::kMobile;
|
|
|
|
else if (screen_type == "desktop")
|
|
|
|
out->screen_type = blink::mojom::EmulatedScreenType::kDesktop;
|
2015-09-18 03:06:38 +00:00
|
|
|
else
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
2017-06-16 20:42:33 +00:00
|
|
|
dict.Get("screenSize", &out->screen_size);
|
2020-01-29 12:01:37 +00:00
|
|
|
gfx::Point view_position;
|
|
|
|
if (dict.Get("viewPosition", &view_position)) {
|
|
|
|
out->view_position = view_position;
|
|
|
|
}
|
2017-06-16 20:42:33 +00:00
|
|
|
dict.Get("deviceScaleFactor", &out->device_scale_factor);
|
|
|
|
dict.Get("viewSize", &out->view_size);
|
2015-09-18 03:06:38 +00:00
|
|
|
dict.Get("scale", &out->scale);
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
2016-05-03 00:02:33 +00:00
|
|
|
// static
|
2021-01-12 23:31:23 +00:00
|
|
|
v8::Local<v8::Value> Converter<blink::mojom::ContextMenuDataMediaType>::ToV8(
|
2018-04-18 01:55:30 +00:00
|
|
|
v8::Isolate* isolate,
|
2021-01-12 23:31:23 +00:00
|
|
|
const blink::mojom::ContextMenuDataMediaType& in) {
|
2016-05-03 00:02:33 +00:00
|
|
|
switch (in) {
|
2021-01-12 23:31:23 +00:00
|
|
|
case blink::mojom::ContextMenuDataMediaType::kImage:
|
2019-10-31 07:56:00 +00:00
|
|
|
return StringToV8(isolate, "image");
|
2021-01-12 23:31:23 +00:00
|
|
|
case blink::mojom::ContextMenuDataMediaType::kVideo:
|
2019-10-31 07:56:00 +00:00
|
|
|
return StringToV8(isolate, "video");
|
2021-01-12 23:31:23 +00:00
|
|
|
case blink::mojom::ContextMenuDataMediaType::kAudio:
|
2019-10-31 07:56:00 +00:00
|
|
|
return StringToV8(isolate, "audio");
|
2021-01-12 23:31:23 +00:00
|
|
|
case blink::mojom::ContextMenuDataMediaType::kCanvas:
|
2019-10-31 07:56:00 +00:00
|
|
|
return StringToV8(isolate, "canvas");
|
2021-01-12 23:31:23 +00:00
|
|
|
case blink::mojom::ContextMenuDataMediaType::kFile:
|
2019-10-31 07:56:00 +00:00
|
|
|
return StringToV8(isolate, "file");
|
2021-01-12 23:31:23 +00:00
|
|
|
case blink::mojom::ContextMenuDataMediaType::kPlugin:
|
2019-10-31 07:56:00 +00:00
|
|
|
return StringToV8(isolate, "plugin");
|
2016-05-03 00:02:33 +00:00
|
|
|
default:
|
2019-10-31 07:56:00 +00:00
|
|
|
return StringToV8(isolate, "none");
|
2016-05-03 00:02:33 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// static
|
2021-02-09 20:16:21 +00:00
|
|
|
v8::Local<v8::Value>
|
2024-01-10 22:23:35 +00:00
|
|
|
Converter<std::optional<blink::mojom::FormControlType>>::ToV8(
|
2018-04-18 01:55:30 +00:00
|
|
|
v8::Isolate* isolate,
|
2024-01-10 22:23:35 +00:00
|
|
|
const std::optional<blink::mojom::FormControlType>& in) {
|
2024-01-11 01:00:37 +00:00
|
|
|
std::string_view str{"none"};
|
2023-11-01 14:02:12 +00:00
|
|
|
if (in.has_value()) {
|
|
|
|
switch (*in) {
|
|
|
|
case blink::mojom::FormControlType::kButtonButton:
|
|
|
|
str = "button-button";
|
|
|
|
break;
|
2024-02-14 17:33:32 +00:00
|
|
|
case blink::mojom::FormControlType::kButtonPopover:
|
|
|
|
str = "popover-button";
|
|
|
|
break;
|
2023-11-01 14:02:12 +00:00
|
|
|
case blink::mojom::FormControlType::kButtonReset:
|
|
|
|
str = "reset-button";
|
|
|
|
break;
|
|
|
|
case blink::mojom::FormControlType::kButtonSelectList:
|
|
|
|
str = "select-list";
|
|
|
|
break;
|
|
|
|
case blink::mojom::FormControlType::kButtonSubmit:
|
|
|
|
str = "submit-button";
|
|
|
|
break;
|
|
|
|
case blink::mojom::FormControlType::kFieldset:
|
|
|
|
str = "field-set";
|
|
|
|
break;
|
|
|
|
case blink::mojom::FormControlType::kInputButton:
|
|
|
|
str = "input-button";
|
|
|
|
break;
|
|
|
|
case blink::mojom::FormControlType::kInputCheckbox:
|
|
|
|
str = "input-checkbox";
|
|
|
|
break;
|
|
|
|
case blink::mojom::FormControlType::kInputColor:
|
|
|
|
str = "input-color";
|
|
|
|
break;
|
|
|
|
case blink::mojom::FormControlType::kInputDate:
|
|
|
|
str = "input-date";
|
|
|
|
break;
|
|
|
|
case blink::mojom::FormControlType::kInputDatetimeLocal:
|
|
|
|
str = "input-datetime-local";
|
|
|
|
break;
|
|
|
|
case blink::mojom::FormControlType::kInputEmail:
|
|
|
|
str = "input-email";
|
|
|
|
break;
|
|
|
|
case blink::mojom::FormControlType::kInputFile:
|
|
|
|
str = "input-file";
|
|
|
|
break;
|
|
|
|
case blink::mojom::FormControlType::kInputHidden:
|
|
|
|
str = "input-hidden";
|
|
|
|
break;
|
|
|
|
case blink::mojom::FormControlType::kInputImage:
|
|
|
|
str = "input-image";
|
|
|
|
break;
|
|
|
|
case blink::mojom::FormControlType::kInputMonth:
|
|
|
|
str = "input-month";
|
|
|
|
break;
|
|
|
|
case blink::mojom::FormControlType::kInputNumber:
|
|
|
|
str = "input-number";
|
|
|
|
break;
|
|
|
|
case blink::mojom::FormControlType::kInputPassword:
|
|
|
|
str = "input-password";
|
|
|
|
break;
|
|
|
|
case blink::mojom::FormControlType::kInputRadio:
|
|
|
|
str = "input-radio";
|
|
|
|
break;
|
|
|
|
case blink::mojom::FormControlType::kInputRange:
|
|
|
|
str = "input-range";
|
|
|
|
break;
|
|
|
|
case blink::mojom::FormControlType::kInputReset:
|
|
|
|
str = "input-reset";
|
|
|
|
break;
|
|
|
|
case blink::mojom::FormControlType::kInputSearch:
|
|
|
|
str = "input-search";
|
|
|
|
break;
|
|
|
|
case blink::mojom::FormControlType::kInputSubmit:
|
|
|
|
str = "input-submit";
|
|
|
|
break;
|
|
|
|
case blink::mojom::FormControlType::kInputTelephone:
|
|
|
|
str = "input-telephone";
|
|
|
|
break;
|
|
|
|
case blink::mojom::FormControlType::kInputText:
|
|
|
|
str = "input-text";
|
|
|
|
break;
|
|
|
|
case blink::mojom::FormControlType::kInputTime:
|
|
|
|
str = "input-time";
|
|
|
|
break;
|
|
|
|
case blink::mojom::FormControlType::kInputUrl:
|
|
|
|
str = "input-url";
|
|
|
|
break;
|
|
|
|
case blink::mojom::FormControlType::kInputWeek:
|
|
|
|
str = "input-week";
|
|
|
|
break;
|
|
|
|
case blink::mojom::FormControlType::kOutput:
|
|
|
|
str = "output";
|
|
|
|
break;
|
|
|
|
case blink::mojom::FormControlType::kSelectList:
|
|
|
|
str = "select-list";
|
|
|
|
break;
|
|
|
|
case blink::mojom::FormControlType::kSelectMultiple:
|
|
|
|
str = "select-multiple";
|
|
|
|
break;
|
|
|
|
case blink::mojom::FormControlType::kSelectOne:
|
|
|
|
str = "select-one";
|
|
|
|
break;
|
|
|
|
case blink::mojom::FormControlType::kTextArea:
|
|
|
|
str = "text-area";
|
|
|
|
break;
|
|
|
|
}
|
2016-05-03 00:02:33 +00:00
|
|
|
}
|
2023-11-01 14:02:12 +00:00
|
|
|
return StringToV8(isolate, str);
|
2016-05-03 00:02:33 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
v8::Local<v8::Value> EditFlagsToV8(v8::Isolate* isolate, int editFlags) {
|
2023-08-21 01:43:41 +00:00
|
|
|
auto dict = gin_helper::Dictionary::CreateEmpty(isolate);
|
2019-11-05 23:41:20 +00:00
|
|
|
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));
|
2016-05-03 00:02:33 +00:00
|
|
|
|
|
|
|
bool pasteFlag = false;
|
2019-11-05 23:41:20 +00:00
|
|
|
if (editFlags & blink::ContextMenuDataEditFlags::kCanPaste) {
|
2021-03-16 16:18:45 +00:00
|
|
|
std::vector<std::u16string> types;
|
2016-05-03 00:02:33 +00:00
|
|
|
ui::Clipboard::GetForCurrentThread()->ReadAvailableTypes(
|
2020-07-22 05:34:34 +00:00
|
|
|
ui::ClipboardBuffer::kCopyPaste, /* data_dst = */ nullptr, &types);
|
2016-05-03 00:02:33 +00:00
|
|
|
pasteFlag = !types.empty();
|
|
|
|
}
|
|
|
|
dict.Set("canPaste", pasteFlag);
|
|
|
|
|
2019-11-05 23:41:20 +00:00
|
|
|
dict.Set("canDelete",
|
|
|
|
!!(editFlags & blink::ContextMenuDataEditFlags::kCanDelete));
|
2016-05-03 00:02:33 +00:00
|
|
|
dict.Set("canSelectAll",
|
2019-11-05 23:41:20 +00:00
|
|
|
!!(editFlags & blink::ContextMenuDataEditFlags::kCanSelectAll));
|
2020-12-16 05:32:11 +00:00
|
|
|
dict.Set("canEditRichly",
|
|
|
|
!!(editFlags & blink::ContextMenuDataEditFlags::kCanEditRichly));
|
2016-05-03 00:02:33 +00:00
|
|
|
|
2019-10-31 07:56:00 +00:00
|
|
|
return ConvertToV8(isolate, dict);
|
2016-05-03 00:02:33 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
v8::Local<v8::Value> MediaFlagsToV8(v8::Isolate* isolate, int mediaFlags) {
|
2023-08-21 01:43:41 +00:00
|
|
|
auto dict = gin_helper::Dictionary::CreateEmpty(isolate);
|
2021-02-09 20:16:21 +00:00
|
|
|
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));
|
2016-05-03 00:02:33 +00:00
|
|
|
dict.Set("isControlsVisible",
|
2021-02-09 20:16:21 +00:00
|
|
|
!!(mediaFlags & blink::ContextMenuData::kMediaControls));
|
2016-05-03 00:02:33 +00:00
|
|
|
dict.Set("canToggleControls",
|
2021-02-09 20:16:21 +00:00
|
|
|
!!(mediaFlags & blink::ContextMenuData::kMediaCanToggleControls));
|
|
|
|
dict.Set("canPrint", !!(mediaFlags & blink::ContextMenuData::kMediaCanPrint));
|
2016-05-03 00:02:33 +00:00
|
|
|
dict.Set("canRotate",
|
2021-02-09 20:16:21 +00:00
|
|
|
!!(mediaFlags & blink::ContextMenuData::kMediaCanRotate));
|
|
|
|
dict.Set("canShowPictureInPicture",
|
|
|
|
!!(mediaFlags & blink::ContextMenuData::kMediaCanPictureInPicture));
|
2020-12-16 05:32:11 +00:00
|
|
|
dict.Set("isShowingPictureInPicture",
|
2021-02-09 20:16:21 +00:00
|
|
|
!!(mediaFlags & blink::ContextMenuData::kMediaPictureInPicture));
|
|
|
|
dict.Set("canLoop", !!(mediaFlags & blink::ContextMenuData::kMediaCanLoop));
|
2019-10-31 07:56:00 +00:00
|
|
|
return ConvertToV8(isolate, dict);
|
2016-05-03 00:02:33 +00:00
|
|
|
}
|
|
|
|
|
2019-10-18 19:57:34 +00:00
|
|
|
v8::Local<v8::Value> Converter<blink::WebCacheResourceTypeStat>::ToV8(
|
2016-05-12 20:48:01 +00:00
|
|
|
v8::Isolate* isolate,
|
2019-10-18 19:57:34 +00:00
|
|
|
const blink::WebCacheResourceTypeStat& stat) {
|
2023-08-21 01:43:41 +00:00
|
|
|
auto dict = gin_helper::Dictionary::CreateEmpty(isolate);
|
2016-05-14 13:40:18 +00:00
|
|
|
dict.Set("count", static_cast<uint32_t>(stat.count));
|
|
|
|
dict.Set("size", static_cast<double>(stat.size));
|
2017-06-16 20:42:33 +00:00
|
|
|
dict.Set("liveSize", static_cast<double>(stat.decoded_size));
|
2016-05-12 20:48:01 +00:00
|
|
|
return dict.GetHandle();
|
|
|
|
}
|
|
|
|
|
2019-10-18 19:57:34 +00:00
|
|
|
v8::Local<v8::Value> Converter<blink::WebCacheResourceTypeStats>::ToV8(
|
2016-05-12 20:48:01 +00:00
|
|
|
v8::Isolate* isolate,
|
2019-10-18 19:57:34 +00:00
|
|
|
const blink::WebCacheResourceTypeStats& stats) {
|
2023-08-21 01:43:41 +00:00
|
|
|
auto dict = gin_helper::Dictionary::CreateEmpty(isolate);
|
2016-05-14 13:50:05 +00:00
|
|
|
dict.Set("images", stats.images);
|
|
|
|
dict.Set("scripts", stats.scripts);
|
2017-06-16 20:42:33 +00:00
|
|
|
dict.Set("cssStyleSheets", stats.css_style_sheets);
|
|
|
|
dict.Set("xslStyleSheets", stats.xsl_style_sheets);
|
2016-05-14 13:50:05 +00:00
|
|
|
dict.Set("fonts", stats.fonts);
|
|
|
|
dict.Set("other", stats.other);
|
2016-05-12 20:48:01 +00:00
|
|
|
return dict.GetHandle();
|
|
|
|
}
|
|
|
|
|
2018-04-05 23:13:24 +00:00
|
|
|
// static
|
2019-01-09 20:13:49 +00:00
|
|
|
v8::Local<v8::Value> Converter<network::mojom::ReferrerPolicy>::ToV8(
|
2018-04-18 01:55:30 +00:00
|
|
|
v8::Isolate* isolate,
|
2019-01-09 20:13:49 +00:00
|
|
|
const network::mojom::ReferrerPolicy& in) {
|
2023-06-19 08:33:09 +00:00
|
|
|
for (const auto& [name, val] : ReferrerPolicies)
|
|
|
|
if (val == in)
|
|
|
|
return StringToV8(isolate, name);
|
|
|
|
|
|
|
|
return StringToV8(isolate, "no-referrer");
|
2018-04-05 23:13:24 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
// static
|
2019-01-09 20:13:49 +00:00
|
|
|
bool Converter<network::mojom::ReferrerPolicy>::FromV8(
|
2018-04-18 01:55:30 +00:00
|
|
|
v8::Isolate* isolate,
|
2024-07-24 23:24:07 +00:00
|
|
|
v8::Local<v8::Value> val,
|
2019-01-09 20:13:49 +00:00
|
|
|
network::mojom::ReferrerPolicy* out) {
|
2023-06-19 08:33:09 +00:00
|
|
|
return FromV8WithLowerLookup(isolate, val, ReferrerPolicies, out);
|
2018-04-05 23:13:24 +00:00
|
|
|
}
|
|
|
|
|
2021-04-13 19:35:27 +00:00
|
|
|
// static
|
|
|
|
v8::Local<v8::Value> Converter<blink::mojom::Referrer>::ToV8(
|
|
|
|
v8::Isolate* isolate,
|
|
|
|
const blink::mojom::Referrer& val) {
|
2023-08-21 01:43:41 +00:00
|
|
|
auto dict = gin_helper::Dictionary::CreateEmpty(isolate);
|
2021-04-13 19:35:27 +00:00
|
|
|
dict.Set("url", ConvertToV8(isolate, val.url));
|
|
|
|
dict.Set("policy", ConvertToV8(isolate, val.policy));
|
|
|
|
return gin::ConvertToV8(isolate, dict);
|
|
|
|
}
|
|
|
|
//
|
|
|
|
// static
|
|
|
|
bool Converter<blink::mojom::Referrer>::FromV8(v8::Isolate* isolate,
|
|
|
|
v8::Local<v8::Value> val,
|
|
|
|
blink::mojom::Referrer* out) {
|
|
|
|
gin_helper::Dictionary dict;
|
|
|
|
if (!ConvertFromV8(isolate, val, &dict))
|
|
|
|
return false;
|
|
|
|
|
|
|
|
if (!dict.Get("url", &out->url))
|
|
|
|
return false;
|
|
|
|
|
|
|
|
if (!dict.Get("policy", &out->policy))
|
|
|
|
return false;
|
|
|
|
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
2019-10-09 17:59:08 +00:00
|
|
|
v8::Local<v8::Value> Converter<blink::CloneableMessage>::ToV8(
|
|
|
|
v8::Isolate* isolate,
|
|
|
|
const blink::CloneableMessage& in) {
|
2020-03-12 01:07:54 +00:00
|
|
|
return electron::DeserializeV8Value(isolate, in);
|
2019-10-09 17:59:08 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
bool Converter<blink::CloneableMessage>::FromV8(v8::Isolate* isolate,
|
2024-07-24 23:24:07 +00:00
|
|
|
v8::Local<v8::Value> val,
|
2019-10-09 17:59:08 +00:00
|
|
|
blink::CloneableMessage* out) {
|
2020-03-12 01:07:54 +00:00
|
|
|
return electron::SerializeV8Value(isolate, val, out);
|
2019-10-09 17:59:08 +00:00
|
|
|
}
|
|
|
|
|
2019-10-31 07:56:00 +00:00
|
|
|
} // namespace gin
|