
* chore: bump chromium to 135.0.7049.7 (main) (#45900) chore: bump chromium in DEPS to 135.0.7049.7 (cherry picked from commitbb1c3dff21
) * chore: bump chromium to 136.0.7053.1 (main) (#45906) * chore: bump chromium in DEPS to 136.0.7052.0 * chore: update mas_avoid_private_macos_api_usage.patch.patch6318359
patch applied manually due to context shear * chore: update preconnect_manager.patch Xref:6318420
patch applied manually due to context shear * chore: e patches all * chore: bump chromium to 136.0.7053.1 * chore: update fix_remove_profiles_from_spellcheck_service.patch Xref:6326575
patch applied manually due to context shear * chore: e patches all * chore: revert removal of v8 API used by Node.js * devtools: Remove DevToolsUIBindings::SendJsonRequest() |6326236
* 6244461: Merge //content/common/user_agent.cc into //components/embedder_support:user_agent |6244461
* 6313744: Migrate views::Background factory methods to ColorVariant |6313744
* 6314545: Remove multiple argument support from base::ToString() |6314545
* 6317362: [Extensions] Inline MessagingDelegate::CreateReceiverForTab() |6317362
* 6308998: Add SettingAccess structured metrics event for DevTools |6308998
* 6295214: Remove redundant state field in per-extension preferences |6295214
NB: this change is copied from the upstream change to extensions/shell/browser/shell_extension_loader.cc * fix: ui/ linter error This is showing up in an eslint build step in Electron: > /__w/electron/electron/src/out/Default/gen/ui/webui/resources/cr_elements/preprocessed/cr_menu_selector/cr_menu_selector.ts > 77:23 error This assertion is unnecessary since the receiver accepts the original type of the expression @typescript-eslint/no-unnecessary-type-assertion > > ✖ 1 problem (1 error, 0 warnings) > 1 error and 0 warnings potentially fixable with the `--fix` option. However, removing the assertion causes a typescript build failure: > gen/ui/webui/resources/cr_elements/preprocessed/cr_menu_selector/cr_menu_selector.ts:77:23 - error TS2345: Argument of type 'HTMLElement | null' is not assignable to parameter of type 'HTMLElement'. > Type 'null' is not assignable to type 'HTMLElement'. > > 77 items.indexOf(this.querySelector<HTMLElement>(':focus')); > ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ So I think the two different steps may be picking up typescript definitions. This patch should be removed after the issue is tracked down and fixed in a followup task. * fix: -Wnonnull warning Fixes this warning: > 2025-03-07T01:05:01.8637705Z ../../third_party/electron_node/src/debug_utils.cc(257,12): error: null passed to a callee that requires a non-null argument [-Werror,-Wnonnull] > 2025-03-07T01:05:01.8638267Z 257 | return nullptr; > 2025-03-07T01:05:01.8638481Z | ^~~~~~~ > 2025-03-07T01:05:01.8638700Z 1 error generated. Not sure why this warning was never triggered before; `git blame` indicates this code hasn't changed in ages: > c40a8273ef2 (Michaël Zasso 2024-05-10 09:50:20 +0200 255) #endif // DEBUG > 8e2d33f1562 (Anna Henningsen 2018-06-07 16:54:29 +0200 256) } > 247b5130595 (Refael Ackermann 2018-10-22 15:07:00 -0400 257) return nullptr; > 247b5130595 (Refael Ackermann 2018-10-22 15:07:00 -0400 258) } Presumably this is failing in this Chromium roll due to a clang version bump. We should remove this patch after upstreaming it. * docs: add upstream pr link for Node patch --------- Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: Charles Kerr <charles@charleskerr.com> (cherry picked from commit458b14b8ed
) * chore!: bump chromium to 136.0.7054.0 (main) (#45923) * chore: bump chromium in DEPS to 136.0.7054.0 * chore: update allow_in-process_windows_to_have_different_web_prefs.patch Xref:5906158
patch applied manually due to context shear * chore: e patches all * refactor!: Session.clearStorageData(syncable) Xref:6309405
Remove syncable type from opts.quota in Session.clearStorageData(opts) because it that category has been removed upstream. BREAKING CHANGE: Removed ses.clearDataStorage({ quota: 'syncable' }) * docs: deprecate Session.clearDataStorage({ quota }) --------- Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: Charles Kerr <charles@charleskerr.com> (cherry picked from commit20414f66ca
) * chore: bump chromium to 136.0.7058.1 (main) (#45928) * chore: bump chromium in DEPS to 136.0.7056.0 * chore: update mas_avoid_private_macos_api_usage.patch.patch no manual changes; patch applied with fuzz * chore: update fix_adapt_exclusive_access_for_electron_needs.patch patch applied manually due to context shear 6319958: [FS] Replace GURL with url::Origin for Excluisve Access Bubble |6319958
* chore: update feat_allow_usage_of_sccontentsharingpicker_on_supported_platforms.patch no manual changes; patch applied with fuzz 6311876: Expose captured surface resolution for MacOS |6311876
* chore: e patches all * 6319958: [FS] Replace GURL with url::Origin for Excluisve Access Bubble |6319958
* 6326673: views: Delete the single-parameter Widget::InitParams constructor. |6326673
*6331102
* 6331102: [A11yPerformance] Rename AXMode::kScreenReader to kExtendedProperties |6331102
Sync with shell/browser/ui/webui/accessibility_ui.cc to upstream chrome/browser/accessibility/accessibility_ui.cc changes in 4af8657 * chore: bump Chromium 136.0.7058.1 (#45933) chore: bump chromium in DEPS to 136.0.7058.1 --------- Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: Charles Kerr <charles@charleskerr.com> (cherry picked from commitb0c11371e0
) * chore: bump chromium to 136.0.7062.0 (main) (#45957) * chore: bump chromium in DEPS to 136.0.7059.0 * chore: bump chromium in DEPS to 136.0.7060.0 * chore: bump chromium in DEPS to 136.0.7062.0 --------- Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> (cherry picked from commit2de8fd7d93
) * fixup! chore: bump chromium to 136.0.7053.1 (main) (#45906) chore: fix patch shear * chore: remove cherry-pick-521faebc8a7c.patch fixed upstream @ 521faeb 6334632: Disable setting primtive restart for WebGL in the cmd decoder. |6334632
* chore: remove cherry-pick-9dacf5694dfd.patch fixed upstream @ 9dacf56 6330188: Move WebGL primitive restart state setting to the GPU process. |6330188
* chore: e patches all --------- Co-authored-by: Charles Kerr <charles@charleskerr.com> Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com>
279 lines
12 KiB
C++
279 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 "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 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_;
|
|
|
|
base::WeakPtrFactory<InspectableWebContents> weak_factory_{this};
|
|
};
|
|
|
|
} // namespace electron
|
|
|
|
#endif // ELECTRON_SHELL_BROWSER_UI_INSPECTABLE_WEB_CONTENTS_H_
|