mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

fix: EyeDropper working in devtools (#43700)

Browse source 
Co-authored-by: trop[bot] <37223003+trop[bot]@users.noreply.github.com>
Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com>
This commit is contained in:
trop[bot] 2024-09-12 19:20:34 +02:00 • committed by GitHub
parent 27aea84411
commit 810a6d6ef4
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 11 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
shell/browser/ui/inspectable_web_contents.cc
View file

@ -785,6 +785,7 @@ void InspectableWebContents::SetEyeDropperActive(bool active) {
if (delegate_) if (delegate_)
delegate_->DevToolsSetEyeDropperActive(active); delegate_->DevToolsSetEyeDropperActive(active);
} }
void InspectableWebContents::ZoomIn() { void InspectableWebContents::ZoomIn() {
double new_level = GetNextZoomLevel(GetDevToolsZoomLevel(), false); double new_level = GetNextZoomLevel(GetDevToolsZoomLevel(), false);
SetZoomLevelForWebContents(GetDevToolsWebContents(), new_level); SetZoomLevelForWebContents(GetDevToolsWebContents(), new_level);
@ -966,6 +967,13 @@ void InspectableWebContents::CloseContents(content::WebContents* source) {
CloseDevTools(); CloseDevTools();
} }
std::unique_ptr<content::EyeDropper> InspectableWebContents::OpenEyeDropper(
content::RenderFrameHost* frame,
content::EyeDropperListener* listener) {
auto* delegate = web_contents_->GetDelegate();
return delegate ? delegate->OpenEyeDropper(frame, listener) : nullptr;
}
void InspectableWebContents::RunFileChooser( void InspectableWebContents::RunFileChooser(
content::RenderFrameHost* render_frame_host, content::RenderFrameHost* render_frame_host,
scoped_refptr<content::FileSelectListener> listener, scoped_refptr<content::FileSelectListener> listener,

3
shell/browser/ui/inspectable_web_contents.h
View file

@ -208,6 +208,9 @@ class InspectableWebContents
bool HandleKeyboardEvent(content::WebContents*, bool HandleKeyboardEvent(content::WebContents*,
const input::NativeWebKeyboardEvent&) override; const input::NativeWebKeyboardEvent&) override;
void CloseContents(content::WebContents* source) override; void CloseContents(content::WebContents* source) override;
std::unique_ptr<content::EyeDropper> OpenEyeDropper(
content::RenderFrameHost* frame,
content::EyeDropperListener* listener) override;
void RunFileChooser(content::RenderFrameHost* render_frame_host, void RunFileChooser(content::RenderFrameHost* render_frame_host,
scoped_refptr<content::FileSelectListener> listener, scoped_refptr<content::FileSelectListener> listener,
const blink::mojom::FileChooserParams& params) override; const blink::mojom::FileChooserParams& params) override;