mirror of
https://github.com/electron/electron.git
synced 2026-04-10 03:01:51 -04:00
1e2d5902a5
fix: bind offscreen paint callback to child WebContents Previously, MaybeOverrideCreateParamsForNewWindow bound the OffScreenWebContentsView's paint callback to the parent WebContents using base::Unretained(this). This was both unsafe (dangling pointer risk if the parent is destroyed before the child) and semantically incorrect — paint events belong to the child window, not the opener. Replace the callback in MaybeOverrideCreateParamsForNewWindow with base::DoNothing(), then rebind it to the child WebContents in AddNewContents via a new SetCallback method on OffScreenWebContentsView. Co-authored-by: trop[bot] <37223003+trop[bot]@users.noreply.github.com> Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com>
134 lines
4.6 KiB
Objective-C
134 lines
4.6 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,
|
|
float offscreen_device_scale_factor,
|
|
const OnPaintCallback& callback);
|
|
~OffScreenWebContentsView() override;
|
|
|
|
void SetWebContents(content::WebContents*);
|
|
void SetNativeWindow(NativeWindow* window);
|
|
void SetCallback(const OnPaintCallback& callback);
|
|
|
|
// 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_;
|
|
const float offscreen_device_scale_factor_;
|
|
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_
|