From e38127323fd55382e7433fe0934f0d9a01d72f32 Mon Sep 17 00:00:00 2001 From: Nitish Sakhawalkar Date: Fri, 17 May 2019 11:07:02 -0700 Subject: [PATCH] Update gpuinfo enumerator api Related chromium change is here => https://chromium.googlesource.com/chromium/src/+/4178e190e9da409b055e5dff469911ec6f6b716f --- atom/browser/api/gpu_info_enumerator.cc | 12 ------------ atom/browser/api/gpu_info_enumerator.h | 3 --- docs/api/app.md | 2 +- 3 files changed, 1 insertion(+), 16 deletions(-) diff --git a/atom/browser/api/gpu_info_enumerator.cc b/atom/browser/api/gpu_info_enumerator.cc index ab5ba41d25dd..044af0e0ea25 100644 --- a/atom/browser/api/gpu_info_enumerator.cc +++ b/atom/browser/api/gpu_info_enumerator.cc @@ -108,18 +108,6 @@ void GPUInfoEnumerator::EndAuxAttributes() { value_stack.pop(); } -void GPUInfoEnumerator::BeginOverlayCapability() { - value_stack.push(std::move(current)); - current = std::make_unique(); -} - -void GPUInfoEnumerator::EndOverlayCapability() { - auto& top_value = value_stack.top(); - top_value->SetDictionary(kOverlayCapabilityKey, std::move(current)); - current = std::move(top_value); - value_stack.pop(); -} - void GPUInfoEnumerator::BeginDx12VulkanVersionInfo() { value_stack.push(std::move(current)); current = std::make_unique(); diff --git a/atom/browser/api/gpu_info_enumerator.h b/atom/browser/api/gpu_info_enumerator.h index 645815a2d0c7..6f842abd7c2c 100644 --- a/atom/browser/api/gpu_info_enumerator.h +++ b/atom/browser/api/gpu_info_enumerator.h @@ -25,7 +25,6 @@ class GPUInfoEnumerator final : public gpu::GPUInfo::Enumerator { const char* kImageDecodeAcceleratorSupportedProfileKey = "imageDecodeAcceleratorSupportedProfile"; const char* kAuxAttributesKey = "auxAttributes"; - const char* kOverlayCapabilityKey = "overlayCapability"; const char* kDx12VulkanVersionInfoKey = "dx12VulkanVersionInfo"; public: @@ -47,8 +46,6 @@ class GPUInfoEnumerator final : public gpu::GPUInfo::Enumerator { void EndImageDecodeAcceleratorSupportedProfile() override; void BeginAuxAttributes() override; void EndAuxAttributes() override; - void BeginOverlayCapability() override; - void EndOverlayCapability() override; void BeginDx12VulkanVersionInfo() override; void EndDx12VulkanVersionInfo() override; std::unique_ptr GetDictionary(); diff --git a/docs/api/app.md b/docs/api/app.md index 1dde0dde1dec..4e8332efa9fb 100644 --- a/docs/api/app.md +++ b/docs/api/app.md @@ -1019,7 +1019,7 @@ Returns [`GPUFeatureStatus`](structures/gpu-feature-status.md) - The Graphics Fe Returns `Promise` For `infoType` equal to `complete`: - Promise is fulfilled with `Object` containing all the GPU Information as in [chromium's GPUInfo object](https://chromium.googlesource.com/chromium/src.git/+/69.0.3497.106/gpu/config/gpu_info.cc). This includes the version and driver information that's shown on `chrome://gpu` page. + Promise is fulfilled with `Object` containing all the GPU Information as in [chromium's GPUInfo object](https://chromium.googlesource.com/chromium/src/+/4178e190e9da409b055e5dff469911ec6f6b716f/gpu/config/gpu_info.cc). This includes the version and driver information that's shown on `chrome://gpu` page. For `infoType` equal to `basic`: Promise is fulfilled with `Object` containing fewer attributes than when requested with `complete`. Here's an example of basic response: