d02c9f8bc6
* chore: bump chromium in DEPS to 111.0.5522.0 * chore: bump chromium in DEPS to 111.0.5524.0 * chore: bump chromium in DEPS to 111.0.5526.0 * chore: bump chromium in DEPS to 111.0.5528.0 * chore: update patches/chromium/mas_avoid_usage_of_private_macos_apis.patch Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4132807 Fix simple code shear * chore: update patches/chromium/unsandboxed_ppapi_processes_skip_zygote.patch Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4130675 Fix simple code shear * chore: update patches/chromium/hack_plugin_response_interceptor_to_point_to_electron.patch Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4144281 Fix simple code shear; applied cleanly w/patch-fuzz * chore: update patches/chromium/disable_unload_metrics.patch Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4126173 Fix simple code shear; applied cleanly w/patch-fuzz * chore: update patches/chromium/feat_add_data_parameter_to_processsingleton.patch Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4144281 Fix simple code shear; applied cleanly w/patch-fuzz * chore: update patches/chromium/preconnect_manager.patch https://chromium-review.googlesource.com/c/chromium/src/+/4144281 Fix simple code shear; applied cleanly w/patch-fuzz * chore: update patches/v8/force_cppheapcreateparams_to_be_noncopyable.patch https://chromium-review.googlesource.com/c/v8/v8/+/3533019 Fix simple code shear; applied cleanly w/patch-fuzz * chore: update patches * chore: update patches/chromium/add_maximized_parameter_to_linuxui_getwindowframeprovider.patch Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4128765 Upstream added a new call to HeaderContext(), whose signature we have patched * chore: bump chromium in DEPS to 111.0.5530.0 * chore: update patches * Move ChildProcessHost* from content/common to content/browser Xref: Move ChildProcessHost* from content/common to content/browser * Remove RenderViewHostChanged Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4134103 [upstream removal of RenderViewHostChanged] Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4092763 Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4093234 Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4133892 Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4134103 [examples of upstream code adjusting to the change] Upstream handles this change in roughly two approaches: 1. Move the code over to RenderFrameHostChanged(old_host, new_host) but test for new_host->IsInPrimaryMainFrame() before acting 2. Migrate to the PrimaryPageChanged(page) API and use page.GetMainDocument() to get the RenderFrameHost. I've chosen 1. because electron_api_web_contents needed that pointer to old_host to call RemoveInputEventListener(), but I may be missing some context & would appreciate review on this commit. * Make electron/shell/browser/relauncher_win.cc use <winternl.h> Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4129135 Many internal Windows types are now available in winternl.h so upstrem no longer defines the types themselves. * Move ChildProcessHost* from content/common to content/browser Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4134795 * fixup! Make electron/shell/browser/relauncher_win.cc use <winternl.h> winternl.h does not define the field we need, so clone the struct Chromium was using into unnamed namespace * fixup! Move ChildProcessHost* from content/common to content/browser chore: update #includes too * chore: bump chromium in DEPS to 111.0.5532.0 * chore: sync patches/chromium/pepper_plugin_support.patch Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4133323 manually reync patch; no code changes * chore: sync patches/chromium/mas_no_private_api.patch Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4143865 the content/common/pseudonymization_salt.cc patch is no longer needed * chore: sync patches/chromium/mas_disable_remote_accessibility.patch patch-fuzz update; no manual changes * chore: sync patches/chromium/build_do_not_depend_on_packed_resource_integrity.patch Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4111725 manually reync patch; no code changes * chore: sync patches/chromium/create_browser_v8_snapshot_file_name_fuse.patch Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4133323 manually reync patch; no code changes * chore: sync patches/v8/fix_build_deprecated_attribute_for_older_msvc_versions.patch Xref: https://chromium-review.googlesource.com/c/v8/v8/+/4127230 patch-fuzz update; no manual changes * chore: rebuild patches * fixup! Remove RenderViewHostChanged Use PrimaryPageChanged() * chore: remove unused method TabsUpdateFunction::OnExecuteCodeFinished() Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4133991 This private, already-unused function showed up as a FTBFS because it took a base::ListValue parameter and ListValue was removed upstream. * task posting v3: remove includes of runner handles and IWYU task runners Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4133323 * chore: lint * chore: more lint * fixup! task posting v3: remove includes of runner handles and IWYU task runners macOS, too * fixup! task posting v3: remove includes of runner handles and IWYU task runners * chore: bump chromium in DEPS to 111.0.5534.0 * chore: sync patches/chromium/allow_new_privileges_in_unsandboxed_child_processes.patch Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4141862 patch-fuzz update; no manual changes * chore: sync patches/chromium/logging_win32_only_create_a_console_if_logging_to_stderr.patch Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4153110 Sync to minor upstream changes. Add const correctness. * chore: sync electron/patches/chromium/feat_configure_launch_options_for_service_process.patch https://chromium-review.googlesource.com/c/chromium/src/+/4141862 patch-fuzz update; no manual changes * chore: patches/v8/fix_build_deprecated_attribute_for_older_msvc_versions.patch sync https://chromium-review.googlesource.com/c/v8/v8/+/4147787 patch-fuzz update; no manual changes * chore: update patches * chore: bump chromium in DEPS to 111.0.5536.0 * chore: sync patches/chromium/allow_new_privileges_in_unsandboxed_child_processes.patch Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4141863 Sync with upstream code changes. Minor code golf for readability. Note: upstream is laying groundwork for being able to work off of env vars instead of switches. Doesn't affect us yet but worth being aware of. > + // Environment variables could be supported in the future, but are not > + // currently supported when launching with the zygote. * chore: update patches/chromium/feat_expose_raw_response_headers_from_urlloader.patch Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4126836 patch-fuzz update; no manual changes * chore: sync electron/patches/chromium/feat_configure_launch_options_for_service_process.patch Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4141863 manual sync * chore: sync electron/patches/v8/fix_build_deprecated_attribute_for_older_msvc_versions.patch https://chromium-review.googlesource.com/c/v8/v8/+/4147788 fuzz-patch * chore: rebuild patches * chore: bump chromium in DEPS to 111.0.5538.0 * chore: bump chromium in DEPS to 111.0.5540.0 * chore: update patches * Remove sdk_forward_declarations https://chromium-review.googlesource.com/c/chromium/src/+/4166680 * task posting v3: Remove task runner handles from codebase entirely Refs https://chromium-review.googlesource.com/c/chromium/src/+/4150928 * Cleanup child_process_launcher_helper* Refs https://chromium-review.googlesource.com/c/chromium/src/+/4141863 * fix: utilityprocess spec on macOS * fix: build on windows Refs https://chromium-review.googlesource.com/c/chromium/src/+/4141863 * chore: fix lint * chore: bump chromium 111.0.5544.3 * chore: gen filenames.libcxx.gni * Add check for Executable+Writable handles in renderer processes. Refs https://chromium-review.googlesource.com/c/chromium/src/+/3774416 * fixup! Add check for Executable+Writable handles in renderer processes. * 4143761: [110] Disable SwiftShader for WebGL on M1 Macs. https://chromium-review.googlesource.com/c/chromium/src/+/4143761 (cherry picked from commit 2f74db3c2139424c416f92d9169aeaa8a2f9c1ec) * chore: bump chromium to 111.0.5555.0 * 56085: Remove hmac.h include from ssl.h. https://boringssl-review.googlesource.com/c/boringssl/+/56085 * 4167020: Remove forwarding headers https://chromium-review.googlesource.com/c/chromium/src/+/4167020 * chore: bump chromium to 111.0.5559.0 * 4181044: Restrict WebCursor usage to RenderWidgetHostViewAura https://chromium-review.googlesource.com/c/chromium/src/+/4181044 * 4189437: views: rename ink_drop_host_view to ink_drop_host https://chromium-review.googlesource.com/c/chromium/src/+/4189437 * chore: bump chromium to 111.0.5560.0 * 4167016: win7dep: remove non aeroglass code https://chromium-review.googlesource.com/c/chromium/src/+/4167016 * fixup after rebase: Remove forwarding header s https://chromium-review.googlesource.com/c/chromium/src/+/4167020 * 4125755: Reland "Reject getDisplayMedia calls without user activation" https://chromium-review.googlesource.com/c/chromium/src/+/4125755 * test: add workaround * chore: update patches * fix: alter coreModuleRegExp to prevent arm crash * Revert "fix: alter coreModuleRegExp to prevent arm crash" This reverts commit 7e50630c98137831a711c5abdbc8809e60cf1d73. * 4218354: Disable the use of preserve_most on arm64 Windows https://chromium-review.googlesource.com/c/v8/v8/+/4218354 * chore: review changes --------- Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: Charles Kerr <charles@charleskerr.com> Co-authored-by: PatchUp <73610968+patchup[bot]@users.noreply.github.com> Co-authored-by: deepak1556 <hop2deep@gmail.com> Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org> Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com>
181 lines
6.2 KiB
C++
181 lines
6.2 KiB
C++
// Copyright (c) 2015 GitHub, Inc.
|
|
// Use of this source code is governed by the MIT license that can be
|
|
// found in the LICENSE file.
|
|
|
|
#include "shell/browser/api/frame_subscriber.h"
|
|
|
|
#include <utility>
|
|
|
|
#include "content/public/browser/render_view_host.h"
|
|
#include "content/public/browser/render_widget_host.h"
|
|
#include "content/public/browser/render_widget_host_view.h"
|
|
#include "media/capture/mojom/video_capture_buffer.mojom.h"
|
|
#include "media/capture/mojom/video_capture_types.mojom.h"
|
|
#include "mojo/public/cpp/bindings/remote.h"
|
|
#include "services/viz/privileged/mojom/compositing/frame_sink_video_capture.mojom-shared.h"
|
|
#include "ui/gfx/geometry/size_conversions.h"
|
|
#include "ui/gfx/image/image.h"
|
|
#include "ui/gfx/skbitmap_operations.h"
|
|
|
|
namespace electron::api {
|
|
|
|
constexpr static int kMaxFrameRate = 30;
|
|
|
|
FrameSubscriber::FrameSubscriber(content::WebContents* web_contents,
|
|
const FrameCaptureCallback& callback,
|
|
bool only_dirty)
|
|
: content::WebContentsObserver(web_contents),
|
|
callback_(callback),
|
|
only_dirty_(only_dirty) {
|
|
AttachToHost(web_contents->GetPrimaryMainFrame()->GetRenderWidgetHost());
|
|
}
|
|
|
|
FrameSubscriber::~FrameSubscriber() = default;
|
|
|
|
void FrameSubscriber::AttachToHost(content::RenderWidgetHost* host) {
|
|
host_ = host;
|
|
|
|
// The view can be null if the renderer process has crashed.
|
|
// (https://crbug.com/847363)
|
|
if (!host_->GetView())
|
|
return;
|
|
|
|
// Create and configure the video capturer.
|
|
gfx::Size size = GetRenderViewSize();
|
|
video_capturer_ = host_->GetView()->CreateVideoCapturer();
|
|
video_capturer_->SetResolutionConstraints(size, size, true);
|
|
video_capturer_->SetAutoThrottlingEnabled(false);
|
|
video_capturer_->SetMinSizeChangePeriod(base::TimeDelta());
|
|
video_capturer_->SetFormat(media::PIXEL_FORMAT_ARGB);
|
|
video_capturer_->SetMinCapturePeriod(base::Seconds(1) / kMaxFrameRate);
|
|
video_capturer_->Start(this, viz::mojom::BufferFormatPreference::kDefault);
|
|
}
|
|
|
|
void FrameSubscriber::DetachFromHost() {
|
|
if (!host_)
|
|
return;
|
|
video_capturer_.reset();
|
|
host_ = nullptr;
|
|
}
|
|
|
|
void FrameSubscriber::RenderFrameCreated(
|
|
content::RenderFrameHost* render_frame_host) {
|
|
if (!host_)
|
|
AttachToHost(render_frame_host->GetRenderWidgetHost());
|
|
}
|
|
|
|
void FrameSubscriber::RenderViewDeleted(content::RenderViewHost* host) {
|
|
if (host->GetWidget() == host_) {
|
|
DetachFromHost();
|
|
}
|
|
}
|
|
|
|
void FrameSubscriber::PrimaryPageChanged(content::Page& page) {
|
|
if (auto* host = page.GetMainDocument().GetMainFrame()->GetRenderWidgetHost();
|
|
host_ != host) {
|
|
DetachFromHost();
|
|
AttachToHost(host);
|
|
}
|
|
}
|
|
|
|
void FrameSubscriber::OnFrameCaptured(
|
|
::media::mojom::VideoBufferHandlePtr data,
|
|
::media::mojom::VideoFrameInfoPtr info,
|
|
const gfx::Rect& content_rect,
|
|
mojo::PendingRemote<viz::mojom::FrameSinkVideoConsumerFrameCallbacks>
|
|
callbacks) {
|
|
auto& data_region = data->get_read_only_shmem_region();
|
|
|
|
gfx::Size size = GetRenderViewSize();
|
|
if (size != content_rect.size()) {
|
|
video_capturer_->SetResolutionConstraints(size, size, true);
|
|
video_capturer_->RequestRefreshFrame();
|
|
return;
|
|
}
|
|
|
|
mojo::Remote<viz::mojom::FrameSinkVideoConsumerFrameCallbacks>
|
|
callbacks_remote(std::move(callbacks));
|
|
if (!data_region.IsValid()) {
|
|
callbacks_remote->Done();
|
|
return;
|
|
}
|
|
base::ReadOnlySharedMemoryMapping mapping = data_region.Map();
|
|
if (!mapping.IsValid()) {
|
|
DLOG(ERROR) << "Shared memory mapping failed.";
|
|
return;
|
|
}
|
|
if (mapping.size() <
|
|
media::VideoFrame::AllocationSize(info->pixel_format, info->coded_size)) {
|
|
DLOG(ERROR) << "Shared memory size was less than expected.";
|
|
return;
|
|
}
|
|
|
|
// The SkBitmap's pixels will be marked as immutable, but the installPixels()
|
|
// API requires a non-const pointer. So, cast away the const.
|
|
void* const pixels = const_cast<void*>(mapping.memory());
|
|
|
|
// Call installPixels() with a |releaseProc| that: 1) notifies the capturer
|
|
// that this consumer has finished with the frame, and 2) releases the shared
|
|
// memory mapping.
|
|
struct FramePinner {
|
|
// Keeps the shared memory that backs |frame_| mapped.
|
|
base::ReadOnlySharedMemoryMapping mapping;
|
|
// Prevents FrameSinkVideoCapturer from recycling the shared memory that
|
|
// backs |frame_|.
|
|
mojo::Remote<viz::mojom::FrameSinkVideoConsumerFrameCallbacks> releaser;
|
|
};
|
|
|
|
SkBitmap bitmap;
|
|
bitmap.installPixels(
|
|
SkImageInfo::MakeN32(content_rect.width(), content_rect.height(),
|
|
kPremul_SkAlphaType),
|
|
pixels,
|
|
media::VideoFrame::RowBytes(media::VideoFrame::kARGBPlane,
|
|
info->pixel_format, info->coded_size.width()),
|
|
[](void* addr, void* context) {
|
|
delete static_cast<FramePinner*>(context);
|
|
},
|
|
new FramePinner{std::move(mapping), std::move(callbacks_remote)});
|
|
bitmap.setImmutable();
|
|
|
|
Done(content_rect, bitmap);
|
|
}
|
|
|
|
void FrameSubscriber::OnNewCropVersion(uint32_t crop_version) {}
|
|
|
|
void FrameSubscriber::OnFrameWithEmptyRegionCapture() {}
|
|
|
|
void FrameSubscriber::OnStopped() {}
|
|
|
|
void FrameSubscriber::OnLog(const std::string& message) {}
|
|
|
|
void FrameSubscriber::Done(const gfx::Rect& damage, const SkBitmap& frame) {
|
|
if (frame.drawsNothing())
|
|
return;
|
|
|
|
const SkBitmap& bitmap = only_dirty_ ? SkBitmapOperations::CreateTiledBitmap(
|
|
frame, damage.x(), damage.y(),
|
|
damage.width(), damage.height())
|
|
: frame;
|
|
|
|
// Copying SkBitmap does not copy the internal pixels, we have to manually
|
|
// allocate and write pixels otherwise crash may happen when the original
|
|
// frame is modified.
|
|
SkBitmap copy;
|
|
copy.allocPixels(SkImageInfo::Make(bitmap.width(), bitmap.height(),
|
|
kN32_SkColorType, kPremul_SkAlphaType));
|
|
SkPixmap pixmap;
|
|
bool success = bitmap.peekPixels(&pixmap) && copy.writePixels(pixmap, 0, 0);
|
|
CHECK(success);
|
|
|
|
callback_.Run(gfx::Image::CreateFrom1xBitmap(copy), damage);
|
|
}
|
|
|
|
gfx::Size FrameSubscriber::GetRenderViewSize() const {
|
|
content::RenderWidgetHostView* view = host_->GetView();
|
|
gfx::Size size = view->GetViewBounds().size();
|
|
return gfx::ToRoundedSize(
|
|
gfx::ScaleSize(gfx::SizeF(size), view->GetDeviceScaleFactor()));
|
|
}
|
|
|
|
} // namespace electron::api
|