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

chore: bump chromium to 6b9fa6b352d824d052222e1abe541 (master) (#25558)

Browse source 
* chore: bump chromium in DEPS to d5c9bf9e2a18fa508201a88e5803bec1d107b1ae

* chore: bump chromium in DEPS to 45f1316afae33e52c92480b34bf4f7fe4a7db898

* update patches

* WillCreateURLLoaderFactory now gets a ukm_source_id

Refs: 2346803

* ink_drop_visible_opacity -> GetInkDropVisibleOpacity

Refs: 2415368

* chore: bump chromium in DEPS to ddb5b6db5e35ab1a7b5adbd9f15373af6c35ea2a

* 2418471: PDF Viewer update: Add missing aria-labels to various buttons.

2418471

* update printing.patch given print settings mojoification

Refs: 2409467

* update patches

* content::BluetoothChooser::Event -> content::BluetoothChooserEvent

Refs: 2387901

* set_ink_drop_base_color -> SetInkDropBaseColor

Refs: 2419388

* chore: bump chromium in DEPS to ecf7c9ee830d4d85f300b461a2fa13aa40c79a4c

* update patches

* gfx::ConvertPointToPixel -> gfx::ConvertPointToPixels

Refs: 2418568

* remove ContentSettingsObserver::AllowStorage()

Refs: 2401847

* service_manager::kCrashDumpSignal -> kCrashDumpSignal

Refs: 2417073

* chore: bump chromium in DEPS to abdb7ebe5f8c8328b8f435283df90d0a3ecff7bd

* chore: bump chromium in DEPS to 2a7e138ab1066534ceb2622e8a9d2c8ebf574215

* chore: bump chromium in DEPS to ab1884e75ced904e4276851eb4e1ad89919ca93b

* chore: bump chromium in DEPS to a12413902380dcc2a73ac74d582328280a8af686

* Fixup printing patch

2428623

* Fixup OSR patch

2415128

* Make ExtensionURLLoaderFactory always owned by its |receivers_|.

2357523

* Add deprecated_default_sources_assignment_filter variable

2416496

* Fixup patch indices

* Remove several references to BrowserPlugin from content

2401031

* Remove SurfaceEmbeddingTime and LocalSurfaceIdAllocation

2415128

* Add DragOperation and AllowedDragOperations Mojo types

2196167

* chore: bump chromium in DEPS to 378450342cf6aa160663d0ce3a178a11b570c25a

* Fixup patch indices

* Remove SurfaceEmbeddingTime and LocalSurfaceIdAllocation

2415128

* Add DragOperation and AllowedDragOperations Mojo types

2196167

* 2426564: Remove global sources assignment filter value

2426564

* Fixup blink_local_frame.patch

* [XProto] Remove a subset of ui/gfx/x/x11.h

2430328

* Fixup patch indices

* Remove several references to BrowserPlugin from content

2401031

* Remove lossy ConvertSizeToPixel() methods

2419534

* serial: Use USB driver name to disambiguate ports

2413176

* Remove set_sources_filter import

* Fix ModMask usage

* [XProto] Remove usage of all Xlib headers

2392140

* [XProto] Remove usage of Xlib Visuals

2429933

* Skip Angle manifest file

2425197

* Add whole src\third_party\angle\.git directory

This directory is needed in order to properly generate gen/angle/angle_commit.h

* [libvpx] Fix HighBD config on Windows ARM64

2437745

* update patches

* fix: correct calling convention for Windows on Arm

2440717

* Add third_party/angle/.git to the archive before adding the rest of the source

* fixup source caching on Windows

* Fixup erroneous close paren

* fixup for goma issues

* This should work

* chore: bump chromium roll manually

2435142

This landed the day after we paused roller-bot and may resolve the
visibility test flakes that we're seeing. h/t to @jkleinsc for
finding this with me.

* chore: remove obsoleted cherry-pick fix for libvpx

2437745

* chore: remove obsoleted cherry-pick libvpx patch

2437745

* chore: re-export patches

* chore: add tracer comment to visibility-stat-spec.

The line numbers between the source and the CI runs don't seem to match
up, so this temp tracer is to help track the source of that difference.

* chore: bump chromium in DEPS to 7c2b8cc3b8638aee8abeb013042a6c1d15b2da6b

* update patches

* impl SortingLSH service

Refs: 2425327

* 2446525: [Flash] Remove some Flash APIs

2446525

* 2440974: Reland "Delete service_manager/embedder/switches.h"

2440974

* 2359402: Remove ContentBrowserClient::NonNetworkURLLoaderFactoryDeprecatedMap.

2359402

* 2250506: Implement tabs.removeCSS

2250506

* 2429143: Remove implicit-conversion-to-integer ConvertRectToPixel() methods.

2429143

* 2444430: Remove DataElementType::kBlob

2444430

* 2441964: Clean up WebView public API

2441964

* 2357523: Make ExtensionURLLoaderFactory always owned by its |receivers_|.

2357523

* 2461606: Use blink::mojom::PreferredColorScheme instead of blink::PreferredColorScheme

2461606

* 2461235: a11y inspect reorg: move PropertyFilter struct to a new location

2461235

* remove flash support

* fix frame_host_manager patch

* fix lint

* remove flash info from docs

* fix build

* fix osr

* chore: bump chromium in DEPS to 9269f9eb1d98d29564c2b2ab97f30c6e148c4e11

* fix visibilityState tests

* 2463049: Replace all uses of web_pref::AutoplayPolicy with mojom::AutoplayPolicy

2463049

* update patches

* fix tests harder

* 2414921: Add Group and Ungroup functions to Tabs extension API

2414921

* more test fix

* Remove all keyboard related usage of Xlib

Refs: 2436787

* fix linux build

* 2453807: [XProto] Remove usage of Xlib error handling

2453807

* lint

* fixup! 2453807: [XProto] Remove usage of Xlib error handling

* disable CalculateNativeWinOcclusion on win ci

* remove UploadBlob from docs

* Update appveyor.yml

Co-authored-by: Andy Locascio <andy@slack-corp.com>
Co-authored-by: John Kleinschmidt <jkleinsc@github.com>
Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com>
Co-authored-by: Jeremy Rose <nornagon@nornagon.net>
Co-authored-by: Electron Bot <anonymous@electronjs.org>
Co-authored-by: Charles Kerr <charles@charleskerr.com>
Co-authored-by: Samuel Attard <samuel.r.attard@gmail.com>
Co-authored-by: Jeremy Rose <jeremya@chromium.org>
This commit is contained in:
Electron Bot 2020-10-15 18:30:41 -07:00 • committed by GitHub
parent 20c6677a9c
commit 46f3491c7d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
135 changed files with 1087 additions and 1609 deletions
Download patch file Download diff file Expand all files Collapse all files

64
shell/browser/osr/osr_render_widget_host_view.cc
View file

@ -43,6 +43,7 @@
#include "ui/events/event_constants.h"
#include "ui/gfx/canvas.h"
#include "ui/gfx/geometry/dip_util.h"
#include "ui/gfx/geometry/size_conversions.h"
#include "ui/gfx/image/image_skia.h"
#include "ui/gfx/native_widget_types.h"
#include "ui/gfx/skbitmap_operations.h"
@ -193,11 +194,10 @@ OffScreenRenderWidgetHostView::OffScreenRenderWidgetHostView(
current_device_scale_factor_ = kDefaultScaleFactor;
delegated_frame_host_allocator_.GenerateId();
delegated_frame_host_allocation_ =
delegated_frame_host_allocator_.GetCurrentLocalSurfaceIdAllocation();
delegated_frame_host_surface_id_ =
delegated_frame_host_allocator_.GetCurrentLocalSurfaceId();
compositor_allocator_.GenerateId();
compositor_allocation_ =
compositor_allocator_.GetCurrentLocalSurfaceIdAllocation();
compositor_surface_id_ = compositor_allocator_.GetCurrentLocalSurfaceId();
delegated_frame_host_client_ =
std::make_unique<ElectronDelegatedFrameHostClient>(this);
@ -305,9 +305,8 @@ void OffScreenRenderWidgetHostView::Show() {
is_showing_ = true;
delegated_frame_host_->AttachToCompositor(compositor_.get());
delegated_frame_host_->WasShown(
GetLocalSurfaceIdAllocation().local_surface_id(),
GetRootLayer()->bounds().size(), {});
delegated_frame_host_->WasShown(GetLocalSurfaceId(),
GetRootLayer()->bounds().size(), {});
if (render_widget_host_)
render_widget_host_->WasShown({});
@ -359,9 +358,7 @@ base::Optional<SkColor> OffScreenRenderWidgetHostView::GetBackgroundColor() {
return background_color_;
}
void OffScreenRenderWidgetHostView::UpdateBackgroundColor() {
NOTREACHED();
}
void OffScreenRenderWidgetHostView::UpdateBackgroundColor() {}
gfx::Size OffScreenRenderWidgetHostView::GetVisibleViewportSize() {
return size_;
@ -669,11 +666,11 @@ void OffScreenRenderWidgetHostView::OnPaint(const gfx::Rect& damage_rect,
gfx::Size OffScreenRenderWidgetHostView::SizeInPixels() {
if (IsPopupWidget()) {
return gfx::ConvertSizeToPixel(current_device_scale_factor_,
popup_position_.size());
return gfx::ToFlooredSize(gfx::ConvertSizeToPixels(
popup_position_.size(), current_device_scale_factor_));
} else {
return gfx::ConvertSizeToPixel(current_device_scale_factor_,
GetViewBounds().size());
return gfx::ToFlooredSize(gfx::ConvertSizeToPixels(
GetViewBounds().size(), current_device_scale_factor_));
}
}
@ -697,16 +694,18 @@ void OffScreenRenderWidgetHostView::CompositeFrame(
if (popup_host_view_ && !popup_host_view_->GetBacking().drawsNothing()) {
gfx::Rect rect = popup_host_view_->popup_position_;
gfx::Point origin_in_pixels = gfx::ConvertPointToPixel(
current_device_scale_factor_, rect.origin());
gfx::Point origin_in_pixels =
gfx::ToFlooredPoint(gfx::ConvertPointToPixels(
rect.origin(), current_device_scale_factor_));
canvas.writePixels(popup_host_view_->GetBacking(), origin_in_pixels.x(),
origin_in_pixels.y());
}
for (auto* proxy_view : proxy_views_) {
gfx::Rect rect = proxy_view->GetBounds();
gfx::Point origin_in_pixels = gfx::ConvertPointToPixel(
current_device_scale_factor_, rect.origin());
gfx::Point origin_in_pixels =
gfx::ToFlooredPoint(gfx::ConvertPointToPixels(
rect.origin(), current_device_scale_factor_));
canvas.writePixels(*proxy_view->GetBitmap(), origin_in_pixels.x(),
origin_in_pixels.y());
}
@ -722,14 +721,14 @@ void OffScreenRenderWidgetHostView::CompositeFrame(
}
void OffScreenRenderWidgetHostView::OnPopupPaint(const gfx::Rect& damage_rect) {
InvalidateBounds(
gfx::ConvertRectToPixel(current_device_scale_factor_, damage_rect));
InvalidateBounds(gfx::ToEnclosingRect(
gfx::ConvertRectToPixels(damage_rect, current_device_scale_factor_)));
}
void OffScreenRenderWidgetHostView::OnProxyViewPaint(
const gfx::Rect& damage_rect) {
InvalidateBounds(
gfx::ConvertRectToPixel(current_device_scale_factor_, damage_rect));
InvalidateBounds(gfx::ToEnclosingRect(
gfx::ConvertRectToPixels(damage_rect, current_device_scale_factor_)));
}
void OffScreenRenderWidgetHostView::HoldResize() {
@ -941,9 +940,9 @@ ui::Layer* OffScreenRenderWidgetHostView::GetRootLayer() const {
return root_layer_.get();
}
const viz::LocalSurfaceIdAllocation&
OffScreenRenderWidgetHostView::GetLocalSurfaceIdAllocation() const {
return delegated_frame_host_allocation_;
const viz::LocalSurfaceId& OffScreenRenderWidgetHostView::GetLocalSurfaceId()
const {
return delegated_frame_host_surface_id_;
}
content::DelegatedFrameHost*
@ -995,23 +994,22 @@ void OffScreenRenderWidgetHostView::ResizeRootLayer(bool force) {
GetRootLayer()->SetBounds(gfx::Rect(size));
const gfx::Size& size_in_pixels =
gfx::ConvertSizeToPixel(current_device_scale_factor_, size);
const gfx::Size& size_in_pixels = gfx::ToFlooredSize(
gfx::ConvertSizeToPixels(size, current_device_scale_factor_));
if (compositor_) {
compositor_allocator_.GenerateId();
compositor_allocation_ =
compositor_allocator_.GetCurrentLocalSurfaceIdAllocation();
compositor_surface_id_ = compositor_allocator_.GetCurrentLocalSurfaceId();
compositor_->SetScaleAndSize(current_device_scale_factor_, size_in_pixels,
compositor_allocation_);
compositor_surface_id_);
}
delegated_frame_host_allocator_.GenerateId();
delegated_frame_host_allocation_ =
delegated_frame_host_allocator_.GetCurrentLocalSurfaceIdAllocation();
delegated_frame_host_surface_id_ =
delegated_frame_host_allocator_.GetCurrentLocalSurfaceId();
GetDelegatedFrameHost()->EmbedSurface(
delegated_frame_host_allocation_.local_surface_id(), size,
delegated_frame_host_surface_id_, size,
cc::DeadlinePolicy::UseDefaultDeadline());
// Note that |render_widget_host_| will retrieve resize parameters from the

7
shell/browser/osr/osr_render_widget_host_view.h
View file

@ -140,8 +140,7 @@ class OffScreenRenderWidgetHostView : public content::RenderWidgetHostViewBase,
content::RenderWidgetHost*,
content::WebContentsView*) override;
const viz::LocalSurfaceIdAllocation& GetLocalSurfaceIdAllocation()
const override;
const viz::LocalSurfaceId& GetLocalSurfaceId() const override;
const viz::FrameSinkId& GetFrameSinkId() const override;
void DidNavigate() override;
@ -254,10 +253,10 @@ class OffScreenRenderWidgetHostView : public content::RenderWidgetHostViewBase,
bool paint_callback_running_ = false;
viz::LocalSurfaceIdAllocation delegated_frame_host_allocation_;
viz::LocalSurfaceId delegated_frame_host_surface_id_;
viz::ParentLocalSurfaceIdAllocator delegated_frame_host_allocator_;
viz::LocalSurfaceIdAllocation compositor_allocation_;
viz::LocalSurfaceId compositor_surface_id_;
viz::ParentLocalSurfaceIdAllocator compositor_allocator_;
std::unique_ptr<ui::Layer> root_layer_;

4
shell/browser/osr/osr_web_contents_view.cc
View file

@ -162,7 +162,7 @@ bool OffScreenWebContentsView::CloseTabAfterEventTrackingIfNeeded() {
void OffScreenWebContentsView::StartDragging(
const content::DropData& drop_data,
blink::WebDragOperationsMask allowed_ops,
blink::DragOperationsMask allowed_ops,
const gfx::ImageSkia& image,
const gfx::Vector2d& image_offset,
const blink::mojom::DragEventSourceInfo& event_info,
@ -173,7 +173,7 @@ void OffScreenWebContentsView::StartDragging(
}
void OffScreenWebContentsView::UpdateDragCursor(
blink::WebDragOperation operation) {}
blink::DragOperation operation) {}
void OffScreenWebContentsView::SetPainting(bool painting) {
auto* view = GetView();

6
shell/browser/osr/osr_web_contents_view.h
View file

@ -12,6 +12,7 @@
#include "content/browser/web_contents/web_contents_view.h" // nogncheck
#include "content/public/browser/web_contents.h"
#include "shell/browser/osr/osr_render_widget_host_view.h"
#include "third_party/blink/public/common/page/drag_mojom_traits.h"
#if defined(OS_MAC)
#ifdef __OBJC__
@ -68,13 +69,12 @@ class OffScreenWebContentsView : public content::WebContentsView,
// content::RenderViewHostDelegateView
void StartDragging(const content::DropData& drop_data,
blink::WebDragOperationsMask allowed_ops,
blink::DragOperationsMask allowed_ops,
const gfx::ImageSkia& image,
const gfx::Vector2d& image_offset,
const blink::mojom::DragEventSourceInfo& event_info,
content::RenderWidgetHostImpl* source_rwh) override;
void UpdateDragCursor(blink::WebDragOperation operation) override;
void UpdateDragCursor(blink::DragOperation operation) override;
void SetPainting(bool painting);
bool IsPainting() const;
void SetFrameRate(int frame_rate);