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

chore: bump chromium to 98.0.4706.0 (main) (#31555)

Browse source 
* chore: bump chromium in DEPS to 97.0.4678.0

* chore: bump chromium in DEPS to 97.0.4679.0

* chore: bump chromium in DEPS to 97.0.4680.0

* chore: bump chromium in DEPS to 97.0.4681.0

* chore: bump chromium in DEPS to 97.0.4682.0

* chore: update patches

* 3234737: Disable -Wunused-but-set-variable

Ref: 3234737

* 3216953: Reland "Move task-related files from base/ to base/task/"

Ref: 3216953

* 3202710: TimeDelta factory function migration.

Ref: 3202710

* 3226841: Rename WCO::RenderProcessGone to PrimaryMainFrameRenderProcessGone

Ref: 3226841

* 3212165: blink/gin: changes blink to load snapshot based on runtime information

Ref: 3212165

* 3220292: Deprecate returning a GURL from GURL::GetOrigin()

Ref: 3220292

* 3231995: build: Enable -Wbitwise-instead-of-logical everywhere except iOS and Windows

Ref: 3231995

* 3205121: Remove base::DictionaryValue::GetDouble

Ref: 3205121

* 3208413: [flags] Make --js-flags settings have priority over V8 features

Ref: 3208413

* chore: bump chromium in DEPS to 97.0.4683.0

* chore: update patches

* 3188834: Combine RWHVBase GetCurrentDeviceScaleFactor/GetDeviceScaleFactor

Ref: 3188834

* chore: update process_singleton patches

* chore: bump chromium in DEPS to 97.0.4684.0

* chore: update patches

* chore: bump chromium in DEPS to 97.0.4685.0

* chore: update patches

* chore: bump chromium in DEPS to 97.0.4686.0

* chore: update patches

* chore: bump chromium in DEPS to 97.0.4687.0

* chore: update patches

* chore: bump chromium in DEPS to 97.0.4688.0

* chore: update patches

* 3247722: Use correct source_site_instance if navigating via context menu

Ref: 3247722

Update signature of HandleContextMenu()

* 3247722: Use correct source_site_instance if navigating via context menu

Ref: 3247722

Update signature of HandleContextMenu()

* 3223422: Remove PP_ISOLATEDFILESYSTEMTYPE_PRIVATE_PLUGINPRIVATE enum option

Ref: 3223422

sync pepper_plugin_support.patch with upstream

* chore: bump chromium in DEPS to 97.0.4689.0

* 3247791: ax_mac_merge: Merge AX Math attribute implementations

Xref: ax_mac_merge: Merge AX Math attribute implementations

chore: fix minor patch shear in #includes

* 3243425: Add VisibleTimeRequestTrigger helper class

Xref: 3243425

chore: fix minor patch shear in #includes

* chore: regen chromium patches

* fixup! 3247722: Use correct source_site_instance if navigating via context menu

* chore: bump chromium in DEPS to 97.0.4690.0

* 3188659: Window Placement: make GetScreenInfo(s) const

Xref: 3188659

simple sync GetScreenInfo with upstream refactor

* chore: update patches

* chore: bump chromium in DEPS to 97.0.4690.4

* chore: bump chromium in DEPS to 97.0.4692.0

* 3198073: ozone: //content: clean up from USE_X11

Xref: 3198073

Fixing patch shear. Nothing to see here.

* 3252338: Remove label images checkbox from chrome://accessibility page

Xref: 3252338

Part of our a11y patch is no longer needed due to upstream label removal

* 3258183: Remove DISALLOW_IMPLICIT_CONSTRUCTORS() definition

Xref: 3258183

Replace our use of the macro with explicitly-deleted class methods.
See 3256952
for upstream examples of this same replacement.

* chore: update patches

* 3247295: Unwind SecurityStyleExplanations

Xref: 3247295

update GetSecurityStyle() signature and impl to match upstream changes

* 3259578: media: grabs lock to ensure video output when occluded

Xref: 3259578

Add stub for new upstream virtual method OnCapturerCountChanged()

* fixup! 3247295: Unwind SecurityStyleExplanations

* 3238504: Fix up drag image is not shown from bookmark bar

Xref: 3238504

SetDragImage() no longer takes a widget argument

* 3217452: [devtools] Add getSyncInformation host binding

Xref: 3217452

Add stub for new upstream method GetSyncInformation(). Stub sends info back to caller saying that syncing is disabled.

* chore: bump chromium in DEPS to 98.0.4693.0

* chore: bump chromium in DEPS to 98.0.4694.0

* chore: bump chromium in DEPS to 98.0.4695.0

* chore: bump chromium in DEPS to 98.0.4696.0

* chore: bump chromium in DEPS to 98.0.4697.0

* chore: bump chromium in DEPS to 98.0.4699.0

* chore: bump chromium in DEPS to 98.0.4701.0

* chore: bump chromium in DEPS to 98.0.4703.0

* chore: bump chromium in DEPS to 98.0.4705.0

* chore: bump chromium in DEPS to 98.0.4706.0

* chore: update patches

* 3279210: Rename "base/macros.h" => "base/ignore_result.h"

3279210

* 3259964: Remove all DISALLOW_COPY_AND_ASSIGNs

3259964

* 3269029: blink/gin: sets histogram callbacks during isolate creation

3269029

* fixup after rebase

* [content] Make ContentMainParams and MainFunctionParams move-only

3244976

* 3255305: Stop sending the securityStateChanged event and unwind

3255305

* [Blink] Add promise support to WebLocalFrame::RequestExecuteScript()

3230010

* 3256162: Simplify RWHV Show and ShowWithVisibility handling

3256162

* 3263824: ozone: //ui/base: clean up from USE_X11 1/*

3263824

* Request or cancel RecordContentToPresentationTimeRequest during capture

3256802

* appcache: remove BrowsingData/quota references

3255725

* [Autofill] Don't show Autofill dropdown if overlaps with permissions

3236729

* Rename to_different_document to should_show_loading_ui in LoadingStateChanged() callbacks

3268574

* cleanup patch

* fixup [content] Make ContentMainParams and MainFunctionParams move-only

* 3279210: Rename "base/macros.h" => "base/ignore_result.h"

3279210

* ozone: //chrome/browser clean up from USE_X11

3186490
Refs: https://github.com/electron/electron/issues/31382

* chore: update support_mixed_sandbox_with_zygote.patch

* Enable -Wunused-but-set-variable.

Refs 3234737

* fixup! ozone: //ui/base: clean up from USE_X11 1/*

* fixup! ozone: //chrome/browser clean up from USE_X11

* chore: fix deprecation warning in libuv

* chore: fixup for lint

* 3251161: Reland "Make the Clang update.py script require Python 3"

3251161

* fixup: Enable -Wunused-but-set-variable.

* [base][win] Rename DIR_APP_DATA to DIR_ROAMING_APP_DATA

3262369

* Replace sandbox::policy::SandboxType with mojom Sandbox enum

3213677

* fixup: [content] Make ContentMainParams and MainFunctionParams move-only

* build: ensure angle has a full git checkout available to it

* fixup: [base][win] Rename DIR_APP_DATA to DIR_ROAMING_APP_DATA

* fixup lint

* [unseasoned-pdf] Dispatch 'afterprint' event in PDF plugin frame

3223434

* fixup: [Autofill] Don't show Autofill dropdown if overlaps with permissions

* 3217591: Move browser UI CSS color parsing to own file part 2/2

3217591

* Make kNoSandboxAndElevatedPrivileges only available to utilities

3276784

* 3211575: [modules] Change ScriptOrModule to custom Struct

3211575

* Address review feedback

* chore: update patches

* 3211575: [modules] Change ScriptOrModule to custom Struct

3211575

* fix: unused variable compat

* chore: remove redundant patch

* fixup for 3262517: Re-enable WindowCaptureMacV2

3262517

* chore: cleanup todo

The functions added in 3256802 are not used by offscreen rendering.

* fixup: update mas_no_private_api.patch

* 3216879: [PA] Make features::kPartitionAllocLazyCommit to be PartitionOptions::LazyCommit

Ref: 3216879 Fixes up commit b2f1aca95604ec61649808c846657454097e6935

* chore: cleanup support_mixed_sandbox_with_zygote.patch

* test: use window focus event instead of delay to wait for webContents focus

Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com>
Co-authored-by: VerteDinde <khammond@slack-corp.com>
Co-authored-by: PatchUp <73610968+patchup[bot]@users.noreply.github.com>
Co-authored-by: Charles Kerr <charles@charleskerr.com>
Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org>
Co-authored-by: deepak1556 <hop2deep@gmail.com>
Co-authored-by: Samuel Attard <samuel.r.attard@gmail.com>
Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com>
This commit is contained in:
electron-roller[bot] 2021-11-24 09:45:59 +01:00 • committed by GitHub
parent 065cad6d2c
commit bd10b19b0c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
159 changed files with 1221 additions and 1047 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -12,8 +12,8 @@
#include "base/callback_helpers.h"
#include "base/location.h"
#include "base/memory/ptr_util.h"
#include "base/single_thread_task_runner.h"
#include "base/task/post_task.h"
#include "base/task/single_thread_task_runner.h"
#include "base/time/time.h"
#include "components/viz/common/features.h"
#include "components/viz/common/frame_sinks/begin_frame_args.h"
@ -297,7 +297,8 @@ bool OffScreenRenderWidgetHostView::IsSurfaceAvailableForCopy() {
return GetDelegatedFrameHost()->CanCopyFromCompositingSurface();
}
void OffScreenRenderWidgetHostView::Show() {
void OffScreenRenderWidgetHostView::ShowWithVisibility(
content::PageVisibilityState /*page_visibility*/) {
if (is_showing_)
return;
@ -480,16 +481,17 @@ void OffScreenRenderWidgetHostView::CopyFromSurface(
std::move(callback));
}
void OffScreenRenderWidgetHostView::GetScreenInfo(
display::ScreenInfo* screen_info) {
screen_info->depth = 24;
screen_info->depth_per_component = 8;
screen_info->orientation_angle = 0;
screen_info->device_scale_factor = GetCurrentDeviceScaleFactor();
screen_info->orientation_type =
display::ScreenInfo OffScreenRenderWidgetHostView::GetScreenInfo() const {
display::ScreenInfo screen_info;
screen_info.depth = 24;
screen_info.depth_per_component = 8;
screen_info.orientation_angle = 0;
screen_info.device_scale_factor = GetDeviceScaleFactor();
screen_info.orientation_type =
display::mojom::ScreenOrientation::kLandscapePrimary;
screen_info->rect = gfx::Rect(size_);
screen_info->available_rect = gfx::Rect(size_);
screen_info.rect = gfx::Rect(size_);
screen_info.available_rect = gfx::Rect(size_);
return screen_info;
}
void OffScreenRenderWidgetHostView::TransformPointToRootSurface(
@ -525,7 +527,7 @@ void OffScreenRenderWidgetHostView::ImeCompositionRangeChanged(
gfx::Size OffScreenRenderWidgetHostView::GetCompositorViewportPixelSize() {
return gfx::ScaleToCeiledSize(GetRequestedRendererSize(),
GetCurrentDeviceScaleFactor());
GetDeviceScaleFactor());
}
ui::Compositor* OffScreenRenderWidgetHostView::GetCompositor() {
@ -685,7 +687,7 @@ void OffScreenRenderWidgetHostView::OnPaint(const gfx::Rect& damage_rect,
}
gfx::Size OffScreenRenderWidgetHostView::SizeInPixels() {
float sf = GetCurrentDeviceScaleFactor();
float sf = GetDeviceScaleFactor();
if (IsPopupWidget()) {
return gfx::ToFlooredSize(
gfx::ConvertSizeToPixels(popup_position_.size(), sf));
@ -707,7 +709,7 @@ void OffScreenRenderWidgetHostView::CompositeFrame(
if (proxy_views_.empty() && !popup_host_view_) {
frame = GetBacking();
} else {
float sf = GetCurrentDeviceScaleFactor();
float sf = GetDeviceScaleFactor();
frame.allocN32Pixels(size_in_pixels.width(), size_in_pixels.height(),
false);
if (!GetBacking().drawsNothing()) {
@ -742,13 +744,13 @@ void OffScreenRenderWidgetHostView::CompositeFrame(
void OffScreenRenderWidgetHostView::OnPopupPaint(const gfx::Rect& damage_rect) {
InvalidateBounds(gfx::ToEnclosingRect(
gfx::ConvertRectToPixels(damage_rect, GetCurrentDeviceScaleFactor())));
gfx::ConvertRectToPixels(damage_rect, GetDeviceScaleFactor())));
}
void OffScreenRenderWidgetHostView::OnProxyViewPaint(
const gfx::Rect& damage_rect) {
InvalidateBounds(gfx::ToEnclosingRect(
gfx::ConvertRectToPixels(damage_rect, GetCurrentDeviceScaleFactor())));
gfx::ConvertRectToPixels(damage_rect, GetDeviceScaleFactor())));
}
void OffScreenRenderWidgetHostView::HoldResize() {
@ -974,8 +976,7 @@ void OffScreenRenderWidgetHostView::SetupFrameRate(bool force) {
if (compositor_) {
compositor_->SetDisplayVSyncParameters(
base::TimeTicks::Now(),
base::TimeDelta::FromMicroseconds(frame_rate_threshold_us_));
base::TimeTicks::Now(), base::Microseconds(frame_rate_threshold_us_));
}
}
@ -993,7 +994,7 @@ void OffScreenRenderWidgetHostView::ResizeRootLayer(bool force) {
display::Display display =
display::Screen::GetScreen()->GetDisplayNearestView(GetNativeView());
const float scaleFactor = display.device_scale_factor();
float sf = GetCurrentDeviceScaleFactor();
float sf = GetDeviceScaleFactor();
const bool scaleFactorDidChange = scaleFactor != sf;
// Initialize a screen_infos_ struct as needed, to cache the scale factor.
@ -1056,4 +1057,19 @@ void OffScreenRenderWidgetHostView::UpdateBackgroundColorFromRenderer(
GetRootLayer()->SetColor(color);
}
void OffScreenRenderWidgetHostView::NotifyHostAndDelegateOnWasShown(
blink::mojom::RecordContentToVisibleTimeRequestPtr) {
NOTREACHED();
}
void OffScreenRenderWidgetHostView::RequestPresentationTimeFromHostOrDelegate(
blink::mojom::RecordContentToVisibleTimeRequestPtr) {
NOTREACHED();
}
void OffScreenRenderWidgetHostView::
CancelPresentationTimeRequestForHostAndDelegate() {
NOTREACHED();
}
} // namespace electron