bccb7b572a
* chore: bump chromium in DEPS to 123.0.6265.0 * chore: bump chromium in DEPS to 123.0.6266.0 * chore: update feat_ensure_mas_builds_of_the_same_application_can_use_safestorage.patch Xref: https://chromium-review.googlesource.com/c/chromium/src/+/5232280 reverts the revert *and* undoes the rewrites 😵 * chore: update chromium/disable_hidden.patch Xref: https://chromium-review.googlesource.com/c/chromium/src/+/5148491 minor manual intervention * chore: update patches * chore: Rename mouse lock to pointer lock Xref: https://chromium-review.googlesource.com/c/chromium/src/+/5148491 * refactor: fix use of newly-removed QuitCurrentWhenIdleClosureDeprecated() Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4710351 Xref: https://github.com/electron/electron/pull/26022 This usage was added in #26022 as part of Wayland support and some simple fiddles WfM with this patch on Wayland, but I'm unsure what to be testing for & would like a second opinion on this commit. * chore: bump chromium in DEPS to 123.0.6268.0 * chore: update patches * 5235021: WebUI: Migrate accessibility and bluetooth internals to WebUIConfig https://chromium-review.googlesource.com/c/chromium/src/+/5235021 * address review comment for 5196547 See: https://chromium-review.googlesource.com/c/chromium/src/+/5196547 Review comment: https://github.com/electron/electron/pull/41130#discussion_r1468973786 * 5075962: Introduce URLLoaderFactoryBuilder https://chromium-review.googlesource.com/c/chromium/src/+/5075962 * chore: bump chromium in DEPS to 123.0.6270.0 * the missing semicolon strikes again * chore: update chromium patches * chore: update v8 patches * 5242326: Some followup cleanup to Fuchia files in chrome | https://chromium-review.googlesource.com/c/chromium/src/+/5242326 * chore: bump chromium in DEPS to 123.0.6272.0 * chore: update patches * chore: update patch after rebase * 5247339: [Clipboard] Remove ClipboardContentType enum. https://chromium-review.googlesource.com/c/chromium/src/+/5247339 * Reland: "Allow content shell to enable the built-in DNS resolver" https://chromium-review.googlesource.com/c/chromium/src/+/5232354 * 5018206: [accessibility] Migrate to ScopedAccessibilityMode https://chromium-review.googlesource.com/c/chromium/src/+/5018206 * 5246669: [Default Nav Transition]Add GetBackForwardTransitionAnimationManager on WebContentsView | https://chromium-review.googlesource.com/c/chromium/src/+/5246669 * fix: move nut-js to optional spec deps (#41199) * chore: bump chromium in DEPS to 123.0.6265.0 * chore: bump chromium in DEPS to 123.0.6266.0 * chore: update feat_ensure_mas_builds_of_the_same_application_can_use_safestorage.patch Xref: https://chromium-review.googlesource.com/c/chromium/src/+/5232280 reverts the revert *and* undoes the rewrites 😵 * chore: update chromium/disable_hidden.patch Xref: https://chromium-review.googlesource.com/c/chromium/src/+/5148491 minor manual intervention * chore: update patches * chore: Rename mouse lock to pointer lock Xref: https://chromium-review.googlesource.com/c/chromium/src/+/5148491 * refactor: fix use of newly-removed QuitCurrentWhenIdleClosureDeprecated() Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4710351 Xref: https://github.com/electron/electron/pull/26022 This usage was added in #26022 as part of Wayland support and some simple fiddles WfM with this patch on Wayland, but I'm unsure what to be testing for & would like a second opinion on this commit. * chore: bump chromium in DEPS to 123.0.6268.0 * chore: update patches * 5235021: WebUI: Migrate accessibility and bluetooth internals to WebUIConfig https://chromium-review.googlesource.com/c/chromium/src/+/5235021 * address review comment for 5196547 See: https://chromium-review.googlesource.com/c/chromium/src/+/5196547 Review comment: https://github.com/electron/electron/pull/41130#discussion_r1468973786 * 5075962: Introduce URLLoaderFactoryBuilder https://chromium-review.googlesource.com/c/chromium/src/+/5075962 * chore: bump chromium in DEPS to 123.0.6270.0 * the missing semicolon strikes again * chore: update chromium patches * chore: update v8 patches * 5242326: Some followup cleanup to Fuchia files in chrome | https://chromium-review.googlesource.com/c/chromium/src/+/5242326 * chore: bump chromium in DEPS to 123.0.6272.0 * chore: update patches * chore: update patch after rebase * 5247339: [Clipboard] Remove ClipboardContentType enum. https://chromium-review.googlesource.com/c/chromium/src/+/5247339 * Reland: "Allow content shell to enable the built-in DNS resolver" https://chromium-review.googlesource.com/c/chromium/src/+/5232354 * 5018206: [accessibility] Migrate to ScopedAccessibilityMode https://chromium-review.googlesource.com/c/chromium/src/+/5018206 * 5246669: [Default Nav Transition]Add GetBackForwardTransitionAnimationManager on WebContentsView | https://chromium-review.googlesource.com/c/chromium/src/+/5246669 * fix: typescript error for optional dependency (cherry picked from commit ea17105c8c01bd1f4c1df5e72190a687d92f93cc) --------- Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: Charles Kerr <charles@charleskerr.com> Co-authored-by: PatchUp <73610968+patchup[bot]@users.noreply.github.com> Co-authored-by: clavin <clavin@electronjs.org> Co-authored-by: VerteDinde <vertedinde@electronjs.org> Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org> Co-authored-by: Sam Maddock <smaddock@slack-corp.com>
119 lines
4.2 KiB
Objective-C
119 lines
4.2 KiB
Objective-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 ELECTRON_SHELL_BROWSER_OSR_OSR_WEB_CONTENTS_VIEW_H_
|
|
#define ELECTRON_SHELL_BROWSER_OSR_OSR_WEB_CONTENTS_VIEW_H_
|
|
|
|
#include "shell/browser/native_window.h"
|
|
#include "shell/browser/native_window_observer.h"
|
|
|
|
#include "base/memory/raw_ptr.h"
|
|
#include "base/memory/raw_ptr_exclusion.h"
|
|
#include "content/browser/renderer_host/render_view_host_delegate_view.h" // nogncheck
|
|
#include "content/browser/web_contents/web_contents_view.h" // nogncheck
|
|
#include "content/public/browser/web_contents.h"
|
|
#include "shell/browser/osr/osr_render_widget_host_view.h"
|
|
#include "third_party/blink/public/common/page/drag_mojom_traits.h"
|
|
|
|
#if BUILDFLAG(IS_MAC)
|
|
#ifdef __OBJC__
|
|
@class OffScreenView;
|
|
#else
|
|
class OffScreenView;
|
|
#endif
|
|
#endif
|
|
|
|
namespace electron {
|
|
|
|
class OffScreenWebContentsView : public content::WebContentsView,
|
|
public content::RenderViewHostDelegateView,
|
|
public NativeWindowObserver {
|
|
public:
|
|
OffScreenWebContentsView(bool transparent, const OnPaintCallback& callback);
|
|
~OffScreenWebContentsView() override;
|
|
|
|
void SetWebContents(content::WebContents*);
|
|
void SetNativeWindow(NativeWindow* window);
|
|
|
|
// NativeWindowObserver:
|
|
void OnWindowResize() override;
|
|
void OnWindowClosed() override;
|
|
|
|
gfx::Size GetSize();
|
|
|
|
// content::WebContentsView:
|
|
gfx::NativeView GetNativeView() const override;
|
|
gfx::NativeView GetContentNativeView() const override;
|
|
gfx::NativeWindow GetTopLevelNativeWindow() const override;
|
|
gfx::Rect GetContainerBounds() const override;
|
|
void Focus() override;
|
|
void SetInitialFocus() override;
|
|
void StoreFocus() override;
|
|
void RestoreFocus() override;
|
|
void FocusThroughTabTraversal(bool reverse) override;
|
|
content::DropData* GetDropData() const override;
|
|
void TransferDragSecurityInfo(WebContentsView* view) override;
|
|
gfx::Rect GetViewBounds() const override;
|
|
void CreateView(gfx::NativeView context) override;
|
|
content::RenderWidgetHostViewBase* CreateViewForWidget(
|
|
content::RenderWidgetHost* render_widget_host) override;
|
|
content::RenderWidgetHostViewBase* CreateViewForChildWidget(
|
|
content::RenderWidgetHost* render_widget_host) override;
|
|
void SetPageTitle(const std::u16string& title) override;
|
|
void RenderViewReady() override;
|
|
void RenderViewHostChanged(content::RenderViewHost* old_host,
|
|
content::RenderViewHost* new_host) override;
|
|
void SetOverscrollControllerEnabled(bool enabled) override;
|
|
void OnCapturerCountChanged() override;
|
|
void FullscreenStateChanged(bool is_fullscreen) override;
|
|
void UpdateWindowControlsOverlay(const gfx::Rect& bounding_rect) override;
|
|
content::BackForwardTransitionAnimationManager*
|
|
GetBackForwardTransitionAnimationManager() override;
|
|
|
|
#if BUILDFLAG(IS_MAC)
|
|
bool CloseTabAfterEventTrackingIfNeeded() override;
|
|
#endif
|
|
|
|
// content::RenderViewHostDelegateView
|
|
void StartDragging(const content::DropData& drop_data,
|
|
const url::Origin& source_origin,
|
|
blink::DragOperationsMask allowed_ops,
|
|
const gfx::ImageSkia& image,
|
|
const gfx::Vector2d& cursor_offset,
|
|
const gfx::Rect& drag_obj_rect,
|
|
const blink::mojom::DragEventSourceInfo& event_info,
|
|
content::RenderWidgetHostImpl* source_rwh) override;
|
|
void UpdateDragOperation(ui::mojom::DragOperation operation,
|
|
bool document_is_handling_drag) override;
|
|
void SetPainting(bool painting);
|
|
bool IsPainting() const;
|
|
void SetFrameRate(int frame_rate);
|
|
int GetFrameRate() const;
|
|
|
|
private:
|
|
#if BUILDFLAG(IS_MAC)
|
|
void PlatformCreate();
|
|
void PlatformDestroy();
|
|
#endif
|
|
|
|
OffScreenRenderWidgetHostView* GetView() const;
|
|
|
|
raw_ptr<NativeWindow> native_window_ = nullptr;
|
|
|
|
const bool transparent_;
|
|
bool painting_ = true;
|
|
int frame_rate_ = 60;
|
|
OnPaintCallback callback_;
|
|
|
|
// Weak refs.
|
|
raw_ptr<content::WebContents> web_contents_ = nullptr;
|
|
|
|
#if BUILDFLAG(IS_MAC)
|
|
RAW_PTR_EXCLUSION OffScreenView* offScreenView_;
|
|
#endif
|
|
};
|
|
|
|
} // namespace electron
|
|
|
|
#endif // ELECTRON_SHELL_BROWSER_OSR_OSR_WEB_CONTENTS_VIEW_H_
|