8a8241163d
* chore: bump chromium in DEPS to 127.0.6526.0 * chore: update network_service_allow_remote_certificate_verification_logic.patch manually apply patch due to minor upstream shear Xref: https://chromium-review.googlesource.com/c/chromium/src/+/5598454 * chore: update fix_move_autopipsettingshelper_behind_branding_buildflag.patch No manual changes; patch applied with fuzz 1 * chore: update refactor_expose_file_system_access_blocklist.patch No manual changes; patch applied with fuzz 2 * chore: update revert_heap_add_checks_position_info.patch No manual changes; patch applied with fuzz 1 * chore: e patches all * chore: bump chromium in DEPS to 127.0.6527.0 * chore: update patches * chore: bump chromium in DEPS to 127.0.6529.0 * chore: bump chromium in DEPS to 127.0.6531.0 * chore: update patches * 5596349: Remove PDF OCR toggle from settings. https://chromium-review.googlesource.com/c/chromium/src/+/5596349 * 5585932: [video-pip] Add minimize button to video picture-in-picture window https://chromium-review.googlesource.com/c/chromium/src/+/5585932 * 5604487: Reland "[api] Deprecate v8::FunctionCallbackInfo::Holder() for real" https://chromium-review.googlesource.com/c/v8/v8/+/5604487 * 5581721: [DEPS] Update clang-format location https://chromium-review.googlesource.com/c/chromium/src/+/5581721 * 5597904: [Windows] Remove ConvertToLongPath from Sandbox Utilities. https://chromium-review.googlesource.com/c/chromium/src/+/5597904 ResolveNTFunctionPtr was removed in this CL. * fix: visibility state specs on macOS Refs https://chromium-review.googlesource.com/c/chromium/src/+/5605407 * Revert "fix: visibility state specs on macOS" This reverts commit 1eee30a33dfafeec86cdd09526a07b01abca2ed6. * temp: disable occlusion checker on macOS * chore: bump chromium in DEPS to 128.0.6535.0 * chore: update patches * [Extensions] Move some scriptings files out of the API directory. Refs https://chromium-review.googlesource.com/c/chromium/src/+/5606682 * fix[node]: do not use soon-to-be-deprecated V8 API * fix: update api_remove_allcan_read_write.patch * chore: update patches * chore: update patches * chore: fix lf mismatch in api_remove_allcan_read_write.patch * chore: update patches * chore: bump chromium in DEPS to 128.0.6538.0 * chore: update v8 patches * chore: update patches * ui/gl/features.gni: Set use_egl=true unconditionally. Refs https://chromium-review.googlesource.com/c/chromium/src/+/5569748 Refs https://issues.chromium.org/issues/344606399 * chore: bump chromium in DEPS to 128.0.6540.0 * chore: bump chromium in DEPS to 128.0.6541.0 * chore: update patches * chore: fix nan read/write patch * chore: bump chromium in DEPS to 128.0.6543.0 * 5626254: Use sandbox_type instead of process_type | https://chromium-review.googlesource.com/c/chromium/src/+/5626254 * chore: update patches * rework nan patches * 5621488: Apply consistent naming conventions to zoom values | https://chromium-review.googlesource.com/c/chromium/src/+/5621488 * chore: bump chromium in DEPS to 128.0.6544.0 * 5605693: Remove files from third_party/ninja | https://chromium-review.googlesource.com/c/chromium/src/+/5605693 * chore: update patches * chore: maybe fix nan patch, part 3 * chore: delete nan patch * chore: re-add nan patch (attempt 2) * chore: add test patch * fixup! add test patch * chore: bump chromium in DEPS to 128.0.6549.0 * chore: bump chromium in DEPS to 128.0.6551.0 * 5637699: Add command line to ASAN Additional Info section | https://chromium-review.googlesource.com/c/chromium/src/+/5637699 * chore: update patches * chore: bump chromium in DEPS to 128.0.6553.0 * chore: bump chromium in DEPS to 128.0.6555.0 * fix: add property query interceptors * chore: bump chromium in DEPS to 128.0.6557.0 * 5583182: Automatic Fullscreen: Prototype Permissions API query support | https://chromium-review.googlesource.com/c/chromium/src/+/5583182 * 5613297: Move render input router and related dependencies to //components/input | https://chromium-review.googlesource.com/c/chromium/src/+/5613297 * chore: update patches * test: skip methodswithdata-test.js nan test * chore: bump chromium in DEPS to 128.0.6558.0 * chore: update patches * build: reference correct ninja cipd ref Ref: https://chromium-review.googlesource.com/c/chromium/src/+/5605693 * update libcxx filenames * refactor: CursorManager moved to //components/input Ref: https://chromium-review.googlesource.com/c/chromium/src/+/5613297 * refactor: spanify mojo Read/WriteData methods Ref: https://chromium-review.googlesource.com/c/chromium/src/+/5619291 * refactor: remove constexpr from KeyboardCodeFromKeyIdentifier Ref: unknown Added TODO to investigate after * chore: update patches * refactor: improve type safety of a11y ids Ref: https://chromium-review.googlesource.com/c/chromium/src/+/5614590 * chore: disable tls node tests that don't apply given boringssl tls configuration Ref: https://boringssl-review.googlesource.com/c/boringssl/+/68487 * chore: add patch to fix nan v8 incompat with NamedPropertyHandlerConfiguration and IndexedPropertyHandlerConfiguration Ref: https://chromium-review.googlesource.com/c/v8/v8/+/5630388 * fix: limit subspan length per feedback * Fix incorrect CalculateInsetsInDIP check * 5645742: Reland "Reland "Add toolchains without PartitionAlloc-Everywhere for dump_syms et al"" https://chromium-review.googlesource.com/c/chromium/src/+/5645742 * chore: more Windows logging * 5617471: Add NPU blocking to chromium blocklist https://chromium-review.googlesource.com/c/chromium/src/+/5617471 --------- 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: John Kleinschmidt <jkleinsc@electronjs.org> Co-authored-by: deepak1556 <hop2deep@gmail.com> Co-authored-by: Keeley Hammond <khammond@slack-corp.com> Co-authored-by: Alice Zhao <alice@makenotion.com> Co-authored-by: Samuel Attard <marshallofsound@electronjs.org> Co-authored-by: VerteDinde <vertedinde@electronjs.org> Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com>
84 lines
2.9 KiB
C++
84 lines
2.9 KiB
C++
// Copyright (c) 2018 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/gpuinfo_manager.h"
|
|
|
|
#include <utility>
|
|
|
|
#include "base/memory/singleton.h"
|
|
#include "base/task/single_thread_task_runner.h"
|
|
#include "content/public/browser/browser_thread.h"
|
|
#include "gpu/config/gpu_info_collector.h"
|
|
#include "shell/browser/api/gpu_info_enumerator.h"
|
|
#include "shell/common/gin_converters/value_converter.h"
|
|
#include "shell/common/thread_restrictions.h"
|
|
|
|
namespace electron {
|
|
|
|
GPUInfoManager* GPUInfoManager::GetInstance() {
|
|
return base::Singleton<GPUInfoManager>::get();
|
|
}
|
|
|
|
GPUInfoManager::GPUInfoManager()
|
|
: gpu_data_manager_(content::GpuDataManagerImpl::GetInstance()) {
|
|
gpu_data_manager_->AddObserver(this);
|
|
}
|
|
|
|
GPUInfoManager::~GPUInfoManager() {
|
|
content::GpuDataManagerImpl::GetInstance()->RemoveObserver(this);
|
|
}
|
|
|
|
// Should be posted to the task runner
|
|
void GPUInfoManager::ProcessCompleteInfo() {
|
|
base::Value::Dict result = EnumerateGPUInfo(gpu_data_manager_->GetGPUInfo());
|
|
// We have received the complete information, resolve all promises that
|
|
// were waiting for this info.
|
|
for (auto& promise : complete_info_promise_set_) {
|
|
promise.Resolve(base::Value(result.Clone()));
|
|
}
|
|
complete_info_promise_set_.clear();
|
|
}
|
|
|
|
void GPUInfoManager::OnGpuInfoUpdate() {
|
|
base::SingleThreadTaskRunner::GetCurrentDefault()->PostTask(
|
|
FROM_HERE, base::BindOnce(&GPUInfoManager::ProcessCompleteInfo,
|
|
base::Unretained(this)));
|
|
}
|
|
|
|
// Should be posted to the task runner
|
|
void GPUInfoManager::CompleteInfoFetcher(
|
|
gin_helper::Promise<base::Value> promise) {
|
|
complete_info_promise_set_.emplace_back(std::move(promise));
|
|
gpu_data_manager_->RequestDx12VulkanVideoGpuInfoIfNeeded(
|
|
content::GpuDataManagerImpl::kGpuInfoRequestAll, /* delayed */ false);
|
|
}
|
|
|
|
void GPUInfoManager::FetchCompleteInfo(
|
|
gin_helper::Promise<base::Value> promise) {
|
|
base::SingleThreadTaskRunner::GetCurrentDefault()->PostTask(
|
|
FROM_HERE, base::BindOnce(&GPUInfoManager::CompleteInfoFetcher,
|
|
base::Unretained(this), std::move(promise)));
|
|
}
|
|
|
|
// This fetches the info synchronously, so no need to post to the task queue.
|
|
// There cannot be multiple promises as they are resolved synchronously.
|
|
void GPUInfoManager::FetchBasicInfo(gin_helper::Promise<base::Value> promise) {
|
|
#if BUILDFLAG(IS_WIN)
|
|
// Needed for CollectNPUInformation in gpu/config/gpu_info_collector_win.cc
|
|
// which calls blocking function base::LoadSystemLibrary.
|
|
electron::ScopedAllowBlockingForElectron allow_blocking;
|
|
#endif
|
|
gpu::GPUInfo gpu_info;
|
|
CollectBasicGraphicsInfo(&gpu_info);
|
|
promise.Resolve(base::Value(EnumerateGPUInfo(gpu_info)));
|
|
}
|
|
|
|
base::Value::Dict GPUInfoManager::EnumerateGPUInfo(
|
|
gpu::GPUInfo gpu_info) const {
|
|
GPUInfoEnumerator enumerator;
|
|
gpu_info.EnumerateFields(&enumerator);
|
|
return enumerator.GetDictionary();
|
|
}
|
|
|
|
} // namespace electron
|