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

chore: bump chromium to 5b340c815ce15ab2efcf277ed19e9 (master) (#22064)

Browse source 
Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com>
Co-authored-by: Samuel Attard <samuel.r.attard@gmail.com>
Co-authored-by: loc <andy@slack-corp.com>
Co-authored-by: Robo <hop2deep@gmail.com>
Co-authored-by: Jeremy Apthorp <nornagon@nornagon.net>
This commit is contained in:
Electron Bot 2020-03-03 13:35:05 -08:00 • committed by GitHub
parent 3a331ffca6
commit 39baf68790
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
126 changed files with 1047 additions and 961 deletions
Download patch file Download diff file Expand all files Collapse all files

5
shell/common/extensions/electron_extensions_client.cc
View file

@ -39,11 +39,6 @@ class ElectronPermissionMessageProvider
return extensions::PermissionMessages();
}
extensions::PermissionMessages GetPowerfulPermissionMessages(
const extensions::PermissionIDSet& permissions) const override {
return extensions::PermissionMessages();
}
bool IsPrivilegeIncrease(
const extensions::PermissionSet& granted_permissions,
const extensions::PermissionSet& requested_permissions,

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

@ -264,17 +264,16 @@ bool Converter<blink::WebMouseWheelEvent>::FromV8(
bool has_precise_scrolling_deltas = false;
dict.Get("hasPreciseScrollingDeltas", &has_precise_scrolling_deltas);
if (has_precise_scrolling_deltas) {
out->delta_units =
ui::input_types::ScrollGranularity::kScrollByPrecisePixel;
out->delta_units = ui::ScrollGranularity::kScrollByPrecisePixel;
} else {
out->delta_units = ui::input_types::ScrollGranularity::kScrollByPixel;
out->delta_units = ui::ScrollGranularity::kScrollByPixel;
}
#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) {
out->delta_units = ui::input_types::ScrollGranularity::kScrollByPage;
out->delta_units = ui::ScrollGranularity::kScrollByPage;
out->SetModifiers(out->GetModifiers() & ~blink::WebInputEvent::kControlKey);
}
#endif

2
shell/common/gin_converters/gfx_converter.cc
View file

@ -148,7 +148,7 @@ v8::Local<v8::Value> Converter<display::Display>::ToV8(
dict.Set("accelerometerSupport", val.accelerometer_support());
dict.Set("monochrome", val.is_monochrome());
dict.Set("colorDepth", val.color_depth());
dict.Set("colorSpace", val.color_space().ToString());
dict.Set("colorSpace", val.color_spaces().GetRasterColorSpace().ToString());
dict.Set("depthPerComponent", val.depth_per_component());
dict.Set("size", val.size());
dict.Set("workAreaSize", val.work_area_size());

6
shell/common/mouse_util.cc
View file

@ -2,10 +2,12 @@
// Use of this source code is governed by the MIT license that can be
// found in the LICENSE file.
#include "shell/common/mouse_util.h"
#include <string>
using Cursor = ui::CursorType;
#include "shell/common/mouse_util.h"
#include "ui/base/mojom/cursor_type.mojom-shared.h"
using Cursor = ui::mojom::CursorType;
namespace electron {