![electron-roller[bot]](/assets/img/avatar_default.png)
* chore: bump chromium in DEPS to 139.0.7205.0 * 6543986: Mac: decouple deserializing and applying sandbox policy Refs6543986
* 6580079: Reland 'Remove the third-party blocking feature' Refs6580079
* 6505716: guest-contents: Add components/guest_contents Refs6505716
* 6572556: Move LogMessageManager out of gpu_service_impl.cc. Refs6572556
* 6566111: Change UtilityProcessHost to manage its instance internally Refs6566111
* 6550237: Rename ReconnectEventObserver to ConnectionChangeObserverClient Refs6550237
* 6565918: Validate path is valid UTF8 in SelectFileDialogLinuxPortal Refs6565918
* 6579713: Remove base::NotFatalUntil::M130 usage 6566111: Change UtilityProcessHost to manage its instance internally Refs6579713
6566111
* chore: update chromium patches * chore: update remaining patches * fixup! 6566111: Change UtilityProcessHost to manage its instance internally Refs6566111
* 6577970: Remove superfluous includes for base/strings/stringprintf.h in headers Refs6577970
* 6568811: Add FunctionCall structured metrics event for DevTools Refs6568811
* [PDF Ink Signatures] Support PdfAnnotationsEnabled policy6558970
* build: disable libcxx modules for rbe * chore: bump chromium in DEPS to 139.0.7217.0 * chore: bump chromium in DEPS to 139.0.7218.0 * chore: update patches fix_use_delegated_generic_capturer_when_available.patch was updated to handle a small change: 6582142: Use content::Create*Capturer in DesktopCaptureDevice. |6582142
* chore: bump chromium in DEPS to 139.0.7219.0 * chore: update patches * 6594615: Change Chromium's deployment target to macOS 126594615
Updated the assertion message to match the docs structure now too. I removed the callout to the supported versions doc because it has moved and doesn't contain minimum platform version information. * 6606232: [views] Remove DesktopWindowTreeHostWin::window_enlargement_6606232
|NativeWindow::GetContentMinimumSize| and |NativeWindow::GetContentMaximumSize| may be good opportunities for a refactor now. * add squirrel.mac patch for removed function This was triggered by the macOS 12.0 deployment upgrade change. See: https://developer.apple.com/documentation/coreservices/1444079-uttypeconformsto?language=objc * 6582142: Use content::Create*Capturer in DesktopCaptureDevice.6582142
* 6579732: Two minor API "quality of life" cleanups in OSCrypt Async6579732
* chore: add include for base::SingleThreadTaskRunner Not sure what change caused this, I expect it would be a removed include somewhere else, but it's likely not important to track down. * chore: update libcxx filenames * chore: update CI build-tools commit target for macOS SDK 15.4 The following change uses an API that was added in the macOS 15.4 SDK. Support for that SDK version was added later than the current build-tools commit target. 6575804: Use a quick-and-dirty solution to avoid glitching with paste-and-go |6575804
See: https://developer.apple.com/documentation/appkit/nspasteboard/accessbehavior-swift.enum?language=objc * fixup! 6606232: [views] Remove DesktopWindowTreeHostWin::window_enlargement_6606232
* chore: bump chromium in DEPS to 139.0.7220.0 * chore: update patches Minor changes due to: 6613978: pwa: let events fall through in the transparent area of TopContainerView |6613978
6614778: Refactor auto pip tab observer for Android support |6614778
* 6543986: Mac: decouple deserializing and applying sandbox policy6543986
The DecodeVarInt and DecodeString functions look benign from a MAS perspective. I suspect they were patched out to avoid "unused function" errors. Their complements for encoding are unpatched, supporting this idea. The code that uses these functions was refactored out of the section that we patch out. Instead of patching out that new function, I decided to treat it the same as the serialization function that is unpatched. * chore: bump chromium in DEPS to 139.0.7222.0 * chore: bump chromium in DEPS to 139.0.7224.0 * chore: bump chromium in DEPS to 139.0.7226.0 * chore: bump chromium in DEPS to 139.0.7228.0 * chore: update patches * Don't use static variable for UseExternalPopupMenus6534657
* Reland "Roll libc++ from a01c02c9d4ac to a9cc573e7c596607589
* chore: bump chromium in DEPS to 139.0.7219.0 * chore: update patches * revert Don't use static variable for UseExternalPopupMenus * tls: remove deprecated tls.createSecurePair and SecurePair https://github.com/nodejs/node/pull/57361 * Revert "Reland "Roll libc++ from a01c02c9d4ac to a9cc573e7c59" This reverts commit 33e1436a0c598ffa8cd308d08de481ed9cd22168. * test: cleanup api-desktop-capturer-spec.ts * test: more cleanup of api-desktop-capturer-spec.ts * chore: debug dcheck error in webrtc on linux * fixup patch * add debugging to desktop capturer spec * test: fixup api-desktop-capturer-spec.ts for linux * chore: remove debugging patch * Revert "fixup! 6606232: [views] Remove DesktopWindowTreeHostWin::window_enlargement_6606232
" This reverts commit 32e75651c14512572d322e819c98ab1469663bb6. * Revert "6606232: [views] Remove DesktopWindowTreeHostWin::window_enlargement_" This reverts commit 89c51aa1c7771fd7f1d634486bc77f493f1d2ea9. * [views] Remove DesktopWindowTreeHostWin::window_enlargement_6606232
Reverting as we need this functionality for now. * fixup: remove patch that was accidentally added back --------- Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: Samuel Maddock <smaddock@slack-corp.com> Co-authored-by: deepak1556 <hop2deep@gmail.com> Co-authored-by: clavin <clavin@electronjs.org> Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org>
283 lines
12 KiB
C++
283 lines
12 KiB
C++
// Copyright (c) 2012 The Chromium Authors. All rights reserved.
|
|
// Copyright (c) 2013 Adam Roben <adam@roben.org>. All rights reserved.
|
|
// Use of this source code is governed by a BSD-style license that can be
|
|
// found in the LICENSE-CHROMIUM file.
|
|
|
|
#ifndef ELECTRON_SHELL_BROWSER_UI_INSPECTABLE_WEB_CONTENTS_H_
|
|
#define ELECTRON_SHELL_BROWSER_UI_INSPECTABLE_WEB_CONTENTS_H_
|
|
|
|
#include <memory>
|
|
#include <string>
|
|
|
|
#include "base/containers/flat_map.h"
|
|
#include "base/containers/flat_set.h"
|
|
#include "base/containers/span.h"
|
|
#include "base/containers/unique_ptr_adapters.h"
|
|
#include "base/memory/raw_ptr.h"
|
|
#include "base/memory/weak_ptr.h"
|
|
#include "base/sequence_checker.h"
|
|
#include "chrome/browser/devtools/devtools_embedder_message_dispatcher.h"
|
|
#include "content/public/browser/devtools_agent_host.h"
|
|
#include "content/public/browser/devtools_frontend_host.h"
|
|
#include "content/public/browser/web_contents_delegate.h"
|
|
#include "content/public/browser/web_contents_observer.h"
|
|
#include "electron/buildflags/buildflags.h"
|
|
#include "ui/gfx/geometry/rect.h"
|
|
|
|
class PrefService;
|
|
class PrefRegistrySimple;
|
|
struct RegisterOptions;
|
|
|
|
namespace electron {
|
|
|
|
class InspectableWebContentsDelegate;
|
|
class InspectableWebContentsView;
|
|
|
|
class InspectableWebContents
|
|
: public content::DevToolsAgentHostClient,
|
|
private content::WebContentsObserver,
|
|
public content::WebContentsDelegate,
|
|
public DevToolsEmbedderMessageDispatcher::Delegate {
|
|
public:
|
|
static void RegisterPrefs(PrefRegistrySimple* pref_registry);
|
|
|
|
InspectableWebContents(std::unique_ptr<content::WebContents> web_contents,
|
|
PrefService* pref_service,
|
|
bool is_guest);
|
|
~InspectableWebContents() override;
|
|
|
|
// disable copy
|
|
InspectableWebContents(const InspectableWebContents&) = delete;
|
|
InspectableWebContents& operator=(const InspectableWebContents&) = delete;
|
|
|
|
InspectableWebContentsView* GetView() const;
|
|
content::WebContents* GetWebContents() const;
|
|
content::WebContents* GetDevToolsWebContents() const;
|
|
|
|
void SetDelegate(InspectableWebContentsDelegate* delegate);
|
|
InspectableWebContentsDelegate* GetDelegate() const;
|
|
[[nodiscard]] bool is_guest() const { return is_guest_; }
|
|
void ReleaseWebContents();
|
|
void SetDevToolsWebContents(content::WebContents* devtools);
|
|
void SetDockState(const std::string& state);
|
|
void SetDevToolsTitle(const std::u16string& title);
|
|
void ShowDevTools(bool activate);
|
|
void CloseDevTools();
|
|
bool IsDevToolsViewShowing();
|
|
std::u16string GetDevToolsTitle();
|
|
void AttachTo(scoped_refptr<content::DevToolsAgentHost>);
|
|
void Detach();
|
|
void CallClientFunction(
|
|
const std::string& object_name,
|
|
const std::string& method_name,
|
|
const base::Value arg1 = {},
|
|
const base::Value arg2 = {},
|
|
const base::Value arg3 = {},
|
|
base::OnceCallback<void(base::Value)> cb = base::NullCallback());
|
|
void InspectElement(int x, int y);
|
|
|
|
// Return the last position and size of devtools window.
|
|
[[nodiscard]] const gfx::Rect& dev_tools_bounds() const {
|
|
return devtools_bounds_;
|
|
}
|
|
void SaveDevToolsBounds(const gfx::Rect& bounds);
|
|
|
|
// Return the last set zoom level of devtools window.
|
|
double GetDevToolsZoomLevel() const;
|
|
void UpdateDevToolsZoomLevel(double level);
|
|
|
|
private:
|
|
// DevToolsEmbedderMessageDispatcher::Delegate
|
|
void ActivateWindow() override;
|
|
void CloseWindow() override;
|
|
void LoadCompleted() override;
|
|
void SetInspectedPageBounds(const gfx::Rect& rect) override;
|
|
void InspectElementCompleted() override {}
|
|
void InspectedURLChanged(const std::string& url) override;
|
|
void LoadNetworkResource(DispatchCallback callback,
|
|
const std::string& url,
|
|
const std::string& headers,
|
|
int stream_id) override;
|
|
void SetIsDocked(DispatchCallback callback, bool is_docked) override;
|
|
void OpenInNewTab(const std::string& url) override;
|
|
void OpenSearchResultsInNewTab(const std::string& query) override;
|
|
void ShowItemInFolder(const std::string& file_system_path) override;
|
|
void SaveToFile(const std::string& url,
|
|
const std::string& content,
|
|
bool save_as,
|
|
bool is_base64) override;
|
|
void AppendToFile(const std::string& url,
|
|
const std::string& content) override;
|
|
void RequestFileSystems() override;
|
|
void AddFileSystem(const std::string& type) override;
|
|
void RemoveFileSystem(const std::string& file_system_path) override;
|
|
void UpgradeDraggedFileSystemPermissions(
|
|
const std::string& file_system_url) override {}
|
|
void ConnectAutomaticFileSystem(DispatchCallback callback,
|
|
const std::string& file_system_path,
|
|
const std::string& file_system_uuid,
|
|
bool add_if_missing) override {}
|
|
void DisconnectAutomaticFileSystem(
|
|
const std::string& file_system_path) override {}
|
|
void IndexPath(int index_request_id,
|
|
const std::string& file_system_path,
|
|
const std::string& excluded_folders) override;
|
|
void StopIndexing(int index_request_id) override;
|
|
void SearchInPath(int search_request_id,
|
|
const std::string& file_system_path,
|
|
const std::string& query) override;
|
|
void SetWhitelistedShortcuts(const std::string& message) override {}
|
|
void SetEyeDropperActive(bool active) override;
|
|
void ShowCertificateViewer(const std::string& cert_chain) override {}
|
|
void ZoomIn() override;
|
|
void ZoomOut() override;
|
|
void ResetZoom() override;
|
|
void SetDevicesDiscoveryConfig(
|
|
bool discover_usb_devices,
|
|
bool port_forwarding_enabled,
|
|
const std::string& port_forwarding_config,
|
|
bool network_discovery_enabled,
|
|
const std::string& network_discovery_config) override {}
|
|
void SetDevicesUpdatesEnabled(bool enabled) override {}
|
|
void OpenRemotePage(const std::string& browser_id,
|
|
const std::string& url) override {}
|
|
void OpenNodeFrontend() override {}
|
|
void DispatchProtocolMessageFromDevToolsFrontend(
|
|
const std::string& message) override;
|
|
void RecordCountHistogram(const std::string& name,
|
|
int sample,
|
|
int min,
|
|
int exclusive_max,
|
|
int buckets) override {}
|
|
void RegisterPreference(const std::string& name,
|
|
const RegisterOptions& options) override {}
|
|
void GetPreferences(DispatchCallback callback) override;
|
|
void GetPreference(DispatchCallback callback,
|
|
const std::string& name) override;
|
|
void SetPreference(const std::string& name,
|
|
const std::string& value) override;
|
|
void RemovePreference(const std::string& name) override;
|
|
void ClearPreferences() override;
|
|
void GetSyncInformation(DispatchCallback callback) override;
|
|
void GetHostConfig(DispatchCallback callback) override;
|
|
void ConnectionReady() override {}
|
|
void RegisterExtensionsAPI(const std::string& origin,
|
|
const std::string& script) override;
|
|
void Reattach(DispatchCallback callback) override;
|
|
void RecordEnumeratedHistogram(const std::string& name,
|
|
int sample,
|
|
int boundary_value) override {}
|
|
void ReadyForTest() override {}
|
|
void SetOpenNewWindowForPopups(bool value) override {}
|
|
void RecordPerformanceHistogram(const std::string& name,
|
|
double duration) override {}
|
|
void RecordPerformanceHistogramMedium(const std::string& name,
|
|
double duration) override {}
|
|
void RecordUserMetricsAction(const std::string& name) override {}
|
|
void RecordImpression(const ImpressionEvent& event) override {}
|
|
void RecordResize(const ResizeEvent& event) override {}
|
|
void RecordClick(const ClickEvent& event) override {}
|
|
void RecordHover(const HoverEvent& event) override {}
|
|
void RecordDrag(const DragEvent& event) override {}
|
|
void RecordChange(const ChangeEvent& event) override {}
|
|
void RecordKeyDown(const KeyDownEvent& event) override {}
|
|
void RecordSettingAccess(const SettingAccessEvent& event) override {}
|
|
void RecordFunctionCall(const FunctionCallEvent& event) override {}
|
|
void ShowSurvey(DispatchCallback callback,
|
|
const std::string& trigger) override {}
|
|
void CanShowSurvey(DispatchCallback callback,
|
|
const std::string& trigger) override {}
|
|
void DoAidaConversation(DispatchCallback callback,
|
|
const std::string& request,
|
|
int stream_id) override {}
|
|
void RegisterAidaClientEvent(DispatchCallback callback,
|
|
const std::string& request) override {}
|
|
|
|
// content::DevToolsFrontendHostDelegate:
|
|
void HandleMessageFromDevToolsFrontend(base::Value::Dict message);
|
|
|
|
// content::DevToolsAgentHostClient:
|
|
void DispatchProtocolMessage(content::DevToolsAgentHost* agent_host,
|
|
base::span<const uint8_t> message) override;
|
|
void AgentHostClosed(content::DevToolsAgentHost* agent_host) override {}
|
|
|
|
// content::WebContentsObserver:
|
|
void RenderFrameHostChanged(content::RenderFrameHost* old_host,
|
|
content::RenderFrameHost* new_host) override;
|
|
void WebContentsDestroyed() override;
|
|
void OnWebContentsFocused(
|
|
content::RenderWidgetHost* render_widget_host) override;
|
|
void ReadyToCommitNavigation(
|
|
content::NavigationHandle* navigation_handle) override;
|
|
void DidFinishNavigation(
|
|
content::NavigationHandle* navigation_handle) override;
|
|
|
|
// content::WebContentsDelegate:
|
|
bool HandleKeyboardEvent(content::WebContents*,
|
|
const input::NativeWebKeyboardEvent&) 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,
|
|
scoped_refptr<content::FileSelectListener> listener,
|
|
const blink::mojom::FileChooserParams& params) override;
|
|
void EnumerateDirectory(content::WebContents* source,
|
|
scoped_refptr<content::FileSelectListener> listener,
|
|
const base::FilePath& path) override;
|
|
|
|
void SendMessageAck(int request_id, const base::Value* arg1);
|
|
|
|
#if BUILDFLAG(ENABLE_ELECTRON_EXTENSIONS)
|
|
void AddDevToolsExtensionsToClient();
|
|
#endif
|
|
|
|
gfx::Rect devtools_bounds_;
|
|
bool can_dock_ = true;
|
|
std::string dock_state_;
|
|
std::u16string devtools_title_;
|
|
bool activate_ = true;
|
|
|
|
raw_ptr<InspectableWebContentsDelegate> delegate_ =
|
|
nullptr; // weak references.
|
|
|
|
raw_ptr<PrefService> pref_service_; // weak reference.
|
|
|
|
std::unique_ptr<content::WebContents> web_contents_;
|
|
|
|
// The default devtools created by this class when we don't have an external
|
|
// one assigned by SetDevToolsWebContents.
|
|
std::unique_ptr<content::WebContents> managed_devtools_web_contents_;
|
|
// The external devtools assigned by SetDevToolsWebContents.
|
|
raw_ptr<content::WebContents> external_devtools_web_contents_ = nullptr;
|
|
|
|
bool is_guest_;
|
|
std::unique_ptr<InspectableWebContentsView> view_;
|
|
|
|
bool frontend_loaded_ = false;
|
|
scoped_refptr<content::DevToolsAgentHost> agent_host_;
|
|
std::unique_ptr<content::DevToolsFrontendHost> frontend_host_;
|
|
std::unique_ptr<DevToolsEmbedderMessageDispatcher>
|
|
embedder_message_dispatcher_;
|
|
|
|
class NetworkResourceLoader;
|
|
base::flat_set<std::unique_ptr<NetworkResourceLoader>,
|
|
base::UniquePtrComparator>
|
|
loaders_;
|
|
|
|
// origin -> script
|
|
base::flat_map<std::string, std::string> extensions_api_;
|
|
|
|
// Contains the set of synced settings.
|
|
// The DevTools frontend *must* call `Register` for each setting prior to
|
|
// use, which guarantees that this set must not be persisted.
|
|
base::flat_set<std::string> synced_setting_names_;
|
|
|
|
SEQUENCE_CHECKER(sequence_checker_);
|
|
|
|
base::WeakPtrFactory<InspectableWebContents> weak_factory_{this};
|
|
};
|
|
|
|
} // namespace electron
|
|
|
|
#endif // ELECTRON_SHELL_BROWSER_UI_INSPECTABLE_WEB_CONTENTS_H_
|