mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

chore: bump chromium to 0e4ca9c0a63d7a39bd910997ad4c6 (master) (#24687)

Browse source 
* chore: bump chromium in DEPS to 1f1c4d91f6eaa4a033ec8f499d63a0717f79a42a

* viz: Do not apply white level scaling for RGBA fp16 HDR video

2296006

* Move WebPreferences to WebContents

2263635

* Fix missing WeakPtr check in PreconnectManager

2309029

* Fixup swiftshader roll revision

* Update patch indices

* Move WebDeviceEmulationParams into common.

2303356

* Move EnableDisableDeviceEmulation to blink mojom messages

2303367

* PDF Viewer: Remove flag for two-up view

2311130

* Add mojom definition for DeviceEmulationParams.

2303491

* Remove ServiceWorkerContextWatcher from PaymentAppInstaller

2291186

* Loader: Move transferrable_url_loader.mojom into blink's mojom directory

2306123

* chore: bump chromium in DEPS to 4974f436479739025a90ebc2cc2e36d67ee1ac46

* mac: Work around Xcode 12b3 SDK bug

2315078

* Reland Update core items for macOS Big Sur.

2315162

* Update Swiftshader revision

* mac/arm64: When cross-building the snapshot, use page size of the target ISA instead of the host.

2310575

* Update patch indices

* Rename {,Non}ClientView::CanClose() to OnWindowCloseRequested()

2247838

* chore: bump chromium in DEPS to e9465d70d1dea539400f0fddad43358ea3c31d71

* chore: bump chromium in DEPS to bd5b71c5f20288eb26068a39ae6e0579566a51c5

* chore: bump chromium in DEPS to 786ee543048bd07d07c5ac50b7dbbdd6bdd8dcce

* chore: bump chromium in DEPS to 34eb6ecbf2c5894b648900bf771a2a29de204798

* chore: bump chromium in DEPS to 567ff038d68e3adb8116a01eec863cdf34d775f5

* chore: bump chromium in DEPS to 340b45c8d4ceb2dd61969fc34e1928d3c46db48c

* chore: update patches

* chore: base::DeleteFile with two params is removed

Should use base::DeleteFile and base::DeletePathRecursively when
appropriate

Refs: 2313376

* chore: add patch for NodePlatform::PostJob impl

* chore: update patches

* chore: extension file access is now instrumented

Refs: 2209995

* chore: implement SetWindowFrameInScreen in OSR RWHV

Refs: 2321409

* chore: NotifyUserActivation requires a type now

This is just for a histogram thing and therefore it does not matter what
we pass in

Refs: 2281303

* chore: update patches

* chore: bump chromium in DEPS to cd570e6dd3dcb84463ac252b04e92ceb02d8400c

* chore: update patches

* chore: bump chromium in DEPS to 0187908a31866992b90c59719ac1d016328f6ee0

* chore: bump chromium in DEPS to 3c9df38c508f3dba26a75248beed4882ddfb98e9

* chore: bump chromium in DEPS to 1a47d3b9cee710bd3c958c4f2d8b205710df9d50

* chore: bump chromium in DEPS to baac93040d96abdab72d46dd034c60f86e108702

* chore: bump chromium in DEPS to 13836145f97299e636491de38064b78861c4fb2e

* update patches

* change OS_MACOSX -> OS_MAC

Refs: https://bugs.chromium.org/p/chromium/issues/detail?id=1105907

* patch: add header for ToExecutionContext in WebMessagePortConverter

* chore: bump chromium in DEPS to 91ab9b6ac5d04dc034a03ad847fbfa8261328c2b

* update patches

* NeedToFireBeforeUnloadOrUnload -> NeedToFireBeforeUnloadOrUnloadEvents

Refs: 2288711

* chore: bump chromium in DEPS to 290deb11f0e30cb1382fd8f8793d340560283c23

* update patches

* add dragdrop header for autofill popup

* int -> x11::Time

* patch out accessibility private API use

Refs: 2330812

* remove usage of XEvent

Refs: 2317767

* trigger recalculation of WebPreferences before renderer initialization

Refs: 2263635

* chore: bump chromium in DEPS to 6bdb484583b99c96ef3388d0c2184326581b2d5a

* chore: bump chromium in DEPS to 1eb2a79cde04fd5c8ae51b4d813e6521635269e5

* chore: bump chromium in DEPS to 3dc8e3c0f400e4ca9c0a63d7a39bd910997ad4c6

* chore: update patches

* fixup! trigger recalculation of WebPreferences before renderer initialization

* views: Make MenuButton and RadioButton default constructible

2339586

* chore: fix code style

Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com>
Co-authored-by: Samuel Attard <sattard@slack-corp.com>
Co-authored-by: Andy Locascio <andy@slack-corp.com>
Co-authored-by: deepak1556 <hop2deep@gmail.com>
This commit is contained in:
Electron Bot 2020-08-12 11:33:58 -07:00 • committed by GitHub
parent 3d2afa45c3
commit 8798571a77
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
169 changed files with 759 additions and 1018 deletions
Download patch file Download diff file Expand all files Collapse all files

2
shell/common/api/electron_api_clipboard.cc
View file

@ -206,7 +206,7 @@ void Clipboard::WriteImage(const gfx::Image& image,
}
}
#if !defined(OS_MACOSX)
#if !defined(OS_MAC)
void Clipboard::WriteFindText(const base::string16& text) {}
base::string16 Clipboard::ReadFindText() {
return base::string16();

10
shell/common/api/electron_api_native_image.cc
View file

@ -76,7 +76,7 @@ base::FilePath NormalizePath(const base::FilePath& path) {
}
}
#if defined(OS_MACOSX)
#if defined(OS_MAC)
bool IsTemplateFilename(const base::FilePath& path) {
return (base::MatchPattern(path.value(), "*Template.*") ||
base::MatchPattern(path.value(), "*Template@*x.*"));
@ -233,7 +233,7 @@ v8::Local<v8::Value> NativeImage::GetBitmap(gin::Arguments* args) {
v8::Local<v8::Value> NativeImage::GetNativeHandle(
gin_helper::ErrorThrower thrower) {
#if defined(OS_MACOSX)
#if defined(OS_MAC)
if (IsEmpty())
return node::Buffer::New(thrower.isolate(), 0).ToLocalChecked();
@ -356,7 +356,7 @@ void NativeImage::AddRepresentation(const gin_helper::Dictionary& options) {
}
}
#if !defined(OS_MACOSX)
#if !defined(OS_MAC)
void NativeImage::SetTemplateImage(bool setAsTemplate) {}
bool NativeImage::IsTemplateImage() {
@ -407,7 +407,7 @@ gin::Handle<NativeImage> NativeImage::CreateFromPath(
electron::util::PopulateImageSkiaRepsFromPath(&image_skia, image_path);
gfx::Image image(image_skia);
gin::Handle<NativeImage> handle = Create(isolate, image);
#if defined(OS_MACOSX)
#if defined(OS_MAC)
if (IsTemplateFilename(image_path))
handle->SetTemplateImage(true);
#endif
@ -504,7 +504,7 @@ gin::Handle<NativeImage> NativeImage::CreateFromDataURL(v8::Isolate* isolate,
return CreateEmpty(isolate);
}
#if !defined(OS_MACOSX)
#if !defined(OS_MAC)
gin::Handle<NativeImage> NativeImage::CreateFromNamedImage(gin::Arguments* args,
std::string name) {
return CreateEmpty(args->isolate());

2
shell/common/api/electron_bindings.cc
View file

@ -209,7 +209,7 @@ v8::Local<v8::Value> ElectronBindings::GetSystemMemoryInfo(
dict.Set("free", free);
// NB: These return bogus values on macOS
#if !defined(OS_MACOSX)
#if !defined(OS_MAC)
dict.Set("swapTotal", mem_info.swap_total);
dict.Set("swapFree", mem_info.swap_free);
#endif

2
shell/common/asar/scoped_temporary_file.cc
View file

@ -22,7 +22,7 @@ ScopedTemporaryFile::~ScopedTemporaryFile() {
#if defined(OS_WIN)
base::DeleteFileAfterReboot(path_);
#else
base::DeleteFile(path_, false);
base::DeleteFile(path_);
#endif
}
}

2
shell/common/crash_keys.cc
View file

@ -142,7 +142,7 @@ void SetPlatformCrashKey() {
static crash_reporter::CrashKeyString<8> platform_key("platform");
#if defined(OS_WIN)
platform_key.Set("win32");
#elif defined(OS_MACOSX)
#elif defined(OS_MAC)
platform_key.Set("darwin");
#elif defined(OS_LINUX)
platform_key.Set("linux");

2
shell/common/electron_paths.h
View file

@ -9,7 +9,7 @@
#if defined(OS_WIN)
#include "base/base_paths_win.h"
#elif defined(OS_MACOSX)
#elif defined(OS_MAC)
#include "base/base_paths_mac.h"
#endif

21
shell/common/gin_converters/blink_converter.cc
View file

@ -22,7 +22,8 @@
#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"
#include "third_party/blink/public/web/web_device_emulation_params.h"
#include "third_party/blink/public/common/widget/device_emulation_params.h"
#include "third_party/blink/public/platform/web_size.h"
#include "ui/base/clipboard/clipboard.h"
#include "ui/events/keycodes/dom/keycode_converter.h"
#include "ui/events/keycodes/keyboard_code_conversion.h"
@ -292,21 +293,21 @@ bool Converter<blink::WebSize>::FromV8(v8::Isolate* isolate,
return dict.Get("width", &out->width) && dict.Get("height", &out->height);
}
bool Converter<blink::WebDeviceEmulationParams>::FromV8(
bool Converter<blink::DeviceEmulationParams>::FromV8(
v8::Isolate* isolate,
v8::Local<v8::Value> val,
blink::WebDeviceEmulationParams* out) {
blink::DeviceEmulationParams* out) {
gin_helper::Dictionary dict;
if (!ConvertFromV8(isolate, val, &dict))
return false;
std::string screen_position;
if (dict.Get("screenPosition", &screen_position)) {
screen_position = base::ToLowerASCII(screen_position);
if (screen_position == "mobile")
out->screen_position = blink::WebDeviceEmulationParams::kMobile;
else if (screen_position == "desktop")
out->screen_position = blink::WebDeviceEmulationParams::kDesktop;
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;
else
return false;
}

6
shell/common/gin_converters/blink_converter.h
View file

@ -15,7 +15,7 @@ namespace blink {
class WebMouseEvent;
class WebMouseWheelEvent;
class WebKeyboardEvent;
struct WebDeviceEmulationParams;
struct DeviceEmulationParams;
struct WebSize;
} // namespace blink
@ -60,10 +60,10 @@ struct Converter<blink::WebSize> {
};
template <>
struct Converter<blink::WebDeviceEmulationParams> {
struct Converter<blink::DeviceEmulationParams> {
static bool FromV8(v8::Isolate* isolate,
v8::Local<v8::Value> val,
blink::WebDeviceEmulationParams* out);
blink::DeviceEmulationParams* out);
};
template <>

2
shell/common/keyboard_util.cc
View file

@ -24,7 +24,7 @@ ui::KeyboardCode KeyboardCodeFromKeyIdentifier(const std::string& s,
str == "meta") {
return ui::VKEY_COMMAND;
} else if (str == "commandorcontrol" || str == "cmdorctrl") {
#if defined(OS_MACOSX)
#if defined(OS_MAC)
return ui::VKEY_COMMAND;
#else
return ui::VKEY_CONTROL;

2
shell/common/node_bindings.cc
View file

@ -257,7 +257,7 @@ std::unique_ptr<const char* []> StringVectorToArgArray(
}
base::FilePath GetResourcesPath() {
#if defined(OS_MACOSX)
#if defined(OS_MAC)
return MainApplicationBundlePath().Append("Contents").Append("Resources");
#else
auto* command_line = base::CommandLine::ForCurrentProcess();

2
shell/common/platform_util.h
View file

@ -50,7 +50,7 @@ void Beep();
bool GetFolderPath(int key, base::FilePath* result);
#endif
#if defined(OS_MACOSX)
#if defined(OS_MAC)
bool GetLoginItemEnabled();
bool SetLoginItemEnabled(bool enabled);
#endif