mirror of
https://github.com/electron/electron.git
synced 2026-04-10 03:01:51 -04:00
1254a684dd
* chore: bump chromium in DEPS to 114.0.5733.2
* chore: bump chromium in DEPS to 114.0.5735.6
* chore: bump chromium in DEPS to 114.0.5735.9
* chore: update patches
* 4450570: Clean up content shell
https://chromium-review.googlesource.com/c/chromium/src/+/4450570
(cherry picked from commit d89b76e6857a332dc779bdb0a04913f3e7541524)
* 4262527: geolocation: Introduce mojom::GeopositionResult
https://chromium-review.googlesource.com/c/chromium/src/+/4262527
(cherry picked from commit 9b350a60c234653109520b407d16d0ad71ea3ed7)
* 4450327: Android/Nav: Stop taking content timeout timer from old host.
https://chromium-review.googlesource.com/c/chromium/src/+/4450327
Also, see:
4451366: Reland "Prerender: Fix prerender new content timeout start timing"
https://chromium-review.googlesource.com/c/chromium/src/+/4451366
(cherry picked from commit 7039603714cbfac7ebb20cb1ab0135c8249a89fd)
* chore: bump CircleCI xcode version
this will hopefully get us the necessary macOS sdk 13.3 on CI.
(cherry picked from commit b3283351cdd0a079d5fe65fe46b642c7def74f38)
* test: fix geolocation test
(cherry picked from commit bddbc573ada91511d07dbc6b4622ac95358f0993)
* fixup patch
* chore: bump chromium in DEPS to 114.0.5735.16
* chore: update patches
* 4336172: Include client-drawn window decorations in aspect ratio. |
Ref: https://chromium-review.googlesource.com/c/chromium/src/+/4336172
* build: bump appveyor image to fix windows cache
* spec: fix race condition in alwaysOnTop test
* build: use xcode 14.2 not 14.3
* build: use macOS 12 to run tests
The new macOS 13 VMs appear to have different screen / display behavior
---------
Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com>
Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org>
Co-authored-by: clavin <clavin@electronjs.org>
Co-authored-by: PatchUp <73610968+patchup[bot]@users.noreply.github.com>
Co-authored-by: VerteDinde <keeleymhammond@gmail.com>
Co-authored-by: Keeley Hammond <vertedinde@electronjs.org>
Co-authored-by: Samuel Attard <samuel.r.attard@gmail.com>
85 lines
3.8 KiB
Diff
85 lines
3.8 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Anonymous <anonymous@electronjs.org>
|
|
Date: Thu, 20 Sep 2018 17:46:21 -0700
|
|
Subject: render_widget_host_view_base.patch
|
|
|
|
... something to do with OSR? and maybe <webview> as well? terrifying.
|
|
|
|
diff --git a/content/browser/renderer_host/render_widget_host_view_base.cc b/content/browser/renderer_host/render_widget_host_view_base.cc
|
|
index d770e7b922232d3e2697ba4146e2e4a3984d6757..5761c122a3fd201c2b53b9d98f21191cd71fa002 100644
|
|
--- a/content/browser/renderer_host/render_widget_host_view_base.cc
|
|
+++ b/content/browser/renderer_host/render_widget_host_view_base.cc
|
|
@@ -700,6 +700,13 @@ bool RenderWidgetHostViewBase::ScreenRectIsUnstableFor(
|
|
return false;
|
|
}
|
|
|
|
+RenderWidgetHostViewBase* RenderWidgetHostViewBase::CreateViewForWidget(
|
|
+ RenderWidgetHost* render_widget_host,
|
|
+ RenderWidgetHost* embedder_render_widget_host,
|
|
+ WebContentsView* web_contents_view) {
|
|
+ return web_contents_view->CreateViewForWidget(render_widget_host);
|
|
+}
|
|
+
|
|
void RenderWidgetHostViewBase::ProcessMouseEvent(
|
|
const blink::WebMouseEvent& event,
|
|
const ui::LatencyInfo& latency) {
|
|
diff --git a/content/browser/renderer_host/render_widget_host_view_base.h b/content/browser/renderer_host/render_widget_host_view_base.h
|
|
index 7b8afe19a30886bff552d9db3daf456f6a0012f9..524e266126cc2d8e17c1a32aa3863924b8626c2f 100644
|
|
--- a/content/browser/renderer_host/render_widget_host_view_base.h
|
|
+++ b/content/browser/renderer_host/render_widget_host_view_base.h
|
|
@@ -25,8 +25,11 @@
|
|
#include "components/viz/host/hit_test/hit_test_query.h"
|
|
#include "content/browser/renderer_host/display_feature.h"
|
|
#include "content/browser/renderer_host/event_with_latency_info.h"
|
|
+#include "content/browser/renderer_host/visible_time_request_trigger.h"
|
|
+#include "content/browser/web_contents/web_contents_view.h"
|
|
#include "content/common/content_export.h"
|
|
#include "content/public/browser/render_frame_metadata_provider.h"
|
|
+#include "content/public/browser/render_widget_host.h"
|
|
#include "content/public/browser/render_widget_host_view.h"
|
|
#include "content/public/common/page_visibility_state.h"
|
|
#include "content/public/common/widget_type.h"
|
|
@@ -54,7 +57,7 @@
|
|
namespace blink {
|
|
class WebMouseEvent;
|
|
class WebMouseWheelEvent;
|
|
-}
|
|
+} // namespace blink
|
|
|
|
namespace ui {
|
|
class Compositor;
|
|
@@ -71,9 +74,11 @@ class CursorManager;
|
|
class MouseWheelPhaseHandler;
|
|
class RenderWidgetHostImpl;
|
|
class RenderWidgetHostViewBaseObserver;
|
|
+class RenderWidgetHostViewGuest;
|
|
class SyntheticGestureTarget;
|
|
class TextInputManager;
|
|
class TouchSelectionControllerClientManager;
|
|
+class WebContentsView;
|
|
class WebContentsAccessibility;
|
|
class DelegatedFrameHost;
|
|
|
|
@@ -148,6 +153,9 @@ class CONTENT_EXPORT RenderWidgetHostViewBase : public RenderWidgetHostView {
|
|
const gfx::Rect& keyboard_rect) override {}
|
|
bool IsHTMLFormPopup() const override;
|
|
|
|
+ virtual void InitAsGuest(RenderWidgetHostView* parent_host_view,
|
|
+ RenderWidgetHostViewGuest* guest_view) {}
|
|
+
|
|
// This only needs to be overridden by RenderWidgetHostViewBase subclasses
|
|
// that handle content embedded within other RenderWidgetHostViews.
|
|
gfx::PointF TransformPointToRootCoordSpaceF(
|
|
@@ -316,6 +324,11 @@ class CONTENT_EXPORT RenderWidgetHostViewBase : public RenderWidgetHostView {
|
|
virtual void ProcessGestureEvent(const blink::WebGestureEvent& event,
|
|
const ui::LatencyInfo& latency);
|
|
|
|
+ virtual RenderWidgetHostViewBase* CreateViewForWidget(
|
|
+ RenderWidgetHost* render_widget_host,
|
|
+ RenderWidgetHost* embedder_render_widget_host,
|
|
+ WebContentsView* web_contents_view);
|
|
+
|
|
// Transform a point that is in the coordinate space of a Surface that is
|
|
// embedded within the RenderWidgetHostViewBase's Surface to the
|
|
// coordinate space of an embedding, or embedded, Surface. Typically this
|