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 93.0.4539.0 (main) (#29608)

Browse Source 
Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com>
Co-authored-by: PatchUp <73610968+patchup[bot]@users.noreply.github.com>
Co-authored-by: Charles Kerr <charles@charleskerr.com>
Co-authored-by: Samuel Attard <sam@electronjs.org>
Co-authored-by: Jeremy Rose <jeremya@chromium.org>
This commit is contained in:
electron-roller[bot]
2021-06-16 15:43:51 -07:00
committed by GitHub
parent f71c6c04fd
commit 85718349cc
56 changed files with 231 additions and 163 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -527,6 +527,10 @@ gfx::Size OffScreenRenderWidgetHostView::GetCompositorViewportPixelSize() {
GetCurrentDeviceScaleFactor());
}
ui::Compositor* OffScreenRenderWidgetHostView::GetCompositor() {
return compositor_.get();
}
content::RenderWidgetHostViewBase*
OffScreenRenderWidgetHostView::CreateViewForWidget(
content::RenderWidgetHost* render_widget_host,
@@ -947,10 +951,6 @@ int OffScreenRenderWidgetHostView::GetFrameRate() const {
return frame_rate_;
}
ui::Compositor* OffScreenRenderWidgetHostView::GetCompositor() const {
return compositor_.get();
}
ui::Layer* OffScreenRenderWidgetHostView::GetRootLayer() const {
return root_layer_.get();
}

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

@@ -139,6 +139,7 @@ class OffScreenRenderWidgetHostView : public content::RenderWidgetHostViewBase,
void ImeCompositionRangeChanged(const gfx::Range&,
const std::vector<gfx::Rect>&) override;
gfx::Size GetCompositorViewportPixelSize() override;
ui::Compositor* GetCompositor() override;
content::RenderWidgetHostViewBase* CreateViewForWidget(
content::RenderWidgetHost*,
@@ -196,7 +197,6 @@ class OffScreenRenderWidgetHostView : public content::RenderWidgetHostViewBase,
void SetFrameRate(int frame_rate);
int GetFrameRate() const;
ui::Compositor* GetCompositor() const;
ui::Layer* GetRootLayer() const;
content::DelegatedFrameHost* GetDelegatedFrameHost() const;