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 adc5df74b86afdff676989ced8cd3 (master) (#26223)

Browse Source 
Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com>
Co-authored-by: Jeremy Rose <jeremya@chromium.org>
Co-authored-by: John Kleinschmidt <jkleinsc@github.com>
This commit is contained in:
Electron Bot
2020-11-13 16:16:56 -08:00
committed by GitHub
parent d6019634f9
commit e017d8714e
95 changed files with 496 additions and 804 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -25,7 +25,6 @@
#include "content/browser/renderer_host/input/synthetic_gesture_target.h" // nogncheck
#include "content/browser/renderer_host/render_widget_host_delegate.h" // nogncheck
#include "content/browser/renderer_host/render_widget_host_owner_delegate.h" // nogncheck
#include "content/common/view_messages.h"
#include "content/public/browser/browser_task_traits.h"
#include "content/public/browser/browser_thread.h"
#include "content/public/browser/context_factory.h"
@@ -501,6 +500,14 @@ gfx::Rect OffScreenRenderWidgetHostView::GetBoundsInRootWindow() {
return gfx::Rect(size_);
}
base::Optional<content::DisplayFeature>
OffScreenRenderWidgetHostView::GetDisplayFeature() {
return base::nullopt;
}
void OffScreenRenderWidgetHostView::SetDisplayFeatureForTesting(
const content::DisplayFeature* display_feature) {}
viz::SurfaceId OffScreenRenderWidgetHostView::GetCurrentSurfaceId() const {
return GetDelegatedFrameHost()
? GetDelegatedFrameHost()->GetCurrentSurfaceId()

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

@@ -128,6 +128,9 @@ class OffScreenRenderWidgetHostView : public content::RenderWidgetHostViewBase,
void GetScreenInfo(blink::ScreenInfo* results) override;
void TransformPointToRootSurface(gfx::PointF* point) override;
gfx::Rect GetBoundsInRootWindow(void) override;
base::Optional<content::DisplayFeature> GetDisplayFeature() override;
void SetDisplayFeatureForTesting(
const content::DisplayFeature* display_feature) override;
viz::SurfaceId GetCurrentSurfaceId() const override;
std::unique_ptr<content::SyntheticGestureTarget>
CreateSyntheticGestureTarget() override;