mirror of
https://bitbucket.org/chromiumembedded/cef
synced 2025-06-05 21:39:12 +02:00
Update to Chromium version 105.0.5195.19
This commit is contained in:
committed by
Marshall Greenblatt
parent
08f37697af
commit
6b477065d7
@@ -7,6 +7,6 @@
|
||||
# https://bitbucket.org/chromiumembedded/cef/wiki/BranchesAndBuilding
|
||||
|
||||
{
|
||||
'chromium_checkout': 'refs/tags/105.0.5195.8',
|
||||
'chromium_checkout': 'refs/tags/105.0.5195.19',
|
||||
'depot_tools_checkout': '882f1e2a9a'
|
||||
}
|
||||
|
@@ -52,7 +52,7 @@ index 7612f95eed78e..e6da8824627b2 100644
|
||||
]
|
||||
}
|
||||
diff --git chrome/browser/ui/browser.cc chrome/browser/ui/browser.cc
|
||||
index 3aa1e336d8da2..2826a41485deb 100644
|
||||
index 9347ea3c71b79..e59ac5b76c31f 100644
|
||||
--- chrome/browser/ui/browser.cc
|
||||
+++ chrome/browser/ui/browser.cc
|
||||
@@ -264,6 +264,25 @@
|
||||
@@ -254,7 +254,7 @@ index 3aa1e336d8da2..2826a41485deb 100644
|
||||
}
|
||||
|
||||
bool Browser::IsFullscreenForTabOrPending(const WebContents* web_contents) {
|
||||
@@ -2154,6 +2253,15 @@ void Browser::RequestMediaAccessPermission(
|
||||
@@ -2159,6 +2258,15 @@ void Browser::RequestMediaAccessPermission(
|
||||
content::WebContents* web_contents,
|
||||
const content::MediaStreamRequest& request,
|
||||
content::MediaResponseCallback callback) {
|
||||
@@ -270,7 +270,7 @@ index 3aa1e336d8da2..2826a41485deb 100644
|
||||
const extensions::Extension* extension =
|
||||
GetExtensionForOrigin(profile_, request.security_origin);
|
||||
MediaCaptureDevicesDispatcher::GetInstance()->ProcessMediaAccessRequest(
|
||||
@@ -2691,13 +2799,20 @@ void Browser::RemoveScheduledUpdatesFor(WebContents* contents) {
|
||||
@@ -2696,13 +2804,20 @@ void Browser::RemoveScheduledUpdatesFor(WebContents* contents) {
|
||||
// Browser, Getters for UI (private):
|
||||
|
||||
StatusBubble* Browser::GetStatusBubble() {
|
||||
@@ -292,7 +292,7 @@ index 3aa1e336d8da2..2826a41485deb 100644
|
||||
return window_ ? window_->GetStatusBubble() : nullptr;
|
||||
}
|
||||
|
||||
@@ -2824,6 +2939,8 @@ void Browser::SetAsDelegate(WebContents* web_contents, bool set_delegate) {
|
||||
@@ -2829,6 +2944,8 @@ void Browser::SetAsDelegate(WebContents* web_contents, bool set_delegate) {
|
||||
content_translate_driver->RemoveTranslationObserver(this);
|
||||
BookmarkTabHelper::FromWebContents(web_contents)->RemoveObserver(this);
|
||||
}
|
||||
@@ -302,7 +302,7 @@ index 3aa1e336d8da2..2826a41485deb 100644
|
||||
|
||||
void Browser::TabDetachedAtImpl(content::WebContents* contents,
|
||||
diff --git chrome/browser/ui/browser.h chrome/browser/ui/browser.h
|
||||
index c9e2f4c315d27..54cb88c98d72c 100644
|
||||
index dda5c5ade5604..9018dbdae8d56 100644
|
||||
--- chrome/browser/ui/browser.h
|
||||
+++ chrome/browser/ui/browser.h
|
||||
@@ -22,6 +22,7 @@
|
||||
@@ -383,7 +383,7 @@ index c9e2f4c315d27..54cb88c98d72c 100644
|
||||
void BeforeUnloadFired(content::WebContents* source,
|
||||
bool proceed,
|
||||
bool* proceed_to_fire_unload) override;
|
||||
@@ -1241,6 +1272,8 @@ class Browser : public TabStripModelObserver,
|
||||
@@ -1243,6 +1274,8 @@ class Browser : public TabStripModelObserver,
|
||||
const std::string initial_workspace_;
|
||||
bool initial_visible_on_all_workspaces_state_;
|
||||
|
||||
@@ -392,7 +392,7 @@ index c9e2f4c315d27..54cb88c98d72c 100644
|
||||
CreationSource creation_source_ = CreationSource::kUnknown;
|
||||
|
||||
UnloadController unload_controller_;
|
||||
@@ -1312,6 +1345,10 @@ class Browser : public TabStripModelObserver,
|
||||
@@ -1314,6 +1347,10 @@ class Browser : public TabStripModelObserver,
|
||||
std::unique_ptr<screen_ai::AXScreenAIAnnotator> screen_ai_annotator_;
|
||||
#endif
|
||||
|
||||
|
@@ -125,10 +125,10 @@ index 8b72897491669..546919dd70afc 100644
|
||||
// that the X-Frame-Options protection mechanism is set to either DENY or
|
||||
// SAMEORIGIN.
|
||||
diff --git chrome/renderer/chrome_content_renderer_client.cc chrome/renderer/chrome_content_renderer_client.cc
|
||||
index f068771f2bd11..320b50a510cd3 100644
|
||||
index bbfb9e5e65480..aa5e4ad3cb17d 100644
|
||||
--- chrome/renderer/chrome_content_renderer_client.cc
|
||||
+++ chrome/renderer/chrome_content_renderer_client.cc
|
||||
@@ -948,6 +948,7 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin(
|
||||
@@ -946,6 +946,7 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin(
|
||||
|
||||
if ((status == chrome::mojom::PluginStatus::kUnauthorized ||
|
||||
status == chrome::mojom::PluginStatus::kBlocked) &&
|
||||
@@ -136,7 +136,7 @@ index f068771f2bd11..320b50a510cd3 100644
|
||||
content_settings_agent_delegate->IsPluginTemporarilyAllowed(
|
||||
identifier)) {
|
||||
status = chrome::mojom::PluginStatus::kAllowed;
|
||||
@@ -1149,7 +1150,8 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin(
|
||||
@@ -1147,7 +1148,8 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin(
|
||||
render_frame->GetRemoteAssociatedInterfaces()->GetInterface(
|
||||
plugin_auth_host.BindNewEndpointAndPassReceiver());
|
||||
plugin_auth_host->BlockedUnauthorizedPlugin(group_name, identifier);
|
||||
@@ -146,7 +146,7 @@ index f068771f2bd11..320b50a510cd3 100644
|
||||
break;
|
||||
}
|
||||
case chrome::mojom::PluginStatus::kBlocked: {
|
||||
@@ -1158,7 +1160,8 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin(
|
||||
@@ -1156,7 +1158,8 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin(
|
||||
l10n_util::GetStringFUTF16(IDS_PLUGIN_BLOCKED, group_name));
|
||||
placeholder->AllowLoading();
|
||||
RenderThread::Get()->RecordAction(UserMetricsAction("Plugin_Blocked"));
|
||||
@@ -156,7 +156,7 @@ index f068771f2bd11..320b50a510cd3 100644
|
||||
break;
|
||||
}
|
||||
case chrome::mojom::PluginStatus::kBlockedByPolicy: {
|
||||
@@ -1168,7 +1171,8 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin(
|
||||
@@ -1166,7 +1169,8 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin(
|
||||
group_name));
|
||||
RenderThread::Get()->RecordAction(
|
||||
UserMetricsAction("Plugin_BlockedByPolicy"));
|
||||
@@ -166,7 +166,7 @@ index f068771f2bd11..320b50a510cd3 100644
|
||||
break;
|
||||
}
|
||||
case chrome::mojom::PluginStatus::kBlockedNoLoading: {
|
||||
@@ -1176,7 +1180,8 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin(
|
||||
@@ -1174,7 +1178,8 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin(
|
||||
IDR_BLOCKED_PLUGIN_HTML,
|
||||
l10n_util::GetStringFUTF16(IDS_PLUGIN_BLOCKED_NO_LOADING,
|
||||
group_name));
|
||||
|
@@ -174,7 +174,7 @@ index 7ef669d52b306..8edc1aaeaff6a 100644
|
||||
+#endif
|
||||
}
|
||||
diff --git chrome/browser/chrome_content_browser_client.cc chrome/browser/chrome_content_browser_client.cc
|
||||
index d4afb0ff30f1a..30f789021b912 100644
|
||||
index c96f6885207ad..ca39c737b20dd 100644
|
||||
--- chrome/browser/chrome_content_browser_client.cc
|
||||
+++ chrome/browser/chrome_content_browser_client.cc
|
||||
@@ -31,6 +31,7 @@
|
||||
@@ -185,7 +185,7 @@ index d4afb0ff30f1a..30f789021b912 100644
|
||||
#include "chrome/browser/accessibility/accessibility_labels_service.h"
|
||||
#include "chrome/browser/accessibility/accessibility_labels_service_factory.h"
|
||||
#include "chrome/browser/after_startup_task_utils.h"
|
||||
@@ -1314,6 +1315,8 @@ bool IsTopChromeWebUIURL(const GURL& url) {
|
||||
@@ -1347,6 +1348,8 @@ bool DoesGaiaOriginRequireDedicatedProcess() {
|
||||
} // namespace
|
||||
|
||||
ChromeContentBrowserClient::ChromeContentBrowserClient() {
|
||||
@@ -194,7 +194,7 @@ index d4afb0ff30f1a..30f789021b912 100644
|
||||
#if BUILDFLAG(ENABLE_PLUGINS)
|
||||
extra_parts_.push_back(new ChromeContentBrowserClientPluginsPart);
|
||||
#endif
|
||||
@@ -1339,6 +1342,11 @@ ChromeContentBrowserClient::~ChromeContentBrowserClient() {
|
||||
@@ -1372,6 +1375,11 @@ ChromeContentBrowserClient::~ChromeContentBrowserClient() {
|
||||
extra_parts_.clear();
|
||||
}
|
||||
|
||||
@@ -206,7 +206,7 @@ index d4afb0ff30f1a..30f789021b912 100644
|
||||
// static
|
||||
void ChromeContentBrowserClient::RegisterLocalStatePrefs(
|
||||
PrefRegistrySimple* registry) {
|
||||
@@ -3871,9 +3879,11 @@ void ChromeContentBrowserClient::BrowserURLHandlerCreated(
|
||||
@@ -3902,9 +3910,11 @@ void ChromeContentBrowserClient::BrowserURLHandlerCreated(
|
||||
&search::HandleNewTabURLReverseRewrite);
|
||||
#endif // BUILDFLAG(IS_ANDROID)
|
||||
|
||||
@@ -218,7 +218,7 @@ index d4afb0ff30f1a..30f789021b912 100644
|
||||
}
|
||||
|
||||
base::FilePath ChromeContentBrowserClient::GetDefaultDownloadDirectory() {
|
||||
@@ -5545,7 +5555,7 @@ void ChromeContentBrowserClient::OnNetworkServiceCreated(
|
||||
@@ -5576,7 +5586,7 @@ void ChromeContentBrowserClient::OnNetworkServiceCreated(
|
||||
network_service);
|
||||
}
|
||||
|
||||
@@ -227,7 +227,7 @@ index d4afb0ff30f1a..30f789021b912 100644
|
||||
content::BrowserContext* context,
|
||||
bool in_memory,
|
||||
const base::FilePath& relative_partition_path,
|
||||
@@ -5563,6 +5573,8 @@ void ChromeContentBrowserClient::ConfigureNetworkContextParams(
|
||||
@@ -5594,6 +5604,8 @@ void ChromeContentBrowserClient::ConfigureNetworkContextParams(
|
||||
network_context_params->user_agent = GetUserAgentBasedOnPolicy(context);
|
||||
network_context_params->accept_language = GetApplicationLocale();
|
||||
}
|
||||
@@ -236,7 +236,7 @@ index d4afb0ff30f1a..30f789021b912 100644
|
||||
}
|
||||
|
||||
std::vector<base::FilePath>
|
||||
@@ -6415,10 +6427,10 @@ void ChromeContentBrowserClient::OnKeepaliveRequestStarted(
|
||||
@@ -6446,10 +6458,10 @@ void ChromeContentBrowserClient::OnKeepaliveRequestStarted(
|
||||
const auto now = base::TimeTicks::Now();
|
||||
const auto timeout = GetKeepaliveTimerTimeout(context);
|
||||
keepalive_deadline_ = std::max(keepalive_deadline_, now + timeout);
|
||||
@@ -249,7 +249,7 @@ index d4afb0ff30f1a..30f789021b912 100644
|
||||
FROM_HERE, keepalive_deadline_ - now,
|
||||
base::BindOnce(
|
||||
&ChromeContentBrowserClient::OnKeepaliveTimerFired,
|
||||
@@ -6437,7 +6449,8 @@ void ChromeContentBrowserClient::OnKeepaliveRequestFinished() {
|
||||
@@ -6468,7 +6480,8 @@ void ChromeContentBrowserClient::OnKeepaliveRequestFinished() {
|
||||
--num_keepalive_requests_;
|
||||
if (num_keepalive_requests_ == 0) {
|
||||
DVLOG(1) << "Stopping the keepalive timer";
|
||||
@@ -259,7 +259,7 @@ index d4afb0ff30f1a..30f789021b912 100644
|
||||
// This deletes the keep alive handle attached to the timer function and
|
||||
// unblock the shutdown sequence.
|
||||
}
|
||||
@@ -6562,7 +6575,7 @@ void ChromeContentBrowserClient::OnKeepaliveTimerFired(
|
||||
@@ -6593,7 +6606,7 @@ void ChromeContentBrowserClient::OnKeepaliveTimerFired(
|
||||
const auto now = base::TimeTicks::Now();
|
||||
const auto then = keepalive_deadline_;
|
||||
if (now < then) {
|
||||
|
@@ -123,10 +123,10 @@ index 77c0984d364c6..df7ff7d7355b5 100644
|
||||
|
||||
void CookieManager::SetForceKeepSessionState() {
|
||||
diff --git services/network/network_context.cc services/network/network_context.cc
|
||||
index cb42918d0c5c1..e050d858e8d7d 100644
|
||||
index 33264a4ec00f6..5c9bef43de9c3 100644
|
||||
--- services/network/network_context.cc
|
||||
+++ services/network/network_context.cc
|
||||
@@ -2372,17 +2372,21 @@ URLRequestContextOwner NetworkContext::MakeURLRequestContext(
|
||||
@@ -2380,17 +2380,21 @@ URLRequestContextOwner NetworkContext::MakeURLRequestContext(
|
||||
network_service_->network_quality_estimator());
|
||||
}
|
||||
|
||||
|
@@ -1,8 +1,8 @@
|
||||
diff --git content/browser/web_contents/web_contents_impl.cc content/browser/web_contents/web_contents_impl.cc
|
||||
index 860e52ddb3db1..3c7ce1be61f80 100644
|
||||
index 32817ef0eab0b..73f6dee57c0a1 100644
|
||||
--- content/browser/web_contents/web_contents_impl.cc
|
||||
+++ content/browser/web_contents/web_contents_impl.cc
|
||||
@@ -3066,6 +3066,12 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params,
|
||||
@@ -3079,6 +3079,12 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params,
|
||||
site_instance.get(), params.renderer_initiated_creation,
|
||||
params.main_frame_name, GetOpener(), primary_main_frame_policy);
|
||||
|
||||
@@ -15,7 +15,7 @@ index 860e52ddb3db1..3c7ce1be61f80 100644
|
||||
std::unique_ptr<WebContentsViewDelegate> delegate =
|
||||
GetContentClient()->browser()->GetWebContentsViewDelegate(this);
|
||||
|
||||
@@ -3076,6 +3082,7 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params,
|
||||
@@ -3089,6 +3095,7 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params,
|
||||
view_ = CreateWebContentsView(this, std::move(delegate),
|
||||
&render_view_host_delegate_view_);
|
||||
}
|
||||
@@ -23,7 +23,7 @@ index 860e52ddb3db1..3c7ce1be61f80 100644
|
||||
CHECK(render_view_host_delegate_view_);
|
||||
CHECK(view_.get());
|
||||
|
||||
@@ -3254,6 +3261,9 @@ void WebContentsImpl::RenderWidgetCreated(
|
||||
@@ -3267,6 +3274,9 @@ void WebContentsImpl::RenderWidgetCreated(
|
||||
OPTIONAL_TRACE_EVENT1("content", "WebContentsImpl::RenderWidgetCreated",
|
||||
"render_widget_host", render_widget_host);
|
||||
created_widgets_.insert(render_widget_host);
|
||||
@@ -33,7 +33,7 @@ index 860e52ddb3db1..3c7ce1be61f80 100644
|
||||
}
|
||||
|
||||
void WebContentsImpl::RenderWidgetDeleted(
|
||||
@@ -3980,6 +3990,15 @@ FrameTree* WebContentsImpl::CreateNewWindow(
|
||||
@@ -3993,6 +4003,15 @@ FrameTree* WebContentsImpl::CreateNewWindow(
|
||||
params.pip_options->lock_aspect_ratio;
|
||||
}
|
||||
|
||||
@@ -49,7 +49,7 @@ index 860e52ddb3db1..3c7ce1be61f80 100644
|
||||
std::unique_ptr<WebContentsImpl> new_contents;
|
||||
if (!is_guest) {
|
||||
create_params.context = view_->GetNativeView();
|
||||
@@ -7874,6 +7893,9 @@ void WebContentsImpl::SetFocusedFrame(FrameTreeNode* node,
|
||||
@@ -7880,6 +7899,9 @@ void WebContentsImpl::SetFocusedFrame(FrameTreeNode* node,
|
||||
// frames).
|
||||
SetFocusedFrameTree(node->frame_tree());
|
||||
}
|
||||
@@ -88,7 +88,7 @@ index 5c710ded76711..c86aff1c770e9 100644
|
||||
// the value that'll be returned by GetLastActiveTime(). If this is left
|
||||
// default initialized then the value is not passed on to the WebContents
|
||||
diff --git content/public/browser/web_contents_delegate.h content/public/browser/web_contents_delegate.h
|
||||
index b088cb3010033..b1936ce2f3a58 100644
|
||||
index 0274e3bb5cc62..8807f4a901096 100644
|
||||
--- content/public/browser/web_contents_delegate.h
|
||||
+++ content/public/browser/web_contents_delegate.h
|
||||
@@ -57,9 +57,11 @@ class EyeDropperListener;
|
||||
|
@@ -11,7 +11,7 @@ index b01562ebe042b..93ad664fb2922 100644
|
||||
// Cancels and hides the current popup (datetime, select...) if any.
|
||||
virtual void CancelPagePopup() = 0;
|
||||
diff --git third_party/blink/renderer/core/exported/web_view_impl.cc third_party/blink/renderer/core/exported/web_view_impl.cc
|
||||
index 390e47422a0a1..07ba7bfc6a1a8 100644
|
||||
index 10755e0d1ca79..4dc42eea4a2ae 100644
|
||||
--- third_party/blink/renderer/core/exported/web_view_impl.cc
|
||||
+++ third_party/blink/renderer/core/exported/web_view_impl.cc
|
||||
@@ -246,8 +246,13 @@ void WebView::SetUseExternalPopupMenus(bool use_external_popup_menus) {
|
||||
|
Reference in New Issue
Block a user