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>
232 lines
6.3 KiB
C++
232 lines
6.3 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.
|
|
|
|
#include "shell/browser/osr/osr_web_contents_view.h"
|
|
|
|
#include "content/browser/web_contents/web_contents_impl.h" // nogncheck
|
|
#include "content/public/browser/render_view_host.h"
|
|
#include "ui/display/screen.h"
|
|
#include "ui/display/screen_info.h"
|
|
|
|
namespace electron {
|
|
|
|
OffScreenWebContentsView::OffScreenWebContentsView(
|
|
bool transparent,
|
|
const OnPaintCallback& callback)
|
|
: transparent_(transparent), callback_(callback) {
|
|
#if BUILDFLAG(IS_MAC)
|
|
PlatformCreate();
|
|
#endif
|
|
}
|
|
|
|
OffScreenWebContentsView::~OffScreenWebContentsView() {
|
|
if (native_window_)
|
|
native_window_->RemoveObserver(this);
|
|
|
|
#if BUILDFLAG(IS_MAC)
|
|
PlatformDestroy();
|
|
#endif
|
|
}
|
|
|
|
void OffScreenWebContentsView::SetWebContents(
|
|
content::WebContents* web_contents) {
|
|
web_contents_ = web_contents;
|
|
|
|
if (GetView())
|
|
GetView()->InstallTransparency();
|
|
}
|
|
|
|
void OffScreenWebContentsView::SetNativeWindow(NativeWindow* window) {
|
|
if (native_window_)
|
|
native_window_->RemoveObserver(this);
|
|
|
|
native_window_ = window;
|
|
|
|
if (native_window_)
|
|
native_window_->AddObserver(this);
|
|
|
|
OnWindowResize();
|
|
}
|
|
|
|
void OffScreenWebContentsView::OnWindowResize() {
|
|
// In offscreen mode call RenderWidgetHostView's SetSize explicitly
|
|
if (GetView())
|
|
GetView()->SetSize(GetSize());
|
|
}
|
|
|
|
void OffScreenWebContentsView::OnWindowClosed() {
|
|
if (native_window_) {
|
|
native_window_->RemoveObserver(this);
|
|
native_window_ = nullptr;
|
|
}
|
|
}
|
|
|
|
gfx::Size OffScreenWebContentsView::GetSize() {
|
|
return native_window_ ? native_window_->GetSize() : gfx::Size();
|
|
}
|
|
|
|
#if !BUILDFLAG(IS_MAC)
|
|
gfx::NativeView OffScreenWebContentsView::GetNativeView() const {
|
|
if (!native_window_)
|
|
return gfx::NativeView();
|
|
return native_window_->GetNativeView();
|
|
}
|
|
|
|
gfx::NativeView OffScreenWebContentsView::GetContentNativeView() const {
|
|
if (!native_window_)
|
|
return gfx::NativeView();
|
|
return native_window_->GetNativeView();
|
|
}
|
|
|
|
gfx::NativeWindow OffScreenWebContentsView::GetTopLevelNativeWindow() const {
|
|
if (!native_window_)
|
|
return gfx::NativeWindow();
|
|
return native_window_->GetNativeWindow();
|
|
}
|
|
#endif
|
|
|
|
gfx::Rect OffScreenWebContentsView::GetContainerBounds() const {
|
|
return GetViewBounds();
|
|
}
|
|
|
|
void OffScreenWebContentsView::Focus() {}
|
|
|
|
void OffScreenWebContentsView::SetInitialFocus() {}
|
|
|
|
void OffScreenWebContentsView::StoreFocus() {}
|
|
|
|
void OffScreenWebContentsView::RestoreFocus() {}
|
|
|
|
void OffScreenWebContentsView::FocusThroughTabTraversal(bool reverse) {}
|
|
|
|
content::DropData* OffScreenWebContentsView::GetDropData() const {
|
|
return nullptr;
|
|
}
|
|
|
|
void OffScreenWebContentsView::TransferDragSecurityInfo(WebContentsView* view) {
|
|
NOTREACHED();
|
|
}
|
|
|
|
gfx::Rect OffScreenWebContentsView::GetViewBounds() const {
|
|
return GetView() ? GetView()->GetViewBounds() : gfx::Rect();
|
|
}
|
|
|
|
void OffScreenWebContentsView::CreateView(gfx::NativeView context) {}
|
|
|
|
content::RenderWidgetHostViewBase*
|
|
OffScreenWebContentsView::CreateViewForWidget(
|
|
content::RenderWidgetHost* render_widget_host) {
|
|
if (render_widget_host->GetView()) {
|
|
return static_cast<content::RenderWidgetHostViewBase*>(
|
|
render_widget_host->GetView());
|
|
}
|
|
|
|
return new OffScreenRenderWidgetHostView(
|
|
transparent_, painting_, GetFrameRate(), callback_, render_widget_host,
|
|
nullptr, GetSize());
|
|
}
|
|
|
|
content::RenderWidgetHostViewBase*
|
|
OffScreenWebContentsView::CreateViewForChildWidget(
|
|
content::RenderWidgetHost* render_widget_host) {
|
|
auto* web_contents_impl =
|
|
static_cast<content::WebContentsImpl*>(web_contents_);
|
|
|
|
auto* view = static_cast<OffScreenRenderWidgetHostView*>(
|
|
web_contents_impl->GetOuterWebContents()
|
|
? web_contents_impl->GetOuterWebContents()->GetRenderWidgetHostView()
|
|
: web_contents_impl->GetRenderWidgetHostView());
|
|
|
|
return new OffScreenRenderWidgetHostView(transparent_, painting_,
|
|
view->GetFrameRate(), callback_,
|
|
render_widget_host, view, GetSize());
|
|
}
|
|
|
|
void OffScreenWebContentsView::SetPageTitle(const std::u16string& title) {}
|
|
|
|
void OffScreenWebContentsView::RenderViewReady() {
|
|
if (GetView())
|
|
GetView()->InstallTransparency();
|
|
}
|
|
|
|
void OffScreenWebContentsView::RenderViewHostChanged(
|
|
content::RenderViewHost* old_host,
|
|
content::RenderViewHost* new_host) {}
|
|
|
|
void OffScreenWebContentsView::SetOverscrollControllerEnabled(bool enabled) {}
|
|
|
|
void OffScreenWebContentsView::OnCapturerCountChanged() {}
|
|
|
|
#if BUILDFLAG(IS_MAC)
|
|
bool OffScreenWebContentsView::CloseTabAfterEventTrackingIfNeeded() {
|
|
return false;
|
|
}
|
|
#endif // BUILDFLAG(IS_MAC)
|
|
|
|
void OffScreenWebContentsView::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) {
|
|
if (web_contents_)
|
|
static_cast<content::WebContentsImpl*>(web_contents_)
|
|
->SystemDragEnded(source_rwh);
|
|
}
|
|
|
|
void OffScreenWebContentsView::UpdateDragOperation(
|
|
ui::mojom::DragOperation operation,
|
|
bool document_is_handling_drag) {}
|
|
|
|
void OffScreenWebContentsView::SetPainting(bool painting) {
|
|
auto* view = GetView();
|
|
painting_ = painting;
|
|
if (view != nullptr) {
|
|
view->SetPainting(painting);
|
|
}
|
|
}
|
|
|
|
bool OffScreenWebContentsView::IsPainting() const {
|
|
auto* view = GetView();
|
|
if (view != nullptr) {
|
|
return view->IsPainting();
|
|
} else {
|
|
return painting_;
|
|
}
|
|
}
|
|
|
|
void OffScreenWebContentsView::SetFrameRate(int frame_rate) {
|
|
auto* view = GetView();
|
|
frame_rate_ = frame_rate;
|
|
if (view != nullptr) {
|
|
view->SetFrameRate(frame_rate);
|
|
}
|
|
}
|
|
|
|
int OffScreenWebContentsView::GetFrameRate() const {
|
|
auto* view = GetView();
|
|
if (view != nullptr) {
|
|
return view->GetFrameRate();
|
|
} else {
|
|
return frame_rate_;
|
|
}
|
|
}
|
|
|
|
OffScreenRenderWidgetHostView* OffScreenWebContentsView::GetView() const {
|
|
if (web_contents_) {
|
|
return static_cast<OffScreenRenderWidgetHostView*>(
|
|
web_contents_->GetRenderViewHost()->GetWidget()->GetView());
|
|
}
|
|
return nullptr;
|
|
}
|
|
|
|
void OffScreenWebContentsView::FullscreenStateChanged(bool is_fullscreen) {}
|
|
|
|
void OffScreenWebContentsView::UpdateWindowControlsOverlay(
|
|
const gfx::Rect& bounding_rect) {}
|
|
|
|
} // namespace electron
|