4588a41161
* chore: bump chromium in DEPS to 1d6b29cd85c1c3cba093b8b69b2727cc26eaac97 * update patches * chore: use 'libvulkan.so.1' in the linux manifests CL: https://chromium-review.googlesource.com/c/angle/angle/+/2538430 Upstream renamed libvulkan.so to libvulkan.so.1, so sync our manifests. * chore: update expected window-open default policy. CL: https://chromium-review.googlesource.com/c/chromium/src/+/2429247 Upstream CL contiues the work to make `strict-origin-when-cross-origin` the default referrer policy. This commit changes our window-open tests to expect that policy over the previous `no-referrer-when-downgrade`. * chore: bump chromium in DEPS to 69cb7c65ad845cdab1cd5f4256237e72fceba2dd * chore: re-export chromium patches No code changes; just line numbers. `git am` failed because the upstream changes were just large enough to require patching to fail w/o fuzzing. The broken patch was patches/chromium/feat_allow_disabling_blink_scheduler_throttling_per_renderview.patch * update patches * chore: bump chromium in DEPS to c6d97a240d30e5f5166856f5ae6ee14d95b9a4f0 * update patches * fixup! chore: update expected window-open default policy. * chore: disallow copying CppHeapCreateParams Experimental commit to resolve FTBS https://ci.appveyor.com/project/electron-bot/electron-ljo26/builds/36405680#L25345 which introduces a new struct CppHeapCreateParams that aggregates a vector of unique_ptrs. Our Windows CI is unhappy that this struct implicitly deletes its copy ctor, so this commit makes it explicit. Xref: https://chromium-review.googlesource.com/c/v8/v8/+/2536642 * update patches * chore: bump chromium in DEPS to 0df9a85ffa0ad4711b41a089842e40b87ba88055 * update patches * fixup! chore: bump chromium to ac06d6903a2c981ab90a8162f1ba0 (master) (#26499) * chore: update calls to gfx::RemoveAcceleratorChar. The call signature for gfx::RemoveAccelerator changed in https://chromium-review.googlesource.com/c/chromium/src/+/2546471 . This commit updates use to match that. * chore: bump chromium in DEPS to 43d6c496251e08d3781bfadbe9727688551f74a9 * update patches * chore: bump chromium in DEPS to 1fb5c9825be4e2271c4fef0e802f5d970b32f62f * update patches * chore: bump chromium in DEPS to 8a1f078d67825e727a598b89a8924699df8d3850 * chore: bump chromium in DEPS to 28ff715b3a97d8cedc143bad671edb08b6de5fc2 * chore: update patches * Remove most service manifest remnants from Content https://chromium-review.googlesource.com/c/chromium/src/+/2296482 * Reland "Portals: Fix a11y for orphaned portals" https://chromium-review.googlesource.com/c/chromium/src/+/2542812 * Convert CallbackList::Subscription to a standalone class. https://chromium-review.googlesource.com/c/chromium/src/+/2522860 * fix: actually apply the zlib patch * chore: bump chromium in DEPS to 75b464e6357190ca302ba9ce8f8c2bf5a3b709ae * chore: update patches * chore: bump chromium@b884b9b2f647c59a75f5d2055030afa33d50ca10 * chore: bump chromium in DEPS to 829261dadcefdc54ce5fdf7c5fac2929786a63ce * chore: bump chromium in DEPS to 5df3e69605c7c0130374aaccb91fc4726a558db2 * chore: bump chromium in DEPS to 22db748d5b7b90f87e6e97ef4c92a727ac753ea4 * chore: bump chromium in DEPS to 1475df80282b7eeeb0e153d8375bfe651f083bf8 * chore: bump chromium in DEPS to 6d34fe9e9b7386edd90574617bfa4008de972d72 * chore: update patches * Disable CertVerifierService for now 2559260: Enable CertVerifierService by default | https://chromium-review.googlesource.com/c/chromium/src/+/2559260 * Remove force_ignore_site_for_cookies until we figure out what to do instead 2499162: Remove |force_ignore_site_for_cookies| from IPCs (e.g. ResourceRequest). | https://chromium-review.googlesource.com/c/chromium/src/+/2499162 * chore: bump chromium in DEPS to 95aeb1c59ebc03d19ba077b0cd707463d1b2865e * update patches * Set site_for_cookies to request url so that URLLoader::ShouldForceIgnoreSiteForCookies returns true * 2490383: a11y inspect reorg: implement accessible tree formatter factory https://chromium-review.googlesource.com/c/chromium/src/+/2490383 * 2485887: [Extensions][web_accessible_resources] Use |matches|. https://chromium-review.googlesource.com/c/chromium/src/+/2485887 * update v8 headers * chore: bump chromium in DEPS to 38587dc379a8cf4d4a13e482a6e89f2fe681144e * update patches * 2555005: [api] Simplify ScriptOrigin https://chromium-review.googlesource.com/c/v8/v8/+/2555005 * 2563553: Remove Flash from PermissionRequestTypes and PermissionTypes. https://chromium-review.googlesource.com/c/chromium/src/+/2563553 * 2546146: Remove browser-hosted InterfaceProvider https://chromium-review.googlesource.com/c/chromium/src/+/2546146 * Actually apply nan patch * update patches * chore: bump chromium in DEPS to 6718d4b50c9db975c5642ca5b68e8dc7ee1b7615 * update patches * 2546146: Remove browser-hosted InterfaceProvider https://chromium-review.googlesource.com/c/chromium/src/+/2546146 * chore: bump chromium in DEPS to 338cc300e3fe3a4cb4883e9ccdc34a32f3dfe034 * chore: bump chromium in DEPS to d9baeb1d192c23ceb1e1c4bbe6af98380b263bc1 * chore: bump chromium in DEPS to 3ca3051932683739b304e721cc394b6c66f841fe * chore: bump chromium in DEPS to 89292a4ae29096e5313aaf19dfa0c4710145c34d * 2571639: mac: Remove code to support OS X 10.10 in //sandbox https://chromium-review.googlesource.com/c/chromium/src/+/2571639 * Fixup patch indices * Do not build MTLManagedObjectAdapter It's been removed in newer Mantle versions and uses a deprecated enum * update patches * Remove sendToAll https://github.com/electron/electron/pull/26771 * 2569367: Remove dead fullscreen code in RenderWidgetHostView and friends https://chromium-review.googlesource.com/c/chromium/src/+/2569367 * Remove deprecated performFileOperation usage * 2568359: mac: Ignore Wdeprecated-declarations for LSSharedFileList* functions. https://chromium-review.googlesource.com/c/chromium/src/+/2568359 * 2561401: Add OutputPresenterX11 which uses X11 present extension. https://chromium-review.googlesource.com/c/chromium/src/+/2561401 * 2565511: [objects] Remove MakeExternal case for uncached internal strings https://chromium-review.googlesource.com/c/v8/v8/+/2565511 * fixup: Add disconnect logic to ElectronBrowserHandlerImpl * Allow local networking override for ATS https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CocoaKeys.html * Refactor: clean up rfh getters in ElectronBrowserHandlerImpl * Update patches * Remove unneeded BindTo * Don't assign ElectronBrowserHandlerImpl at all Co-authored-by: Charles Kerr <charles@charleskerr.com> Co-authored-by: deepak1556 <hop2deep@gmail.com> Co-authored-by: John Kleinschmidt <jkleinsc@github.com> Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com> Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org>
290 lines
10 KiB
C++
290 lines
10 KiB
C++
// Copyright (c) 2016 GitHub, Inc.
|
|
// Use of this source code is governed by the MIT license that can be
|
|
// found in the LICENSE file.
|
|
|
|
#ifndef SHELL_BROWSER_OSR_OSR_RENDER_WIDGET_HOST_VIEW_H_
|
|
#define SHELL_BROWSER_OSR_OSR_RENDER_WIDGET_HOST_VIEW_H_
|
|
|
|
#include <memory>
|
|
#include <set>
|
|
#include <string>
|
|
#include <vector>
|
|
|
|
#if defined(OS_WIN)
|
|
#include <windows.h>
|
|
#endif
|
|
|
|
#include "base/process/kill.h"
|
|
#include "base/threading/thread.h"
|
|
#include "base/time/time.h"
|
|
#include "components/viz/common/quads/compositor_frame.h"
|
|
#include "components/viz/common/surfaces/parent_local_surface_id_allocator.h"
|
|
#include "content/browser/renderer_host/delegated_frame_host.h" // nogncheck
|
|
#include "content/browser/renderer_host/input/mouse_wheel_phase_handler.h" // nogncheck
|
|
#include "content/browser/renderer_host/render_widget_host_impl.h" // nogncheck
|
|
#include "content/browser/renderer_host/render_widget_host_view_base.h" // nogncheck
|
|
#include "content/browser/web_contents/web_contents_view.h" // nogncheck
|
|
#include "shell/browser/osr/osr_host_display_client.h"
|
|
#include "shell/browser/osr/osr_video_consumer.h"
|
|
#include "shell/browser/osr/osr_view_proxy.h"
|
|
#include "third_party/blink/public/platform/web_vector.h"
|
|
#include "third_party/skia/include/core/SkBitmap.h"
|
|
#include "ui/base/ime/text_input_client.h"
|
|
#include "ui/compositor/compositor.h"
|
|
#include "ui/compositor/layer_delegate.h"
|
|
#include "ui/compositor/layer_owner.h"
|
|
#include "ui/gfx/geometry/point.h"
|
|
|
|
#include "components/viz/host/host_display_client.h"
|
|
|
|
#if defined(OS_WIN)
|
|
#include "ui/gfx/win/window_impl.h"
|
|
#endif
|
|
|
|
namespace content {
|
|
class CursorManager;
|
|
} // namespace content
|
|
|
|
namespace electron {
|
|
|
|
class ElectronCopyFrameGenerator;
|
|
class ElectronBeginFrameTimer;
|
|
|
|
class ElectronDelegatedFrameHostClient;
|
|
|
|
typedef base::Callback<void(const gfx::Rect&, const SkBitmap&)> OnPaintCallback;
|
|
typedef base::Callback<void(const gfx::Rect&)> OnPopupPaintCallback;
|
|
|
|
class OffScreenRenderWidgetHostView : public content::RenderWidgetHostViewBase,
|
|
public ui::CompositorDelegate,
|
|
public OffscreenViewProxyObserver {
|
|
public:
|
|
OffScreenRenderWidgetHostView(bool transparent,
|
|
bool painting,
|
|
int frame_rate,
|
|
const OnPaintCallback& callback,
|
|
content::RenderWidgetHost* render_widget_host,
|
|
OffScreenRenderWidgetHostView* parent_host_view,
|
|
gfx::Size initial_size);
|
|
~OffScreenRenderWidgetHostView() override;
|
|
|
|
// content::RenderWidgetHostView:
|
|
void InitAsChild(gfx::NativeView) override;
|
|
void SetSize(const gfx::Size&) override;
|
|
void SetBounds(const gfx::Rect&) override;
|
|
gfx::NativeView GetNativeView(void) override;
|
|
gfx::NativeViewAccessible GetNativeViewAccessible(void) override;
|
|
ui::TextInputClient* GetTextInputClient() override;
|
|
void Focus(void) override;
|
|
bool HasFocus(void) override;
|
|
uint32_t GetCaptureSequenceNumber() const override;
|
|
bool IsSurfaceAvailableForCopy(void) override;
|
|
void Show(void) override;
|
|
void Hide(void) override;
|
|
bool IsShowing(void) override;
|
|
void EnsureSurfaceSynchronizedForWebTest() override;
|
|
gfx::Rect GetViewBounds(void) override;
|
|
gfx::Size GetVisibleViewportSize() override;
|
|
void SetInsets(const gfx::Insets&) override;
|
|
void SetBackgroundColor(SkColor color) override;
|
|
base::Optional<SkColor> GetBackgroundColor() override;
|
|
void UpdateBackgroundColor() override;
|
|
blink::mojom::PointerLockResult LockMouse(
|
|
bool request_unadjusted_movement) override;
|
|
blink::mojom::PointerLockResult ChangeMouseLock(
|
|
bool request_unadjusted_movement) override;
|
|
void UnlockMouse(void) override;
|
|
void TakeFallbackContentFrom(content::RenderWidgetHostView* view) override;
|
|
#if defined(OS_MAC)
|
|
void SetActive(bool active) override;
|
|
void ShowDefinitionForSelection() override;
|
|
void SpeakSelection() override;
|
|
void SetWindowFrameInScreen(const gfx::Rect& rect) override;
|
|
bool UpdateNSViewAndDisplay();
|
|
#endif // defined(OS_MAC)
|
|
|
|
// content::RenderWidgetHostViewBase:
|
|
|
|
void ResetFallbackToFirstNavigationSurface() override;
|
|
void InitAsPopup(content::RenderWidgetHostView* rwhv,
|
|
const gfx::Rect& rect) override;
|
|
void UpdateCursor(const content::WebCursor&) override;
|
|
void SetIsLoading(bool is_loading) override;
|
|
void TextInputStateChanged(const ui::mojom::TextInputState& params) override;
|
|
void ImeCancelComposition(void) override;
|
|
void RenderProcessGone() override;
|
|
void Destroy(void) override;
|
|
void SetTooltipText(const base::string16&) override;
|
|
content::CursorManager* GetCursorManager() override;
|
|
void CopyFromSurface(
|
|
const gfx::Rect& src_rect,
|
|
const gfx::Size& output_size,
|
|
base::OnceCallback<void(const SkBitmap&)> callback) override;
|
|
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;
|
|
void ImeCompositionRangeChanged(const gfx::Range&,
|
|
const std::vector<gfx::Rect>&) override;
|
|
gfx::Size GetCompositorViewportPixelSize() override;
|
|
|
|
content::RenderWidgetHostViewBase* CreateViewForWidget(
|
|
content::RenderWidgetHost*,
|
|
content::RenderWidgetHost*,
|
|
content::WebContentsView*) override;
|
|
|
|
const viz::LocalSurfaceId& GetLocalSurfaceId() const override;
|
|
const viz::FrameSinkId& GetFrameSinkId() const override;
|
|
|
|
void DidNavigate() override;
|
|
|
|
bool TransformPointToCoordSpaceForView(
|
|
const gfx::PointF& point,
|
|
RenderWidgetHostViewBase* target_view,
|
|
gfx::PointF* transformed_point) override;
|
|
|
|
// ui::CompositorDelegate:
|
|
std::unique_ptr<viz::HostDisplayClient> CreateHostDisplayClient(
|
|
ui::Compositor* compositor) override;
|
|
|
|
bool InstallTransparency();
|
|
|
|
void CancelWidget();
|
|
void AddGuestHostView(OffScreenRenderWidgetHostView* guest_host);
|
|
void RemoveGuestHostView(OffScreenRenderWidgetHostView* guest_host);
|
|
void AddViewProxy(OffscreenViewProxy* proxy);
|
|
void RemoveViewProxy(OffscreenViewProxy* proxy);
|
|
void ProxyViewDestroyed(OffscreenViewProxy* proxy) override;
|
|
|
|
void OnPaint(const gfx::Rect& damage_rect, const SkBitmap& bitmap);
|
|
void OnPopupPaint(const gfx::Rect& damage_rect);
|
|
void OnProxyViewPaint(const gfx::Rect& damage_rect) override;
|
|
|
|
gfx::Size SizeInPixels();
|
|
|
|
void CompositeFrame(const gfx::Rect& damage_rect);
|
|
|
|
bool IsPopupWidget() const {
|
|
return widget_type_ == content::WidgetType::kPopup;
|
|
}
|
|
|
|
const SkBitmap& GetBacking() { return *backing_.get(); }
|
|
|
|
void HoldResize();
|
|
void ReleaseResize();
|
|
void SynchronizeVisualProperties();
|
|
|
|
void SendMouseEvent(const blink::WebMouseEvent& event);
|
|
void SendMouseWheelEvent(const blink::WebMouseWheelEvent& event);
|
|
|
|
void SetPainting(bool painting);
|
|
bool IsPainting() const;
|
|
|
|
void SetFrameRate(int frame_rate);
|
|
int GetFrameRate() const;
|
|
|
|
ui::Compositor* GetCompositor() const;
|
|
ui::Layer* GetRootLayer() const;
|
|
|
|
content::DelegatedFrameHost* GetDelegatedFrameHost() const;
|
|
|
|
void Invalidate();
|
|
void InvalidateBounds(const gfx::Rect&);
|
|
|
|
content::RenderWidgetHostImpl* render_widget_host() const {
|
|
return render_widget_host_;
|
|
}
|
|
|
|
gfx::Size size() const { return size_; }
|
|
|
|
void set_popup_host_view(OffScreenRenderWidgetHostView* popup_view) {
|
|
popup_host_view_ = popup_view;
|
|
}
|
|
|
|
void set_child_host_view(OffScreenRenderWidgetHostView* child_view) {
|
|
child_host_view_ = child_view;
|
|
}
|
|
|
|
private:
|
|
void SetupFrameRate(bool force);
|
|
void ResizeRootLayer(bool force);
|
|
|
|
viz::FrameSinkId AllocateFrameSinkId();
|
|
|
|
// Applies background color without notifying the RenderWidget about
|
|
// opaqueness changes.
|
|
void UpdateBackgroundColorFromRenderer(SkColor color);
|
|
|
|
// Weak ptrs.
|
|
content::RenderWidgetHostImpl* render_widget_host_;
|
|
|
|
OffScreenRenderWidgetHostView* parent_host_view_ = nullptr;
|
|
OffScreenRenderWidgetHostView* popup_host_view_ = nullptr;
|
|
OffScreenRenderWidgetHostView* child_host_view_ = nullptr;
|
|
std::set<OffScreenRenderWidgetHostView*> guest_host_views_;
|
|
std::set<OffscreenViewProxy*> proxy_views_;
|
|
|
|
const bool transparent_;
|
|
OnPaintCallback callback_;
|
|
OnPopupPaintCallback parent_callback_;
|
|
|
|
int frame_rate_ = 0;
|
|
int frame_rate_threshold_us_ = 0;
|
|
|
|
base::Time last_time_ = base::Time::Now();
|
|
|
|
gfx::Vector2dF last_scroll_offset_;
|
|
gfx::Size size_;
|
|
bool painting_;
|
|
|
|
bool is_showing_ = false;
|
|
bool is_destroyed_ = false;
|
|
gfx::Rect popup_position_;
|
|
|
|
bool hold_resize_ = false;
|
|
bool pending_resize_ = false;
|
|
|
|
bool paint_callback_running_ = false;
|
|
|
|
viz::LocalSurfaceId delegated_frame_host_surface_id_;
|
|
viz::ParentLocalSurfaceIdAllocator delegated_frame_host_allocator_;
|
|
|
|
viz::LocalSurfaceId compositor_surface_id_;
|
|
viz::ParentLocalSurfaceIdAllocator compositor_allocator_;
|
|
|
|
std::unique_ptr<ui::Layer> root_layer_;
|
|
std::unique_ptr<ui::Compositor> compositor_;
|
|
std::unique_ptr<content::DelegatedFrameHost> delegated_frame_host_;
|
|
|
|
std::unique_ptr<content::CursorManager> cursor_manager_;
|
|
|
|
OffScreenHostDisplayClient* host_display_client_;
|
|
std::unique_ptr<OffScreenVideoConsumer> video_consumer_;
|
|
|
|
std::unique_ptr<ElectronDelegatedFrameHostClient>
|
|
delegated_frame_host_client_;
|
|
|
|
content::MouseWheelPhaseHandler mouse_wheel_phase_handler_;
|
|
|
|
// Latest capture sequence number which is incremented when the caller
|
|
// requests surfaces be synchronized via
|
|
// EnsureSurfaceSynchronizedForWebTest().
|
|
uint32_t latest_capture_sequence_number_ = 0u;
|
|
|
|
SkColor background_color_ = SkColor();
|
|
|
|
std::unique_ptr<SkBitmap> backing_;
|
|
|
|
base::WeakPtrFactory<OffScreenRenderWidgetHostView> weak_ptr_factory_;
|
|
|
|
DISALLOW_COPY_AND_ASSIGN(OffScreenRenderWidgetHostView);
|
|
};
|
|
|
|
} // namespace electron
|
|
|
|
#endif // SHELL_BROWSER_OSR_OSR_RENDER_WIDGET_HOST_VIEW_H_
|