6aece4a83d
* feat: add support for WebHID * Apply suggestions from code review Co-authored-by: Jeremy Rose <jeremya@chromium.org> * Address review feedback * Address review feedback * chore: clear granted_devices on navigation Also added test to verify devices get cleared * fixup testing for device clear * make sure navigator.hid.getDevices is run on correct frame * clear granted devices on RenderFrameHost deletion/change * manage device permissions per RenderFrameHost This change makes sure we don't clear device permission prematurely due to child frame navigation * Update shell/browser/api/electron_api_web_contents.cc Co-authored-by: Jeremy Rose <jeremya@chromium.org> * apply review feedback from @zcbenz * Match upstream ObjectMap This change matches what ObjectPermissionContextBase uses to cache object permissions: https://source.chromium.org/chromium/chromium/src/+/main:components/permissions/object_permission_context_base.h;l=52;drc=8f95b5eab2797a3e26bba299f3b0df85bfc98bf5;bpv=1;bpt=0 The main reason for this was to resolve this crash on Win x64: ok 2 WebContentsView doesn't crash when GCed during allocation Received fatal exception EXCEPTION_ACCESS_VIOLATION Backtrace: gin::WrappableBase::SecondWeakCallback [0x00007FF6F2AFA005+133] (o:\gin\wrappable.cc:53) v8::internal::GlobalHandles::InvokeSecondPassPhantomCallbacks [0x00007FF6F028F9AB+171] (o:\v8\src\handles\global-handles.cc:1400) v8::internal::GlobalHandles::InvokeSecondPassPhantomCallbacksFromTask [0x00007FF6F028F867+391] (o:\v8\src\handles\global-handles.cc:1387) node::PerIsolatePlatformData::RunForegroundTask [0x00007FF6F3B4D065+317] (o:\third_party\electron_node\src\node_platform.cc:415) node::PerIsolatePlatformData::FlushForegroundTasksInternal [0x00007FF6F3B4C424+776] (o:\third_party\electron_node\src\node_platform.cc:479) uv_run [0x00007FF6F2DDD07C+492] (o:\third_party\electron_node\deps\uv\src\win\core.c:609) electron::NodeBindings::UvRunOnce [0x00007FF6EEE1E036+294] (o:\electron\shell\common\node_bindings.cc:631) base::TaskAnnotator::RunTask [0x00007FF6F2318A19+457] (o:\base\task\common\task_annotator.cc:178) base::sequence_manager::internal::ThreadControllerWithMessagePumpImpl::DoWorkImpl [0x00007FF6F2E6F553+963] (o:\base\task\sequence_manager\thread_controller_with_message_pump_impl.cc:361) base::sequence_manager::internal::ThreadControllerWithMessagePumpImpl::DoWork [0x00007FF6F2E6EC69+137] (o:\base\task\sequence_manager\thread_controller_with_message_pump_impl.cc:266) base::MessagePumpForUI::DoRunLoop [0x00007FF6F235AA58+216] (o:\base\message_loop\message_pump_win.cc:221) base::MessagePumpWin::Run [0x00007FF6F235A01A+106] (o:\base\message_loop\message_pump_win.cc:79) base::sequence_manager::internal::ThreadControllerWithMessagePumpImpl::Run [0x00007FF6F2E702DA+682] (o:\base\task\sequence_manager\thread_controller_with_message_pump_impl.cc:470) base::RunLoop::Run [0x00007FF6F22F95BA+842] (o:\base\run_loop.cc:136) content::BrowserMainLoop::RunMainMessageLoop [0x00007FF6F14423CC+208] (o:\content\browser\browser_main_loop.cc:990) content::BrowserMainRunnerImpl::Run [0x00007FF6F144402F+143] (o:\content\browser\browser_main_runner_impl.cc:153) content::BrowserMain [0x00007FF6F143F911+257] (o:\content\browser\browser_main.cc:49) content::RunBrowserProcessMain [0x00007FF6EFFA7D18+112] (o:\content\app\content_main_runner_impl.cc:608) content::ContentMainRunnerImpl::RunBrowser [0x00007FF6EFFA8CF4+1220] (o:\content\app\content_main_runner_impl.cc:1104) content::ContentMainRunnerImpl::Run [0x00007FF6EFFA87C9+393] (o:\content\app\content_main_runner_impl.cc:971) content::RunContentProcess [0x00007FF6EFFA73BD+733] (o:\content\app\content_main.cc:394) content::ContentMain [0x00007FF6EFFA79E1+54] (o:\content\app\content_main.cc:422) wWinMain [0x00007FF6EECA1535+889] (o:\electron\shell\app\electron_main.cc:291) __scrt_common_main_seh [0x00007FF6F6F88482+262] (d:\A01\_work\6\s\src\vctools\crt\vcstartup\src\startup\exe_common.inl:288) BaseThreadInitThunk [0x00007FFEC0087034+20] RtlUserThreadStart [0x00007FFEC1F02651+33] ✗ Electron tests failed with code 0xc0000005. Co-authored-by: Jeremy Rose <jeremya@chromium.org>
84 lines
3.3 KiB
C++
84 lines
3.3 KiB
C++
// Copyright 2019 The Chromium Authors. All rights reserved.
|
|
// Use of this source code is governed by a BSD-style license that can be
|
|
// found in the LICENSE file.
|
|
|
|
#ifndef SHELL_BROWSER_HID_ELECTRON_HID_DELEGATE_H_
|
|
#define SHELL_BROWSER_HID_ELECTRON_HID_DELEGATE_H_
|
|
|
|
#include <memory>
|
|
#include <string>
|
|
#include <unordered_map>
|
|
#include <vector>
|
|
|
|
#include "base/observer_list.h"
|
|
#include "base/scoped_observation.h"
|
|
#include "content/public/browser/hid_delegate.h"
|
|
#include "shell/browser/hid/hid_chooser_context.h"
|
|
|
|
namespace electron {
|
|
|
|
class HidChooserController;
|
|
|
|
class ElectronHidDelegate : public content::HidDelegate,
|
|
public HidChooserContext::DeviceObserver {
|
|
public:
|
|
ElectronHidDelegate();
|
|
ElectronHidDelegate(ElectronHidDelegate&) = delete;
|
|
ElectronHidDelegate& operator=(ElectronHidDelegate&) = delete;
|
|
~ElectronHidDelegate() override;
|
|
|
|
// content::HidDelegate:
|
|
std::unique_ptr<content::HidChooser> RunChooser(
|
|
content::RenderFrameHost* render_frame_host,
|
|
std::vector<blink::mojom::HidDeviceFilterPtr> filters,
|
|
content::HidChooser::Callback callback) override;
|
|
bool CanRequestDevicePermission(
|
|
content::RenderFrameHost* render_frame_host) override;
|
|
bool HasDevicePermission(content::RenderFrameHost* render_frame_host,
|
|
const device::mojom::HidDeviceInfo& device) override;
|
|
device::mojom::HidManager* GetHidManager(
|
|
content::RenderFrameHost* render_frame_host) override;
|
|
void AddObserver(content::RenderFrameHost* render_frame_host,
|
|
content::HidDelegate::Observer* observer) override;
|
|
void RemoveObserver(content::RenderFrameHost* render_frame_host,
|
|
content::HidDelegate::Observer* observer) override;
|
|
const device::mojom::HidDeviceInfo* GetDeviceInfo(
|
|
content::RenderFrameHost* render_frame_host,
|
|
const std::string& guid) override;
|
|
bool IsFidoAllowedForOrigin(const url::Origin& origin) override;
|
|
|
|
// HidChooserContext::DeviceObserver:
|
|
void OnDeviceAdded(const device::mojom::HidDeviceInfo&) override;
|
|
void OnDeviceRemoved(const device::mojom::HidDeviceInfo&) override;
|
|
void OnDeviceChanged(const device::mojom::HidDeviceInfo&) override;
|
|
void OnHidManagerConnectionError() override;
|
|
void OnHidChooserContextShutdown() override;
|
|
|
|
void DeleteControllerForFrame(content::RenderFrameHost* render_frame_host);
|
|
|
|
private:
|
|
HidChooserController* ControllerForFrame(
|
|
content::RenderFrameHost* render_frame_host);
|
|
|
|
HidChooserController* AddControllerForFrame(
|
|
content::RenderFrameHost* render_frame_host,
|
|
std::vector<blink::mojom::HidDeviceFilterPtr> filters,
|
|
content::HidChooser::Callback callback);
|
|
|
|
base::ScopedObservation<HidChooserContext,
|
|
HidChooserContext::DeviceObserver,
|
|
&HidChooserContext::AddDeviceObserver,
|
|
&HidChooserContext::RemoveDeviceObserver>
|
|
device_observation_{this};
|
|
base::ObserverList<content::HidDelegate::Observer> observer_list_;
|
|
|
|
std::unordered_map<content::RenderFrameHost*,
|
|
std::unique_ptr<HidChooserController>>
|
|
controller_map_;
|
|
|
|
base::WeakPtrFactory<ElectronHidDelegate> weak_factory_{this};
|
|
};
|
|
|
|
} // namespace electron
|
|
|
|
#endif // SHELL_BROWSER_HID_ELECTRON_HID_DELEGATE_H_
|