be44a2c5b7
* chore: bump chromium in DEPS to 120.0.6049.0 * chore: update patches * chore: bump chromium in DEPS to 120.0.6050.0 * chore: update patches * 4910494: Reland "[autopip] Show autopip UI for video pip" https://chromium-review.googlesource.com/c/chromium/src/+/4910494 * 4812338: Move partition_alloc into a "partition_alloc" dir. https://chromium-review.googlesource.com/c/chromium/src/+/4812338 * [Extensions Cleanup] Remove mojom ViewType::kExtensionDialog https://chromium-review.googlesource.com/c/chromium/src/+/4909897 * 4894923: Force enable raw_ptrs pointer arithmetic check. https://chromium-review.googlesource.com/c/chromium/src/+/4894923 * gin: Prevent wrappables from being constructed from author code. https://chromium-review.googlesource.com/c/chromium/src/+/4905829 * chore: update patches * chore: bump chromium in DEPS to 120.0.6052.0 * chore: bump chromium in DEPS to 120.0.6054.0 * chore: bump chromium in DEPS to 120.0.6056.0 * chore: fix patches * 4918545: Reland "[autopip] Add permissions embargo" https://chromium-review.googlesource.com/c/chromium/src/+/4918545 * 4881761: UI bindings for visual logging with structured metrics. https://chromium-review.googlesource.com/c/chromium/src/+/4881761 * chore: bump chromium in DEPS to 120.0.6058.0 * chore: update patches * chore: bump chromium in DEPS to 120.0.6060.0 * chore: bump chromium in DEPS to 120.0.6061.0 * chore: bump chromium in DEPS to 120.0.6062.0 * chore: gen libc++ filenames * chore: update patches * 4911894: Move //c/b/ui/views/eye_dropper to //components https://chromium-review.googlesource.com/c/chromium/src/+/4911894 * chore: bump chromium in DEPS to 120.0.6064.0 * chore: bump chromium in DEPS to 120.0.6066.0 * chore: bump chromium in DEPS to 120.0.6068.0 * chore: bump chromium in DEPS to 120.0.6070.0 * chore: remove temp_prevent_unused_function_error.patch Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4931270 * chore: add TransferDragSecurityInfo() Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4928028 * mark TransferDragSecurityInfo() as NOTREACHED A follow-up to previous commit. I think this is commit is correct (i.e. that this function shouldn't get called) but am not positive, so I'm including it in a standalone commit in case we need to revert. * chore: update signature of OnPrivateNetworkAccessPermissionRequired() Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4919478 Our impl is a no-op, so updating the signature is the only change. * chore: rebuild patches * chore: bump chromium in DEPS to 120.0.6072.0 * chore: update patches * chore: sync ParseMatchPattern() param order with upstream change Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4944243 * chore: update fix_crash_loading_non-standard_schemes_in_iframes.patch Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4939602 * chore: rebuild patches * chore: bump chromium in DEPS to 120.0.6073.0 * chore: update patches * chore: bump chromium in DEPS to 120.0.6074.0 * chore: update disable_color_correct_rendering.patch Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4908053 no manual changes; patch applied with fuzz 1 * chore: update fix_handle_no_top_level_aura_window_in_webcontentsimpl.patch Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4936315 minor manual sync to upstream code shear * chore: rebuild patches * chore: update ClearHttpAuthCache arguments Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4937937 adding ClearDataFilterPtr arg. Upstream added this arg, which is already present in other NetworkContext methods. Our code uses `nullptr` there. * chore: bump chromium in DEPS to 120.0.6076.0 * chore: update mas_disable_remote_accessibility.patch Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4865412 minor manual sync to upstream code shear * chore: update disable_color_correct_rendering.patch Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4942936 minor manual sync to upstream code shear * fix: move x11_util.h include to top of source file This is a short-term fix to unblock the roll. I will follow up a better fix in a standalone PR. * chore: rebuild patches * chore: bump chromium in DEPS to 120.0.6077.0 * chore: update patches * chore: bump chromium in DEPS to 120.0.6078.0 * chore: update patches * refactor: add BrowserProcessImpl::os_crypt_async() Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4455776 This is one to keep an eye on. This commit copies the upstream impl, which appears to be an interim step with more upstream code changes still forthcoming. Xref: https://bugs.chromium.org/p/chromium/issues/detail?id=1373092 * fixup! refactor: add BrowserProcessImpl::os_crypt_async() chore: make 'gn check' happy * chore: remove ensure_messageports_get_gced_when_not_referenced.patch Xref: ensure_messageports_get_gced_when_not_referenced.patch no longer needed because upstreamed * chore: remove webrtc/pipewire_capturer_make_restore_tokens_re-usable_more_than_one_time.patch Xref: https://webrtc-review.googlesource.com/c/src/+/322621 no longer needed because upstreamed * chore: add //components/compose:buildflags dep Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4912601 needed by browser/ui/browser_dialogs.h * chore: update filenames.libcxx.gni node ./script/gen-libc++-filenames.js * test: fix UI.InspectorView -> UI.InspectorView.instance() --------- 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: PatchUp <73610968+patchup[bot]@users.noreply.github.com> Co-authored-by: clavin <clavin@electronjs.org> Co-authored-by: Charles Kerr <charles@charleskerr.com> Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com>
117 lines
4.1 KiB
Objective-C
117 lines
4.1 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;
|
|
|
|
#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_
|