28ada6ea8b
* chore: bump chromium in DEPS to 99.0.4819.0
* chore: update patches
* chore: bump chromium in DEPS to 99.0.4824.0
* chore: update patches
* chore: bump chromium in DEPS to 99.0.4827.0
* chore: update patches
* 3352511: PiP: Add inkdrop and pointer cursor to PiP window buttons
https://chromium-review.googlesource.com/c/chromium/src/+/3352511
* 3309164: webhid: Show FIDO devices in the chooser if allowed
https://chromium-review.googlesource.com/c/chromium/src/+/3309164
* 3297868: hid: Add experimental HIDDevice.forget()
https://chromium-review.googlesource.com/c/chromium/src/+/3297868
* 3362491: [Extensions] Move i18n API to //extensions
https://chromium-review.googlesource.com/c/chromium/src/+/3362491
* MCC Refactor step0: Allow embedders to register associated_interface binders with RenderFrameHostImpl::associated_registry_.
https://chromium-review.googlesource.com/c/chromium/src/+/3281481
* 3352616: [Gtk] Remove libgtk from the link-line
https://chromium-review.googlesource.com/c/chromium/src/+/3352616
* 3249211: Clear-Site-Data support for partitioned cookies
https://chromium-review.googlesource.com/c/chromium/src/+/3249211
* [Extensions][COIL] Use [allow|block]list in //extensions/common
https://chromium-review.googlesource.com/c/chromium/src/+/3372668
* Begin ScopedUserPrefUpdate migration to modern base::Value
https://chromium-review.googlesource.com/c/chromium/src/+/3376154
* [Code Health] Refactor PrefService GetDict + GetList to use base::Value
https://chromium-review.googlesource.com/c/chromium/src/+/3343526
* 3354997: [CodeHealth] Remove deprecated SetDictionary method
https://chromium-review.googlesource.com/c/chromium/src/+/3354997
* 3287323: Add LacrosPrefStore for lacros settings
https://chromium-review.googlesource.com/c/chromium/src/+/3287323
* 3365916: [PA] Clean up remaining lazy commit code
https://chromium-review.googlesource.com/c/chromium/src/+/3365916
* [MPArch] Target the external protocol error at the responsible frame.
https://chromium-review.googlesource.com/c/chromium/src/+/3011560
* Pass origin to RegisterNonNetworkSubresourceURLLoaderFactories
https://chromium-review.googlesource.com/c/chromium/src/+/3350608
* Linux: Send OSCrypt raw encryption key to the Network Service
https://chromium-review.googlesource.com/c/chromium/src/+/3320484
* [PlzServiceWorker] Remove remaining references to PlzServiceWorker.
https://chromium-review.googlesource.com/c/chromium/src/+/3359441
* chore: fixup for lint
* 3327621: Fix tablet mode detection for Win 11.
https://chromium-review.googlesource.com/c/chromium/src/+/3327621
* 3342428: ax_mac: move AXTextMarker conversion utils under ui umbrella
https://chromium-review.googlesource.com/c/chromium/src/+/3342428
* 3353974: Mac: Use base::Feature for overlay features
https://chromium-review.googlesource.com/c/chromium/src/+/3353974
* chore: bump chromium in DEPS to 99.0.4828.0
* chore: update patches
* chore: bump chromium in DEPS to 99.0.4837.0
* chore: update patches
* chore: update patches
* 3379142: Drop FALLTHROUGH macro
Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3379142
* 3381749: C++17: Allow use of std::map::try_emplace and std::map::insert_or_assign
Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3381749
* chore: bump chromium in DEPS to 99.0.4839.0
* chore: update patches
* chore: bump chromium in DEPS to 99.0.4840.0
* chore: bump chromium in DEPS to 99.0.4844.0
* 3395881: [api] Deprecate Local<v8::Context> v8::Object::CreationContext()
Ref: https://chromium-review.googlesource.com/c/v8/v8/+/3395881
* chore: update patches
* chore: bump chromium in DEPS to 100.0.4845.0
* chore: update patches
* chore: bump chromium in DEPS to 100.0.4847.0
* chore: update patches
* chore: bump chromium in DEPS to 100.0.4849.0
* chore: update patches
* chore: bump chromium in DEPS to 100.0.4851.0
* chore: bump chromium in DEPS to 100.0.4853.0
* update patches
* chore: update patches
* update patches
* 3383599: Fonts Access: Remove prototype that uses a font picker.
https://chromium-review.googlesource.com/c/chromium/src/+/3383599
* 3404768: Remove ALLOW_UNUSED macros
https://chromium-review.googlesource.com/c/chromium/src/+/3404768
* 3374762: Remove ignore_result.h
https://chromium-review.googlesource.com/c/chromium/src/+/3374762
* 3399305: [unseasoned-pdf] Apply proper frame offsets for touch selections
https://chromium-review.googlesource.com/c/chromium/src/+/3399305
* 3402210: [Extensions] Don't trigger unload event for already unloaded extension
https://chromium-review.googlesource.com/c/chromium/src/+/3402210
* 3410912: Combine URLLoaderClient OnReceiveResponse and OnStartLoadingResponseBody.
https://chromium-review.googlesource.com/c/chromium/src/+/3410912
* 3370428: Make the AuthSchemes policy support dynamic refresh
https://chromium-review.googlesource.com/c/chromium/src/+/3370428
* 3407603: Finish ScopedUserPrefUpdate migration to modern base::Value
https://chromium-review.googlesource.com/c/chromium/src/+/3407603
* 3378352: ozone/x11: move code from //ui/p/x11 to //ui/ozone/p/x11
https://chromium-review.googlesource.com/c/chromium/src/+/3378352
* 3370810: Delete chrome/service, AKA the Cloud Print service process.
https://chromium-review.googlesource.com/c/chromium/src/+/3370810
* chore: bump chromium in DEPS to 100.0.4855.0
* chore: update patches
* fixup! 3370810: Delete chrome/service, AKA the Cloud Print service process.
* revert 3348007 to fix windows build
* 3318572: [Code health] Fix gn check errors in //extensions/browser:*
https://chromium-review.googlesource.com/c/chromium/src/+/3318572
* fix printing.patch
* fix iwyu issue
* 3408515: win: Make ShorcutOperation an enum class and modernize names
https://chromium-review.googlesource.com/c/chromium/src/+/3408515
* 3388333: [UIA] Remove dead code accessibility_misc_utils.h/cc
https://chromium-review.googlesource.com/c/chromium/src/+/3388333
* fix windows build? i hope
* patch gn visibility of //ui/ozone/platform/x11
* missing include base/logging.h
* use BUILDFLAG for USE_NSS_CERTS
https://chromium-review.googlesource.com/c/chromium/src/+/3379123
* defined(OS_*) ==> BUILDFLAG(IS_*)
https://bugs.chromium.org/p/chromium/issues/detail?id=1234043
* fixup! 3404768: Remove ALLOW_UNUSED macros
* another attempt to fix windows build
* temporarily disable the custom scheme service worker test
https://github.com/electron/electron/issues/32664
* fix loading mv3 extensions
not sure what cl broke this unfort.
* fixup! 3404768: Remove ALLOW_UNUSED macros
* patch nan
https://chromium-review.googlesource.com/c/v8/v8/+/3395880
* fix node test
* fix nullptr in FindPdfFrame
* patch perfetto to fix build issue on win-ia32
bc44c3c753
* fix build for linux-x64-testing-no-run-as-node
* fix patch
* skip <webview>.capturePage() test
https://github.com/electron/electron/issues/32705
* test: fix failing tests of focus/blur events of WebContents (#32711)
* inherit stdio from app module test child processes
this prevents them from timing out due to full stdout buffers
* test to see if we can get better logs on windows ci
* try again for appveyor log things
* skip contentTracing tests on ia32
* ci: disable gpu compositing
* drop applied patch
* fix merge fail
* Revert "ci: disable gpu compositing"
This reverts commit 0344129fcb19ea3e87e06c1110d751f22eba3fec.
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: John Kleinschmidt <jkleinsc@github.com>
Co-authored-by: VerteDinde <khammond@slack-corp.com>
Co-authored-by: VerteDinde <vertedinde@electronjs.org>
Co-authored-by: Jeremy Rose <jeremya@chromium.org>
Co-authored-by: Jeremy Rose <nornagon@nornagon.net>
Co-authored-by: Cheng Zhao <zcbenz@gmail.com>
Co-authored-by: deepak1556 <hop2deep@gmail.com>
220 lines
6 KiB
C++
220 lines
6 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;
|
|
}
|
|
|
|
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,
|
|
blink::DragOperationsMask allowed_ops,
|
|
const gfx::ImageSkia& image,
|
|
const gfx::Vector2d& image_offset,
|
|
const blink::mojom::DragEventSourceInfo& event_info,
|
|
content::RenderWidgetHostImpl* source_rwh) {
|
|
if (web_contents_)
|
|
static_cast<content::WebContentsImpl*>(web_contents_)
|
|
->SystemDragEnded(source_rwh);
|
|
}
|
|
|
|
void OffScreenWebContentsView::UpdateDragCursor(
|
|
ui::mojom::DragOperation operation) {}
|
|
|
|
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;
|
|
}
|
|
|
|
} // namespace electron
|