mirror of
https://bitbucket.org/chromiumembedded/cef
synced 2025-06-05 21:39:12 +02:00
270 lines
13 KiB
Diff
270 lines
13 KiB
Diff
diff --git content/browser/devtools/devtools_http_handler.cc content/browser/devtools/devtools_http_handler.cc
|
|
index 9bbf031144ff0..f99b7fa035187 100644
|
|
--- content/browser/devtools/devtools_http_handler.cc
|
|
+++ content/browser/devtools/devtools_http_handler.cc
|
|
@@ -588,7 +588,7 @@ void DevToolsHttpHandler::OnJsonRequest(
|
|
base::Value::Dict version;
|
|
version.Set("Protocol-Version", DevToolsAgentHost::GetProtocolVersion());
|
|
version.Set("WebKit-Version", embedder_support::GetWebKitVersion());
|
|
- version.Set("Browser", GetContentClient()->browser()->GetProduct());
|
|
+ version.Set("Browser", GetContentClient()->browser()->GetChromeProduct());
|
|
version.Set("User-Agent", GetContentClient()->browser()->GetUserAgent());
|
|
version.Set("V8-Version", V8_VERSION_STRING);
|
|
std::string host = info.GetHeaderValue("host");
|
|
diff --git content/browser/loader/navigation_url_loader_impl.cc content/browser/loader/navigation_url_loader_impl.cc
|
|
index 287d602c11e35..f755b7af6ce71 100644
|
|
--- content/browser/loader/navigation_url_loader_impl.cc
|
|
+++ content/browser/loader/navigation_url_loader_impl.cc
|
|
@@ -982,7 +982,7 @@ NavigationURLLoaderImpl::CreateNonNetworkLoaderFactory(
|
|
mojo::PendingRemote<network::mojom::URLLoaderFactory>
|
|
terminal_external_protocol;
|
|
bool handled = GetContentClient()->browser()->HandleExternalProtocol(
|
|
- resource_request.url, std::move(web_contents_getter),
|
|
+ resource_request.url, web_contents_getter,
|
|
frame_tree_node->frame_tree_node_id(), navigation_ui_data,
|
|
request_info.is_primary_main_frame,
|
|
frame_tree_node->IsInFencedFrameTree(), request_info.sandbox_flags,
|
|
@@ -994,6 +994,21 @@ NavigationURLLoaderImpl::CreateNonNetworkLoaderFactory(
|
|
*request_info.initiator_document_token)
|
|
: nullptr,
|
|
request_info.isolation_info, &terminal_external_protocol);
|
|
+
|
|
+ if (!handled) {
|
|
+ handled = GetContentClient()->browser()->HandleExternalProtocol(
|
|
+ web_contents_getter, frame_tree_node->frame_tree_node_id(),
|
|
+ navigation_ui_data, request_info.is_primary_main_frame,
|
|
+ frame_tree_node->IsInFencedFrameTree(), request_info.sandbox_flags,
|
|
+ resource_request, initiating_origin,
|
|
+ request_info.initiator_document_token
|
|
+ ? RenderFrameHostImpl::FromDocumentToken(
|
|
+ request_info.initiator_process_id,
|
|
+ *request_info.initiator_document_token)
|
|
+ : nullptr,
|
|
+ request_info.isolation_info, &terminal_external_protocol);
|
|
+ }
|
|
+
|
|
if (terminal_external_protocol) {
|
|
return std::make_pair(
|
|
/*is_cacheable=*/false,
|
|
diff --git content/public/browser/content_browser_client.cc content/public/browser/content_browser_client.cc
|
|
index 4a377944faaf9..e994ae8b1e944 100644
|
|
--- content/public/browser/content_browser_client.cc
|
|
+++ content/public/browser/content_browser_client.cc
|
|
@@ -1204,7 +1204,7 @@ ContentBrowserClient::CreateURLLoaderHandlerForServiceWorkerNavigationPreload(
|
|
void ContentBrowserClient::OnNetworkServiceCreated(
|
|
network::mojom::NetworkService* network_service) {}
|
|
|
|
-void ContentBrowserClient::ConfigureNetworkContextParams(
|
|
+bool ContentBrowserClient::ConfigureNetworkContextParams(
|
|
BrowserContext* context,
|
|
bool in_memory,
|
|
const base::FilePath& relative_partition_path,
|
|
@@ -1213,6 +1213,7 @@ void ContentBrowserClient::ConfigureNetworkContextParams(
|
|
cert_verifier_creation_params) {
|
|
network_context_params->user_agent = GetUserAgentBasedOnPolicy(context);
|
|
network_context_params->accept_language = "en-us,en";
|
|
+ return true;
|
|
}
|
|
|
|
std::vector<base::FilePath>
|
|
diff --git content/public/browser/content_browser_client.h content/public/browser/content_browser_client.h
|
|
index 0d0d957b353e0..c2a6efbbb3c0d 100644
|
|
--- content/public/browser/content_browser_client.h
|
|
+++ content/public/browser/content_browser_client.h
|
|
@@ -1413,6 +1413,12 @@ class CONTENT_EXPORT ContentBrowserClient {
|
|
bool opener_suppressed,
|
|
bool* no_javascript_access);
|
|
|
|
+ // Called to report the result of new window creation after CanCreateWindow()
|
|
+ // returns true. There are cases where the new window may still be canceled.
|
|
+ virtual void CreateWindowResult(
|
|
+ RenderFrameHost* opener,
|
|
+ bool success) {}
|
|
+
|
|
// Allows the embedder to return a delegate for the SpeechRecognitionManager.
|
|
// The delegate will be owned by the manager. It's valid to return nullptr.
|
|
virtual SpeechRecognitionManagerDelegate*
|
|
@@ -2258,7 +2264,7 @@ class CONTENT_EXPORT ContentBrowserClient {
|
|
//
|
|
// If |relative_partition_path| is the empty string, it means this needs to
|
|
// create the default NetworkContext for the BrowserContext.
|
|
- virtual void ConfigureNetworkContextParams(
|
|
+ virtual bool ConfigureNetworkContextParams(
|
|
BrowserContext* context,
|
|
bool in_memory,
|
|
const base::FilePath& relative_partition_path,
|
|
@@ -2500,6 +2506,22 @@ class CONTENT_EXPORT ContentBrowserClient {
|
|
const net::IsolationInfo& isolation_info,
|
|
mojo::PendingRemote<network::mojom::URLLoaderFactory>* out_factory);
|
|
|
|
+ // Same as above, but exposing the whole ResourceRequest object.
|
|
+ virtual bool HandleExternalProtocol(
|
|
+ base::RepeatingCallback<WebContents*()> web_contents_getter,
|
|
+ FrameTreeNodeId frame_tree_node_id,
|
|
+ NavigationUIData* navigation_data,
|
|
+ bool is_primary_main_frame,
|
|
+ bool is_in_fenced_frame_tree,
|
|
+ network::mojom::WebSandboxFlags sandbox_flags,
|
|
+ const network::ResourceRequest& request,
|
|
+ const std::optional<url::Origin>& initiating_origin,
|
|
+ RenderFrameHost* initiator_document,
|
|
+ const net::IsolationInfo& isolation_info,
|
|
+ mojo::PendingRemote<network::mojom::URLLoaderFactory>* out_factory) {
|
|
+ return false;
|
|
+ }
|
|
+
|
|
// Creates an OverlayWindow to be used for video or Picture-in-Picture.
|
|
// This window will house the content shown when in Picture-in-Picture mode.
|
|
// This will return a new OverlayWindow.
|
|
@@ -2565,6 +2587,10 @@ class CONTENT_EXPORT ContentBrowserClient {
|
|
// Used as part of the user agent string.
|
|
virtual std::string GetProduct();
|
|
|
|
+ // Returns the Chrome-specific product string. This is used for compatibility
|
|
+ // purposes with external tools like Selenium.
|
|
+ virtual std::string GetChromeProduct() { return GetProduct(); }
|
|
+
|
|
// Returns the user agent. Content may cache this value.
|
|
virtual std::string GetUserAgent();
|
|
|
|
diff --git content/public/renderer/content_renderer_client.h content/public/renderer/content_renderer_client.h
|
|
index 7a2d251ba2d13..68297ee6f118f 100644
|
|
--- content/public/renderer/content_renderer_client.h
|
|
+++ content/public/renderer/content_renderer_client.h
|
|
@@ -109,6 +109,9 @@ class CONTENT_EXPORT ContentRendererClient {
|
|
// a crash handler (such as crashpad) is already in use.
|
|
virtual void SetUpWebAssemblyTrapHandler();
|
|
|
|
+ // Notifies that the RenderThread can now send sync IPC messages.
|
|
+ virtual void RenderThreadConnected() {}
|
|
+
|
|
// Notifies that a new RenderFrame has been created.
|
|
virtual void RenderFrameCreated(RenderFrame* render_frame) {}
|
|
|
|
@@ -358,6 +361,10 @@ class CONTENT_EXPORT ContentRendererClient {
|
|
// This method may invalidate the frame.
|
|
virtual void RunScriptsAtDocumentIdle(RenderFrame* render_frame) {}
|
|
|
|
+ // Notifies that a DevTools agent has attached or detached.
|
|
+ virtual void DevToolsAgentAttached() {}
|
|
+ virtual void DevToolsAgentDetached() {}
|
|
+
|
|
// Allows subclasses to enable some runtime features before Blink has
|
|
// started.
|
|
virtual void SetRuntimeFeaturesDefaultsBeforeBlinkInitialization() {}
|
|
diff --git content/renderer/render_thread_impl.cc content/renderer/render_thread_impl.cc
|
|
index 790bf3bdfc489..c339cbd763417 100644
|
|
--- content/renderer/render_thread_impl.cc
|
|
+++ content/renderer/render_thread_impl.cc
|
|
@@ -590,6 +590,8 @@ void RenderThreadImpl::Init() {
|
|
GetContentClient()->renderer()->CreateURLLoaderThrottleProvider(
|
|
blink::URLLoaderThrottleProviderType::kFrame);
|
|
|
|
+ GetContentClient()->renderer()->RenderThreadConnected();
|
|
+
|
|
GetAssociatedInterfaceRegistry()->AddInterface<mojom::Renderer>(
|
|
base::BindRepeating(&RenderThreadImpl::OnRendererInterfaceReceiver,
|
|
base::Unretained(this)));
|
|
diff --git content/renderer/renderer_blink_platform_impl.cc content/renderer/renderer_blink_platform_impl.cc
|
|
index 45cbe16e4582c..401b59c0f3490 100644
|
|
--- content/renderer/renderer_blink_platform_impl.cc
|
|
+++ content/renderer/renderer_blink_platform_impl.cc
|
|
@@ -1058,6 +1058,15 @@ SkBitmap* RendererBlinkPlatformImpl::GetSadPageBitmap() {
|
|
|
|
//------------------------------------------------------------------------------
|
|
|
|
+void RendererBlinkPlatformImpl::DevToolsAgentAttached() {
|
|
+ GetContentClient()->renderer()->DevToolsAgentAttached();
|
|
+}
|
|
+void RendererBlinkPlatformImpl::DevToolsAgentDetached() {
|
|
+ GetContentClient()->renderer()->DevToolsAgentDetached();
|
|
+}
|
|
+
|
|
+//------------------------------------------------------------------------------
|
|
+
|
|
std::unique_ptr<blink::WebV8ValueConverter>
|
|
RendererBlinkPlatformImpl::CreateWebV8ValueConverter() {
|
|
return std::make_unique<V8ValueConverterImpl>();
|
|
diff --git content/renderer/renderer_blink_platform_impl.h content/renderer/renderer_blink_platform_impl.h
|
|
index 2b6f49b635456..6d1221d8663ca 100644
|
|
--- content/renderer/renderer_blink_platform_impl.h
|
|
+++ content/renderer/renderer_blink_platform_impl.h
|
|
@@ -250,6 +250,9 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : public BlinkPlatformImpl {
|
|
InertAndMinimumIntervalOfUserLevelMemoryPressureSignal() override;
|
|
#endif // BUILDFLAG(IS_ANDROID)
|
|
|
|
+ void DevToolsAgentAttached() override;
|
|
+ void DevToolsAgentDetached() override;
|
|
+
|
|
// Tells this platform that the renderer is locked to a site (i.e., a scheme
|
|
// plus eTLD+1, such as https://google.com), or to a more specific origin.
|
|
void SetIsLockedToSite();
|
|
diff --git content/shell/browser/shell_content_browser_client.cc content/shell/browser/shell_content_browser_client.cc
|
|
index a907bcc2eab8d..64ebf54ffd494 100644
|
|
--- content/shell/browser/shell_content_browser_client.cc
|
|
+++ content/shell/browser/shell_content_browser_client.cc
|
|
@@ -819,7 +819,7 @@ void ShellContentBrowserClient::OnNetworkServiceCreated(
|
|
#endif
|
|
}
|
|
|
|
-void ShellContentBrowserClient::ConfigureNetworkContextParams(
|
|
+bool ShellContentBrowserClient::ConfigureNetworkContextParams(
|
|
BrowserContext* context,
|
|
bool in_memory,
|
|
const base::FilePath& relative_partition_path,
|
|
@@ -828,6 +828,7 @@ void ShellContentBrowserClient::ConfigureNetworkContextParams(
|
|
cert_verifier_creation_params) {
|
|
ConfigureNetworkContextParamsForShell(context, network_context_params,
|
|
cert_verifier_creation_params);
|
|
+ return true;
|
|
}
|
|
|
|
std::vector<base::FilePath>
|
|
diff --git content/shell/browser/shell_content_browser_client.h content/shell/browser/shell_content_browser_client.h
|
|
index e608835c3d16f..1d767a2ee4c09 100644
|
|
--- content/shell/browser/shell_content_browser_client.h
|
|
+++ content/shell/browser/shell_content_browser_client.h
|
|
@@ -162,7 +162,7 @@ class ShellContentBrowserClient : public ContentBrowserClient {
|
|
GetGeolocationSystemPermissionManager() override;
|
|
void OnNetworkServiceCreated(
|
|
network::mojom::NetworkService* network_service) override;
|
|
- void ConfigureNetworkContextParams(
|
|
+ bool ConfigureNetworkContextParams(
|
|
BrowserContext* context,
|
|
bool in_memory,
|
|
const base::FilePath& relative_partition_path,
|
|
diff --git headless/lib/browser/headless_content_browser_client.cc headless/lib/browser/headless_content_browser_client.cc
|
|
index 26f73ac1df741..13214f607471f 100644
|
|
--- headless/lib/browser/headless_content_browser_client.cc
|
|
+++ headless/lib/browser/headless_content_browser_client.cc
|
|
@@ -423,7 +423,7 @@ bool HeadlessContentBrowserClient::IsCookieDeprecationLabelAllowedForContext(
|
|
return true;
|
|
}
|
|
|
|
-void HeadlessContentBrowserClient::ConfigureNetworkContextParams(
|
|
+bool HeadlessContentBrowserClient::ConfigureNetworkContextParams(
|
|
content::BrowserContext* context,
|
|
bool in_memory,
|
|
const base::FilePath& relative_partition_path,
|
|
@@ -433,6 +433,7 @@ void HeadlessContentBrowserClient::ConfigureNetworkContextParams(
|
|
HeadlessBrowserContextImpl::From(context)->ConfigureNetworkContextParams(
|
|
in_memory, relative_partition_path, network_context_params,
|
|
cert_verifier_creation_params);
|
|
+ return true;
|
|
}
|
|
|
|
std::string HeadlessContentBrowserClient::GetProduct() {
|
|
diff --git headless/lib/browser/headless_content_browser_client.h headless/lib/browser/headless_content_browser_client.h
|
|
index 4234c1259f4b0..8b4e308ce94af 100644
|
|
--- headless/lib/browser/headless_content_browser_client.h
|
|
+++ headless/lib/browser/headless_content_browser_client.h
|
|
@@ -114,7 +114,7 @@ class HeadlessContentBrowserClient : public content::ContentBrowserClient {
|
|
content::BrowserContext* browser_context,
|
|
const url::Origin& top_frame_origin,
|
|
const url::Origin& context_origin) override;
|
|
- void ConfigureNetworkContextParams(
|
|
+ bool ConfigureNetworkContextParams(
|
|
content::BrowserContext* context,
|
|
bool in_memory,
|
|
const base::FilePath& relative_partition_path,
|