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

chore: bump chromium to 92.0.4511.0 (master) (#29173)

Browse source
This commit is contained in:
electron-roller[bot] 2021-05-19 16:15:47 -07:00 • committed by GitHub
parent d79ebc6dc6
commit 039f3d5cd2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
80 changed files with 426 additions and 322 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -189,7 +189,15 @@ OffScreenRenderWidgetHostView::OffScreenRenderWidgetHostView(
DCHECK(render_widget_host_);
DCHECK(!render_widget_host_->GetView());
set_current_device_scale_factor(kDefaultScaleFactor);
// Initialize a display struct as needed, to cache the scale factor.
if (display_list_.displays().empty()) {
display_list_ = display::DisplayList(
{display::Display(display::kDefaultDisplayId)},
display::kDefaultDisplayId, display::kDefaultDisplayId);
}
display::Display current_display = *display_list_.GetCurrentDisplayIterator();
current_display.set_device_scale_factor(kDefaultScaleFactor);
display_list_.UpdateDisplay(current_display);
delegated_frame_host_allocator_.GenerateId();
delegated_frame_host_surface_id_ =
@ -476,7 +484,7 @@ void OffScreenRenderWidgetHostView::GetScreenInfo(
screen_info->depth = 24;
screen_info->depth_per_component = 8;
screen_info->orientation_angle = 0;
screen_info->device_scale_factor = current_device_scale_factor();
screen_info->device_scale_factor = GetCurrentDeviceScaleFactor();
screen_info->orientation_type =
blink::mojom::ScreenOrientation::kLandscapePrimary;
screen_info->rect = gfx::Rect(size_);
@ -516,7 +524,7 @@ void OffScreenRenderWidgetHostView::ImeCompositionRangeChanged(
gfx::Size OffScreenRenderWidgetHostView::GetCompositorViewportPixelSize() {
return gfx::ScaleToCeiledSize(GetRequestedRendererSize(),
current_device_scale_factor());
GetCurrentDeviceScaleFactor());
}
content::RenderWidgetHostViewBase*
@ -672,12 +680,13 @@ void OffScreenRenderWidgetHostView::OnPaint(const gfx::Rect& damage_rect,
}
gfx::Size OffScreenRenderWidgetHostView::SizeInPixels() {
float sf = GetCurrentDeviceScaleFactor();
if (IsPopupWidget()) {
return gfx::ToFlooredSize(gfx::ConvertSizeToPixels(
popup_position_.size(), current_device_scale_factor()));
return gfx::ToFlooredSize(
gfx::ConvertSizeToPixels(popup_position_.size(), sf));
} else {
return gfx::ToFlooredSize(gfx::ConvertSizeToPixels(
GetViewBounds().size(), current_device_scale_factor()));
return gfx::ToFlooredSize(
gfx::ConvertSizeToPixels(GetViewBounds().size(), sf));
}
}
@ -693,6 +702,7 @@ void OffScreenRenderWidgetHostView::CompositeFrame(
if (proxy_views_.empty() && !popup_host_view_) {
frame = GetBacking();
} else {
float sf = GetCurrentDeviceScaleFactor();
frame.allocN32Pixels(size_in_pixels.width(), size_in_pixels.height(),
false);
if (!GetBacking().drawsNothing()) {
@ -702,8 +712,7 @@ 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::ToFlooredPoint(gfx::ConvertPointToPixels(
rect.origin(), current_device_scale_factor()));
gfx::ToFlooredPoint(gfx::ConvertPointToPixels(rect.origin(), sf));
canvas.writePixels(popup_host_view_->GetBacking(), origin_in_pixels.x(),
origin_in_pixels.y());
}
@ -711,8 +720,7 @@ void OffScreenRenderWidgetHostView::CompositeFrame(
for (auto* proxy_view : proxy_views_) {
gfx::Rect rect = proxy_view->GetBounds();
gfx::Point origin_in_pixels =
gfx::ToFlooredPoint(gfx::ConvertPointToPixels(
rect.origin(), current_device_scale_factor()));
gfx::ToFlooredPoint(gfx::ConvertPointToPixels(rect.origin(), sf));
canvas.writePixels(*proxy_view->GetBitmap(), origin_in_pixels.x(),
origin_in_pixels.y());
}
@ -729,13 +737,13 @@ void OffScreenRenderWidgetHostView::CompositeFrame(
void OffScreenRenderWidgetHostView::OnPopupPaint(const gfx::Rect& damage_rect) {
InvalidateBounds(gfx::ToEnclosingRect(
gfx::ConvertRectToPixels(damage_rect, current_device_scale_factor())));
gfx::ConvertRectToPixels(damage_rect, GetCurrentDeviceScaleFactor())));
}
void OffScreenRenderWidgetHostView::OnProxyViewPaint(
const gfx::Rect& damage_rect) {
InvalidateBounds(gfx::ToEnclosingRect(
gfx::ConvertRectToPixels(damage_rect, current_device_scale_factor())));
gfx::ConvertRectToPixels(damage_rect, GetCurrentDeviceScaleFactor())));
}
void OffScreenRenderWidgetHostView::HoldResize() {
@ -984,10 +992,18 @@ void OffScreenRenderWidgetHostView::ResizeRootLayer(bool force) {
display::Display display =
display::Screen::GetScreen()->GetDisplayNearestView(GetNativeView());
const float scaleFactor = display.device_scale_factor();
const bool scaleFactorDidChange =
(scaleFactor != current_device_scale_factor());
float sf = GetCurrentDeviceScaleFactor();
const bool scaleFactorDidChange = scaleFactor != sf;
set_current_device_scale_factor(scaleFactor);
// Initialize a display struct as needed, to cache the scale factor.
if (display_list_.displays().empty()) {
display_list_ = display::DisplayList(
{display::Display(display::kDefaultDisplayId)},
display::kDefaultDisplayId, display::kDefaultDisplayId);
}
display::Display current_display = *display_list_.GetCurrentDisplayIterator();
current_display.set_device_scale_factor(scaleFactor);
display_list_.UpdateDisplay(current_display);
gfx::Size size;
if (!IsPopupWidget())
@ -1001,14 +1017,13 @@ void OffScreenRenderWidgetHostView::ResizeRootLayer(bool force) {
GetRootLayer()->SetBounds(gfx::Rect(size));
const gfx::Size& size_in_pixels = gfx::ToFlooredSize(
gfx::ConvertSizeToPixels(size, current_device_scale_factor()));
const gfx::Size& size_in_pixels =
gfx::ToFlooredSize(gfx::ConvertSizeToPixels(size, sf));
if (compositor_) {
compositor_allocator_.GenerateId();
compositor_surface_id_ = compositor_allocator_.GetCurrentLocalSurfaceId();
compositor_->SetScaleAndSize(current_device_scale_factor(), size_in_pixels,
compositor_surface_id_);
compositor_->SetScaleAndSize(sf, size_in_pixels, compositor_surface_id_);
}
delegated_frame_host_allocator_.GenerateId();