github/electron
1
1
Fork 0
mirror of https://github.com/electron/electron.git synced 2026-04-10 03:01:51 -04:00
Code Issues Packages Projects Releases Wiki Activity

chore: bump chromium to 1a093e6a0cb5e72ba78990fe39824 (master) (#24575)

Browse Source
This commit is contained in:
Electron Bot
2020-07-21 22:34:34 -07:00
committed by GitHub
parent d4a4269989
commit 2fb14f53fe
81 changed files with 407 additions and 346 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
shell/browser/osr/osr_render_widget_host_view.cc
View File

@@ -487,13 +487,13 @@ void OffScreenRenderWidgetHostView::CopyFromSurface(
}
void OffScreenRenderWidgetHostView::GetScreenInfo(
content::ScreenInfo* screen_info) {
blink::ScreenInfo* screen_info) {
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->orientation_type =
content::SCREEN_ORIENTATION_VALUES_LANDSCAPE_PRIMARY;
blink::mojom::ScreenOrientation::kLandscapePrimary;
screen_info->rect = gfx::Rect(size_);
screen_info->available_rect = gfx::Rect(size_);
}

2
shell/browser/osr/osr_render_widget_host_view.h
View File

@@ -124,7 +124,7 @@ class OffScreenRenderWidgetHostView : public content::RenderWidgetHostViewBase,
const gfx::Rect& src_rect,
const gfx::Size& output_size,
base::OnceCallback<void(const SkBitmap&)> callback) override;
void GetScreenInfo(content::ScreenInfo* results) override;
void GetScreenInfo(blink::ScreenInfo* results) override;
void TransformPointToRootSurface(gfx::PointF* point) override;
gfx::Rect GetBoundsInRootWindow(void) override;
viz::SurfaceId GetCurrentSurfaceId() const override;

2
shell/browser/osr/osr_web_contents_view.cc
View File

@@ -6,7 +6,7 @@
#include "content/browser/web_contents/web_contents_impl.h" // nogncheck
#include "content/public/browser/render_view_host.h"
#include "third_party/blink/public/platform/web_screen_info.h"
#include "third_party/blink/public/common/widget/screen_info.h"
#include "ui/display/screen.h"
namespace electron {