mirror of
https://github.com/electron/electron.git
synced 2026-01-08 23:18:06 -05:00
* chore: bump chromium in DEPS to 144.0.7543.0 * Pass PipScreenCaptureCoordinatorProxy to ScreenCaptureKitDeviceMac https://chromium-review.googlesource.com/c/chromium/src/+/7157590 * chore: update patches * chore: update filenames.libcxx.gni * 7142359: Spanification of process_singleton_posix.cc https: //chromium-review.googlesource.com/c/chromium/src/+/7142359 Co-Authored-By: Charles Kerr <70381+ckerr@users.noreply.github.com> * Move logging::LoggingSettings to base/logging/logging_settings.h https://chromium-review.googlesource.com/c/chromium/src/+/7173024 * chore: bump chromium in DEPS to 144.0.7545.0 * 7159368: update PluginService API for sync GetPlugins Upstream removed async PluginService APIs: - GetPluginsAsync() removed, use synchronous GetPlugins() - RegisterInternalPlugin() now takes single argument (remove add_at_beginning) - RefreshPlugins() removed entirely Updated ElectronPluginInfoHostImpl to use synchronous plugin loading and simplified ElectronBrowserMainParts internal plugin registration. Ref: https://chromium-review.googlesource.com/c/chromium/src/+/7159368 Ref: https://chromium-review.googlesource.com/c/chromium/src/+/7159328 Ref: https://chromium-review.googlesource.com/c/chromium/src/+/7159056 (cherry picked from commit88cdf50b0a) * 7159184: add missing base/files/file_path.h include Add explicit include for base/files/file_path.h in electron_browser_context.h. After removal of superfluous Mojo includes from content headers, base::FilePath is no longer transitively included via content/public/browser/browser_context.h. Ref: https://chromium-review.googlesource.com/c/chromium/src/+/7159184 (cherry picked from commit6ca8ea03ec) * 7126479: add ShouldForceRefreshTextCheckService parameter to SpellCheckClient Upstream added a force-refresh parameter to WebTextCheckClient::RequestCheckingOfText to bypass spell check cache. Add the new ShouldForceRefreshTextCheckService parameter to SpellCheckClient's override (currently unused in Electron). Ref: https://chromium-review.googlesource.com/c/chromium/src/+/7126479 (cherry picked from commit879c0401c4) * 7083663: remove fingerprinting_protection_ruleset_service override Upstream deleted external references to Fingerprinting Protection Filter (FPF) component. Remove the fingerprinting_protection_ruleset_service() override from BrowserProcessImpl as the method no longer exists in the base class. Ref: https://chromium-review.googlesource.com/c/chromium/src/+/7083663 (cherry picked from commit8350d152f9) * 7155287: implement WebContentsView::GetSize and Resize Upstream delegated WebContents::GetSize() and Resize() to WebContentsView, making them pure virtual. Add const qualifier to GetSize() and implement the Resize() override in OffScreenWebContentsView (no-op for offscreen). Ref: https://chromium-review.googlesource.com/c/chromium/src/+/7155287 (cherry picked from commit084eaa568e) * 7184238: add OnUnconfirmedTapConvertedToTap override Upstream added OnUnconfirmedTapConvertedToTap as a pure virtual method to RenderWidgetHostViewBase to inform root view when child frame converts an unconfirmed tap. Add empty override for offscreen rendering. Ref: https://chromium-review.googlesource.com/c/chromium/src/+/7184238 (cherry picked from commitef03400d9a) * 7143586: add widget parameter to OnCommandsChanged GlobalAcceleratorListener::OnCommandsChanged gained a gfx::AcceleratedWidget parameter for window association in the GlobalShortcutListenerLinux implementation. Pass gfx::kNullAcceleratedWidget for Electron's usage. Ref: : Pass parent handle to GlobalAcceleratorListenerLinux::BindShortcuts | https://chromium-review.googlesource.com/c/chromium/src/+/7143586 (cherry picked from commit38306e2bfc) Co-Authored-By: Samuel Attard <MarshallOfSound@users.noreply.github.com> * chore: update patches Co-Authored-By: Samuel Attard <MarshallOfSound@users.noreply.github.com> * chore: bump chromium in DEPS to 144.0.7547.0 * chore: update patches * 7189232: Add support for UnownedUserData in GlobalFeatures https: //chromium-review.googlesource.com/c/chromium/src/+/7189232 * Refactor: Use std::u16string for extension load error messages https://chromium-review.googlesource.com/c/chromium/src/+/7185844 * fixup Add support for UnownedUserData in GlobalFeatures * 7165650: Remove ResourceContext https://chromium-review.googlesource.com/c/chromium/src/+/7165650 * fixup BUILD.gn for lint * 7202164: Reland "Reland "Remove GenericScopedHandle:IsValid"" https://chromium-review.googlesource.com/c/chromium/src/+/7202164 * advance deprecation of v8::ReturnValue<void>::Set(Local<S>). 7168624: [runtime][api] Relax requirements for setter/definer/deleter callbacks | https://chromium-review.googlesource.com/c/v8/v8/+/7168624 * fixup advance deprecation of v8::ReturnValue<void>::Set(Local<S>) * chore: skip setting LPAC ACLs * Revert "chore: skip setting LPAC ACLs" This reverts commite187aec488. * chore: revert Convert to UNSAFE_TODO in sandbox revert https://chromium-review.googlesource.com/c/chromium/src/+/7131661 to see if it fixes the Windows sandbox issue. * Revert "chore: revert Convert to UNSAFE_TODO in sandbox" This reverts commit57afbfefe5. * chore: Revert "Enable network sandbox by default on Windows" see if this fixes the Windows sandbox issue * Enable network sandbox by default on Windows https://chromium-review.googlesource.com/c/chromium/src/+/7204292 * Revert "chore: Revert "Enable network sandbox by default on Windows"" This reverts commit530ab6af82. * fixup! Enable network sandbox by default on Windows | https://chromium-review.googlesource.com/c/chromium/src/+/7204292 * fixup!: Correct flag name, add kLocalNetworkAccessChecks to all platforms --------- 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: Charles Kerr <70381+ckerr@users.noreply.github.com> Co-authored-by: Samuel Attard <sattard@anthropic.com> Co-authored-by: Samuel Attard <MarshallOfSound@users.noreply.github.com> Co-authored-by: John Kleinschmidt <kleinschmidtorama@gmail.com> Co-authored-by: Keeley Hammond <khammond@slack-corp.com>
131 lines
4.5 KiB
Objective-C
131 lines
4.5 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_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 "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 content {
|
|
class WebContents;
|
|
}
|
|
|
|
namespace electron {
|
|
|
|
class NativeWindow;
|
|
|
|
class OffScreenWebContentsView : public content::WebContentsView,
|
|
public content::RenderViewHostDelegateView,
|
|
private NativeWindowObserver {
|
|
public:
|
|
OffScreenWebContentsView(
|
|
bool transparent,
|
|
bool offscreen_use_shared_texture,
|
|
const std::string& offscreen_shared_texture_pixel_format,
|
|
const OnPaintCallback& callback);
|
|
~OffScreenWebContentsView() override;
|
|
|
|
void SetWebContents(content::WebContents*);
|
|
void SetNativeWindow(NativeWindow* window);
|
|
|
|
// NativeWindowObserver:
|
|
void OnWindowResize() override;
|
|
void OnWindowClosed() override;
|
|
|
|
gfx::Size GetSize() const override;
|
|
|
|
// 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 Resize(const gfx::Rect& new_bounds) override {}
|
|
void SetInitialFocus() override {}
|
|
void StoreFocus() override {}
|
|
void RestoreFocus() override {}
|
|
void FocusThroughTabTraversal(bool reverse) override {}
|
|
content::DropData* GetDropData() const 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;
|
|
void DestroyBackForwardTransitionAnimationManager() 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_;
|
|
const bool offscreen_use_shared_texture_;
|
|
const std::string offscreen_shared_texture_pixel_format_;
|
|
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_ = nullptr;
|
|
#endif
|
|
};
|
|
|
|
} // namespace electron
|
|
|
|
#endif // ELECTRON_SHELL_BROWSER_OSR_OSR_WEB_CONTENTS_VIEW_H_
|