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

chore: bump chromium to f1d9522c04ca8fa0a906f88ababe9 (master) (#18648)

Browse source 
* chore: bump chromium in DEPS to 675d7dc9f3334b15c3ec28c27db3dc19b26bd12e

* chore: update patches

* chore: bump chromium in DEPS to dce3562696f165a324273fcb6893f0e1fef42ab1

* chore: const interfaces are being removed from //content

Refs: 1631749
Bug: https://bugs.chromium.org/p/chromium/issues/detail?id=908139

* chore: update patches

* chore: blink::MediaStreamType is now consistent and deduplicated

* chore: update patches and printing code for ref -> uniq

* chore: bridge_impl() --> GetInProcessNSWindowBridge

Refs: 1642988

* fixme: TotalMarkedObjectSize has been removed

* chore: fix linting

* chore: bump chromium in DEPS to 9503e1a2fcbf17db08094d8caae3e1407e918af3

* chore: fix slightly broken printing patch

* chore: update patches for SiteInstanceImpl changes

Refs: 1612025

* chore: update patches for SiteInstanceImpl changes

* chore: bump chromium in DEPS to 6801e6c1ddd1b7b73e594e97157ddd539ca335d7

* chore: update patches

* chore: bump chromium in DEPS to 27e198912d7c1767052ec785c22e2e88b2cb4d8b

* chore: remove system_request_context

Refs: 1647172

* chore: creation of FtpProtocolHandler needs an auth cache

Refs: 1639683

* fixme: disable marked spec

* chore: bump chromium in DEPS to 3dcd7fe453ad13a22b114b95f05590eba74c5471

* chore: bump chromium in DEPS to bdc24128b75008743d819e298557a53205706e7c

* chore: bump chromium in DEPS to 7da330b58fbe0ba94b9b94abbb8085bead220228

* update patches

* remove TotalMarkedObjectSize

1631708

* add libvulkan.so to dist zip manifest on linux

* chore: bump chromium in DEPS to 1e85d0f45b52649efd0010cc9dab6d2804f24443

* update patches

* add angle features to gpuinfo

1638658

* mark 'marked' property as deprecated

* disable webview resize test

* FIXME: disable vulkan on 32-bit arm

* chore: bump chromium in DEPS to cd0297c6a83fdd2b1f6bc312e7d5acca736a3c56

* Revert "FIXME: disable vulkan on 32-bit arm"

This reverts commit 5c1e0ef302a6db1e72231d4e823f91bb08e281af.

* backport from upstream: fix swiftshader build on arm

https://swiftshader-review.googlesource.com/c/SwiftShader/+/32768/

* update patches

* viz: update OutputDeviceWin to new shared memory api

1649574

* base::Contains{Key,Value} => base::Contains

1649478

* fixup! viz: update OutputDeviceWin to new shared memory api

* stub out StatusIconLinuxDbus-related delegate methods

1638180

* chore: bump chromium in DEPS to 964ea3fd4bdc006d62533f5755043076220181f1

* Remove the BrowserContext methods to create URLRequestContexts for main/media partitions when a partition_domain is specified

1655087

* fixup! stub out StatusIconLinuxDbus-related delegate methods

* add remote_cocoa to chromium_src deps

1657068

* fixup! stub out StatusIconLinuxDbus-related delegate methods

* attempt at fix linux-debug build

* add swiftshader/libvulkan.so to arm manifest

* chore: bump chromium in DEPS to 28688f76afef27c36631aa274691e333ddecdc22

* update patches

* chore: bump chromium in DEPS to fe7450e1578a9584189f87d59d0d1a8548bf6b90

* chore: bump chromium in DEPS to f304dfd682dc86a755a6c49a16ee6876e0db45fb

* chore: bump chromium in DEPS to f0fd4d6c365aad9edd83bdfff9954c47d271b75c

* Update patches

* Remove no longer needed WOA patch

* Put back IOThread in BrowserProcess

We need this until we enable the network service.

* move atom.ico to inputs

* Update to latest LKGR to fix no template named 'bitset' in namespace 'std'

* fixup! Put back IOThread in BrowserProcess

* chore: bump chromium in DEPS to dcf9662dc9a896a175d791001350324167b1cad3

* Update patches

content_allow_embedder_to_prevent_locking_scheme_registry.patch is no longer necessary as it was upstreamed via 1637040

* Fix renamed enum

* Use newer docker container

Contains updated dependencies

* Try to track down arm test failures

* Fix arm tests

* chore: bump chromium in DEPS to 8cbceef57b37ee14b9c4c3405a3f7663922c5b5d

* Update patches

* Add needed dependencies for testing 32-bit linux

* Remove arm debugging.

* Remove additional debugging

* Fix compiler errors

* Handle new macOS helper

* Fix compile error on Linux

* chore: bump chromium in DEPS to 66a93991ddaff6a9f1b13d110959947cb03a1860

* Add new helper files to manifests

* fix BUILD.gn for macOS

* Fix compile errors

* Add patch to put back colors needed for autofill/datalist

* chore: bump chromium in DEPS to e89617079f11e33f33cdb3924f719a579c73704b

* Updated patches

* Remove no longer needed patch

* Remove no longer needed patch

* Fix compile error with patch

* Really fix the patch

* chore: bump chromium in DEPS to c70f12476a45840408f1d5ff5968e7f7ceaad9d4

* chore: bump chromium in DEPS to 06d2dd7a8933b41545a7c26349c802f570563fd5

* chore: bump chromium in DEPS to b0b9ff8f727deb519ccbec7cf1c8d9ed543d88ab

* Update patches

* Fix compiler errors

* Fix removed ChromeNetLog

* Revert "Fix removed ChromeNetLog"

This reverts commit 426dfd90b5ab0a9c1df415d71c88e8aed2bd5bbe.

* Remove ChromeNetLog.

1663846

* chore: bump chromium in DEPS to fefcc4926d58dccd59ac95be65eab3a4ebfe2f29

* Update patches

* Update v8 patches

* Fix lint error

* Fix compile errors

* chore: bump chromium in DEPS to 4de815ef92ef2eef515506fe09bdc466526a8fd9

* Use custom protocol to test baseURLForDataURL

* Use newer SDK (10.0.18362) for Windows

* Update patches

* Update arm manifest since swiftshader reenabled.

* Don't delete dir that isn't ever there.

* Fix compile errors.

* Need src dir created

* Update for removed InspectorFrontendAPI.addExtensions

* Revert "Use newer SDK (10.0.18362) for Windows"

This reverts commit 68763a0c88cdc44b971462e49662aecc167d3d99.

* Revert "Need src dir created"

This reverts commit 7daedc29d0844316d4097648dde7f40f1a3848fb.

* Revert "Don't delete dir that isn't ever there."

This reverts commit bf424bc30ffcb23b1d9a634d4df410342536640e.

* chore: bump chromium in DEPS to 97dab6b0124ea53244caf123921b5d14893bcca7

* chore: bump chromium in DEPS to c87d16d49a85dc7122781f6c979d354c20f7f78b

* chore: bump chromium in DEPS to 004bcee2ea336687cedfda8f8a151806ac757d15

* chore: bump chromium in DEPS to 24428b26a9d15a013b2a253e1084ec3cb54b660b

* chore: bump chromium in DEPS to fd25914e875237df88035a6abf89a70bf1360b57

* Update patches

* Update node to fix build error

* Fix compile errors

* chore: bump chromium in DEPS to 3062b7cf090f1d9522c04ca8fa0a906f88ababe9

* chore: update node ref for pushed tags

* chore: update patches for new chromium

* chore: fix printing patches

* Use new (10.0.18362) Windows SDK

* roll node to fix v8 build issues in debug build

* Add support for plugin helper

* fix: add patch to fix gpu info enumeration

Can be removed once CL lands upstream.

Refs: 1685993

* spec: navigator.requestMIDIAccess now requires a secure origin

This test requires a secure origin so we fake one.

Refs: 1657952

* FIXME: temporarily disable SharedWorker tests

* use released version of node-abstractsocket

* fix abstract-socket
This commit is contained in:
Electron Bot 2019-07-02 18:22:09 -07:00 • committed by Samuel Attard
parent 9bef48216f
commit 50b9c7051e
143 changed files with 1040 additions and 926 deletions
Download patch file Download diff file Expand all files Collapse all files

4
shell/common/api/atom_api_clipboard.cc
View file

@ -21,9 +21,9 @@ namespace api {
ui::ClipboardType Clipboard::GetClipboardType(mate::Arguments* args) {
std::string type;
if (args->GetNext(&type) && type == "selection")
return ui::CLIPBOARD_TYPE_SELECTION;
return ui::ClipboardType::kSelection;
else
return ui::CLIPBOARD_TYPE_COPY_PASTE;
return ui::ClipboardType::kCopyPaste;
}
std::vector<base::string16> Clipboard::AvailableFormats(mate::Arguments* args) {

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

@ -258,13 +258,11 @@ v8::Local<v8::Promise> ElectronBindings::GetProcessMemoryInfo(
v8::Local<v8::Value> ElectronBindings::GetBlinkMemoryInfo(
v8::Isolate* isolate) {
auto allocated = blink::ProcessHeap::TotalAllocatedObjectSize();
auto marked = blink::ProcessHeap::TotalMarkedObjectSize();
auto total = blink::ProcessHeap::TotalAllocatedSpace();
mate::Dictionary dict = mate::Dictionary::CreateEmpty(isolate);
dict.SetHidden("simple", true);
dict.Set("allocated", static_cast<double>(allocated >> 10));
dict.Set("marked", static_cast<double>(marked >> 10));
dict.Set("total", static_cast<double>(total >> 10));
return dict.GetHandle();
}

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

@ -31,7 +31,7 @@ std::shared_ptr<Archive> GetOrCreateAsarArchive(const base::FilePath& path) {
if (!g_archive_map_tls.Pointer()->Get())
g_archive_map_tls.Pointer()->Set(new ArchiveMap);
ArchiveMap& archive_map = *g_archive_map_tls.Pointer()->Get();
if (!ContainsKey(archive_map, path)) {
if (!base::Contains(archive_map, path)) {
std::shared_ptr<Archive> archive(new Archive(path));
if (!archive->Init())
return nullptr;

7
shell/common/mac/main_application_bundle.mm
View file

@ -10,6 +10,7 @@
#include "base/mac/foundation_util.h"
#include "base/path_service.h"
#include "base/strings/string_util.h"
#include "content/common/mac_helpers.h"
namespace electron {
@ -30,7 +31,11 @@ base::FilePath MainApplicationBundlePath() {
// Up to Contents.
if (!HasMainProcessKey() &&
base::EndsWith(path.value(), " Helper", base::CompareCase::SENSITIVE)) {
(base::EndsWith(path.value(), " Helper", base::CompareCase::SENSITIVE) ||
base::EndsWith(path.value(), content::kMacHelperSuffix_renderer,
base::CompareCase::SENSITIVE) ||
base::EndsWith(path.value(), content::kMacHelperSuffix_plugin,
base::CompareCase::SENSITIVE))) {
// The running executable is the helper. Go up five steps:
// Contents/Frameworks/Helper.app/Contents/MacOS/Helper
// ^ to here ^ from here

90
shell/common/mouse_util.cc
View file

@ -5,99 +5,99 @@
#include "shell/common/mouse_util.h"
#include <string>
using Cursor = blink::WebCursorInfo::Type;
using Cursor = ui::CursorType;
namespace electron {
std::string CursorTypeToString(const content::CursorInfo& info) {
switch (info.type) {
case Cursor::kTypePointer:
case Cursor::kPointer:
return "default";
case Cursor::kTypeCross:
case Cursor::kCross:
return "crosshair";
case Cursor::kTypeHand:
case Cursor::kHand:
return "pointer";
case Cursor::kTypeIBeam:
case Cursor::kIBeam:
return "text";
case Cursor::kTypeWait:
case Cursor::kWait:
return "wait";
case Cursor::kTypeHelp:
case Cursor::kHelp:
return "help";
case Cursor::kTypeEastResize:
case Cursor::kEastResize:
return "e-resize";
case Cursor::kTypeNorthResize:
case Cursor::kNorthResize:
return "n-resize";
case Cursor::kTypeNorthEastResize:
case Cursor::kNorthEastResize:
return "ne-resize";
case Cursor::kTypeNorthWestResize:
case Cursor::kNorthWestResize:
return "nw-resize";
case Cursor::kTypeSouthResize:
case Cursor::kSouthResize:
return "s-resize";
case Cursor::kTypeSouthEastResize:
case Cursor::kSouthEastResize:
return "se-resize";
case Cursor::kTypeSouthWestResize:
case Cursor::kSouthWestResize:
return "sw-resize";
case Cursor::kTypeWestResize:
case Cursor::kWestResize:
return "w-resize";
case Cursor::kTypeNorthSouthResize:
case Cursor::kNorthSouthResize:
return "ns-resize";
case Cursor::kTypeEastWestResize:
case Cursor::kEastWestResize:
return "ew-resize";
case Cursor::kTypeNorthEastSouthWestResize:
case Cursor::kNorthEastSouthWestResize:
return "nesw-resize";
case Cursor::kTypeNorthWestSouthEastResize:
case Cursor::kNorthWestSouthEastResize:
return "nwse-resize";
case Cursor::kTypeColumnResize:
case Cursor::kColumnResize:
return "col-resize";
case Cursor::kTypeRowResize:
case Cursor::kRowResize:
return "row-resize";
case Cursor::kTypeMiddlePanning:
case Cursor::kMiddlePanning:
return "m-panning";
case Cursor::kTypeEastPanning:
case Cursor::kEastPanning:
return "e-panning";
case Cursor::kTypeNorthPanning:
case Cursor::kNorthPanning:
return "n-panning";
case Cursor::kTypeNorthEastPanning:
case Cursor::kNorthEastPanning:
return "ne-panning";
case Cursor::kTypeNorthWestPanning:
case Cursor::kNorthWestPanning:
return "nw-panning";
case Cursor::kTypeSouthPanning:
case Cursor::kSouthPanning:
return "s-panning";
case Cursor::kTypeSouthEastPanning:
case Cursor::kSouthEastPanning:
return "se-panning";
case Cursor::kTypeSouthWestPanning:
case Cursor::kSouthWestPanning:
return "sw-panning";
case Cursor::kTypeWestPanning:
case Cursor::kWestPanning:
return "w-panning";
case Cursor::kTypeMove:
case Cursor::kMove:
return "move";
case Cursor::kTypeVerticalText:
case Cursor::kVerticalText:
return "vertical-text";
case Cursor::kTypeCell:
case Cursor::kCell:
return "cell";
case Cursor::kTypeContextMenu:
case Cursor::kContextMenu:
return "context-menu";
case Cursor::kTypeAlias:
case Cursor::kAlias:
return "alias";
case Cursor::kTypeProgress:
case Cursor::kProgress:
return "progress";
case Cursor::kTypeNoDrop:
case Cursor::kNoDrop:
return "nodrop";
case Cursor::kTypeCopy:
case Cursor::kCopy:
return "copy";
case Cursor::kTypeNone:
case Cursor::kNone:
return "none";
case Cursor::kTypeNotAllowed:
case Cursor::kNotAllowed:
return "not-allowed";
case Cursor::kTypeZoomIn:
case Cursor::kZoomIn:
return "zoom-in";
case Cursor::kTypeZoomOut:
case Cursor::kZoomOut:
return "zoom-out";
case Cursor::kTypeGrab:
case Cursor::kGrab:
return "grab";
case Cursor::kTypeGrabbing:
case Cursor::kGrabbing:
return "grabbing";
case Cursor::kTypeCustom:
case Cursor::kCustom:
return "custom";
default:
return "default";

2
shell/common/native_mate_converters/blink_converter.cc
View file

@ -417,7 +417,7 @@ v8::Local<v8::Value> EditFlagsToV8(v8::Isolate* isolate, int editFlags) {
std::vector<base::string16> types;
bool ignore;
ui::Clipboard::GetForCurrentThread()->ReadAvailableTypes(
ui::CLIPBOARD_TYPE_COPY_PASTE, &types, &ignore);
ui::ClipboardType::kCopyPaste, &types, &ignore);
pasteFlag = !types.empty();
}
dict.Set("canPaste", pasteFlag);