mirror of
https://bitbucket.org/chromiumembedded/cef
synced 2025-06-05 21:39:12 +02:00
Update to Chromium version 133.0.6886.0 (#1393452)
This commit is contained in:
@@ -40,7 +40,7 @@ void StreamCreatorHelper(
|
||||
mojo::PendingRemote<media::mojom::AudioInputStream> stream,
|
||||
mojo::PendingReceiver<media::mojom::AudioInputStreamClient>
|
||||
client_receiver,
|
||||
media::mojom::ReadOnlyAudioDataPipePtr data_pipe) {
|
||||
media::mojom::ReadWriteAudioDataPipePtr data_pipe) {
|
||||
mojo::Remote<mirroring::mojom::AudioStreamCreatorClient>
|
||||
audio_client(std::move(client));
|
||||
audio_client->StreamCreated(std::move(stream),
|
||||
@@ -100,8 +100,7 @@ void CefAudioCapturer::OnCaptureStarted() {
|
||||
void CefAudioCapturer::Capture(const media::AudioBus* source,
|
||||
base::TimeTicks audio_capture_time,
|
||||
const media::AudioGlitchInfo& /*glitch_info*/,
|
||||
double /*volume*/,
|
||||
bool /*key_pressed*/) {
|
||||
double /*volume*/) {
|
||||
const int channels = source->channels();
|
||||
std::array<const float*, media::CHANNELS_MAX> data;
|
||||
DCHECK(channels == channels_);
|
||||
|
@@ -33,8 +33,7 @@ class CefAudioCapturer : public media::AudioCapturerSource::CaptureCallback {
|
||||
void Capture(const media::AudioBus* audio_source,
|
||||
base::TimeTicks audio_capture_time,
|
||||
const media::AudioGlitchInfo& glitch_info,
|
||||
double volume,
|
||||
bool key_pressed) override;
|
||||
double volume) override;
|
||||
void OnCaptureError(media::AudioCapturerSource::ErrorCode code,
|
||||
const std::string& message) override;
|
||||
void OnCaptureMuted(bool is_muted) override {}
|
||||
|
@@ -16,7 +16,6 @@
|
||||
#include "content/public/browser/browser_thread.h"
|
||||
#include "content/public/browser/render_frame_host.h"
|
||||
#include "media/audio/audio_device_description.h"
|
||||
#include "media/base/user_input_monitor.h"
|
||||
#include "mojo/public/cpp/bindings/pending_remote.h"
|
||||
#include "mojo/public/cpp/bindings/self_owned_receiver.h"
|
||||
#include "third_party/blink/public/mojom/media/renderer_audio_input_stream_factory.mojom.h"
|
||||
@@ -46,7 +45,7 @@ class StreamCreatedCallbackAdapter final
|
||||
mojo::PendingRemote<media::mojom::AudioInputStream> stream,
|
||||
mojo::PendingReceiver<media::mojom::AudioInputStreamClient>
|
||||
client_receiver,
|
||||
media::mojom::ReadOnlyAudioDataPipePtr data_pipe,
|
||||
media::mojom::ReadWriteAudioDataPipePtr data_pipe,
|
||||
bool initially_muted,
|
||||
const std::optional<base::UnguessableToken>& stream_id) override {
|
||||
DCHECK(!initially_muted); // Loopback streams shouldn't be started muted.
|
||||
@@ -90,13 +89,7 @@ void CreateSystemWideLoopbackStreamHelper(
|
||||
} // namespace
|
||||
|
||||
CefAudioLoopbackStreamCreator::CefAudioLoopbackStreamCreator()
|
||||
: factory_(nullptr,
|
||||
content::BrowserMainLoop::GetInstance()
|
||||
? static_cast<media::UserInputMonitorBase*>(
|
||||
content::BrowserMainLoop::GetInstance()
|
||||
->user_input_monitor())
|
||||
: nullptr,
|
||||
content::AudioStreamBrokerFactory::CreateImpl()) {
|
||||
: factory_(nullptr, content::AudioStreamBrokerFactory::CreateImpl()) {
|
||||
DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
|
||||
}
|
||||
|
||||
|
@@ -36,7 +36,7 @@ class CefAudioLoopbackStreamCreator final {
|
||||
mojo::PendingRemote<media::mojom::AudioInputStream> stream,
|
||||
mojo::PendingReceiver<media::mojom::AudioInputStreamClient>
|
||||
client_receiver,
|
||||
media::mojom::ReadOnlyAudioDataPipePtr data_pipe)>;
|
||||
media::mojom::ReadWriteAudioDataPipePtr data_pipe)>;
|
||||
|
||||
// Creates a loopback stream that captures the audio from |loopback_source|,
|
||||
// or the default system playback if |loopback_source| is null. Local output
|
||||
|
@@ -599,6 +599,7 @@ ChromeContentBrowserClientCef::CreateLoginDelegate(
|
||||
const GURL& url,
|
||||
scoped_refptr<net::HttpResponseHeaders> response_headers,
|
||||
bool first_auth_attempt,
|
||||
content::GuestPageHolder* guest,
|
||||
LoginAuthRequiredCallback auth_required_callback) {
|
||||
// |web_contents| is nullptr for CefURLRequests without an associated frame.
|
||||
if (!web_contents || base::CommandLine::ForCurrentProcess()->HasSwitch(
|
||||
@@ -612,7 +613,7 @@ ChromeContentBrowserClientCef::CreateLoginDelegate(
|
||||
return ChromeContentBrowserClient::CreateLoginDelegate(
|
||||
auth_info, web_contents, browser_context, request_id,
|
||||
is_request_for_primary_main_frame_navigation, is_request_for_navigation,
|
||||
url, response_headers, first_auth_attempt,
|
||||
url, response_headers, first_auth_attempt, guest,
|
||||
std::move(auth_required_callback));
|
||||
}
|
||||
|
||||
|
@@ -132,6 +132,7 @@ class ChromeContentBrowserClientCef : public ChromeContentBrowserClient {
|
||||
const GURL& url,
|
||||
scoped_refptr<net::HttpResponseHeaders> response_headers,
|
||||
bool first_auth_attempt,
|
||||
content::GuestPageHolder* guest,
|
||||
LoginAuthRequiredCallback auth_required_callback) override;
|
||||
void ExposeInterfacesToRenderer(
|
||||
service_manager::BinderRegistry* registry,
|
||||
|
@@ -187,6 +187,13 @@ void ChromeBrowserFrame::Activate() {
|
||||
}
|
||||
|
||||
void ChromeBrowserFrame::OnNativeWidgetDestroyed() {
|
||||
// Remove the listener registration added in BrowserView::InitBrowser().
|
||||
if (browser_view()) {
|
||||
if (auto focus_manager = browser_view()->GetFocusManager()) {
|
||||
focus_manager->RemoveFocusChangeListener(browser_view());
|
||||
}
|
||||
}
|
||||
|
||||
window_view_ = nullptr;
|
||||
SetBrowserView(nullptr);
|
||||
BrowserFrame::OnNativeWidgetDestroyed();
|
||||
|
@@ -34,8 +34,8 @@ bool CefDevToolsController::SendDevToolsMessage(
|
||||
return false;
|
||||
}
|
||||
|
||||
agent_host_->DispatchProtocolMessage(
|
||||
this, base::as_bytes(base::make_span(message)));
|
||||
agent_host_->DispatchProtocolMessage(this,
|
||||
base::as_bytes(base::span(message)));
|
||||
return true;
|
||||
}
|
||||
|
||||
@@ -69,7 +69,7 @@ int CefDevToolsController::ExecuteDevToolsMethod(
|
||||
}
|
||||
|
||||
agent_host_->DispatchProtocolMessage(
|
||||
this, base::as_bytes(base::make_span(protocol_message)));
|
||||
this, base::as_bytes(base::span(protocol_message)));
|
||||
return message_id;
|
||||
}
|
||||
|
||||
|
@@ -284,7 +284,7 @@ void CefMenuManager::MenuClosed(CefRefPtr<CefMenuModelImpl> source) {
|
||||
|
||||
// Notify the host after closing the context menu.
|
||||
web_contents()->SetShowingContextMenu(false);
|
||||
web_contents()->NotifyContextMenuClosed(params_.link_followed);
|
||||
web_contents()->NotifyContextMenuClosed(params_.link_followed, std::nullopt);
|
||||
}
|
||||
|
||||
bool CefMenuManager::FormatLabel(CefRefPtr<CefMenuModelImpl> source,
|
||||
|
@@ -15,7 +15,7 @@ namespace {
|
||||
void UpdateCRLSet(const std::string& crl_set_bytes) {
|
||||
CEF_REQUIRE_UIT();
|
||||
content::GetCertVerifierServiceFactory()->UpdateCRLSet(
|
||||
base::as_bytes(base::make_span(crl_set_bytes)), base::DoNothing());
|
||||
base::as_bytes(base::span(crl_set_bytes)), base::DoNothing());
|
||||
}
|
||||
|
||||
void LoadFromDisk(const base::FilePath& path) {
|
||||
|
@@ -201,10 +201,10 @@ void SaveCookiesOnUIThread(
|
||||
cookie));
|
||||
}
|
||||
|
||||
SetCanonicalCookieCallback(
|
||||
progress, net::CanonicalCookie(),
|
||||
net::CookieAccessResult(net::CookieInclusionStatus(
|
||||
net::CookieInclusionStatus::EXCLUDE_UNKNOWN_ERROR)));
|
||||
net::CookieInclusionStatus status;
|
||||
status.AddExclusionReason(net::CookieInclusionStatus::EXCLUDE_UNKNOWN_ERROR);
|
||||
SetCanonicalCookieCallback(progress, net::CanonicalCookie(),
|
||||
net::CookieAccessResult(std::move(status)));
|
||||
}
|
||||
|
||||
} // namespace
|
||||
|
@@ -305,9 +305,10 @@ bool CefCookieManagerImpl::SetCookieInternal(
|
||||
/*partition_key=*/std::nullopt, /*status=*/nullptr);
|
||||
|
||||
if (!canonical_cookie) {
|
||||
SetCookieCallbackImpl(
|
||||
callback, net::CookieAccessResult(net::CookieInclusionStatus(
|
||||
net::CookieInclusionStatus::EXCLUDE_UNKNOWN_ERROR)));
|
||||
net::CookieInclusionStatus status;
|
||||
status.AddExclusionReason(
|
||||
net::CookieInclusionStatus::EXCLUDE_UNKNOWN_ERROR);
|
||||
SetCookieCallbackImpl(callback, net::CookieAccessResult(std::move(status)));
|
||||
return true;
|
||||
}
|
||||
|
||||
|
@@ -633,17 +633,9 @@ bool CefCrashReporterClient::GetCrashDumpLocation(std::wstring* crash_dir) {
|
||||
|
||||
#elif BUILDFLAG(IS_POSIX)
|
||||
|
||||
void CefCrashReporterClient::GetProductNameAndVersion(const char** product_name,
|
||||
const char** version) {
|
||||
*product_name = product_name_.c_str();
|
||||
*version = product_version_.c_str();
|
||||
}
|
||||
|
||||
void CefCrashReporterClient::GetProductNameAndVersion(std::string* product_name,
|
||||
std::string* version,
|
||||
std::string* channel) {
|
||||
*product_name = product_name_;
|
||||
*version = product_version_;
|
||||
void CefCrashReporterClient::GetProductInfo(ProductInfo* product_info) {
|
||||
product_info->product_name = product_name_;
|
||||
product_info->version = product_version_;
|
||||
}
|
||||
|
||||
bool CefCrashReporterClient::GetCrashDumpLocation(base::FilePath* crash_dir) {
|
||||
|
@@ -50,11 +50,7 @@ class CefCrashReporterClient : public crash_reporter::CrashReporterClient {
|
||||
std::wstring* channel_name) override;
|
||||
bool GetCrashDumpLocation(std::wstring* crash_dir) override;
|
||||
#elif BUILDFLAG(IS_POSIX)
|
||||
void GetProductNameAndVersion(const char** product_name,
|
||||
const char** version) override;
|
||||
void GetProductNameAndVersion(std::string* product_name,
|
||||
std::string* version,
|
||||
std::string* channel) override;
|
||||
void GetProductInfo(ProductInfo* product_info) override;
|
||||
bool GetCrashDumpLocation(base::FilePath* crash_dir) override;
|
||||
#endif // BUILDFLAG(IS_POSIX)
|
||||
|
||||
|
@@ -1165,7 +1165,8 @@ void CefPostDataElementImpl::Get(network::ResourceRequestBody& body) const {
|
||||
base::AutoLock lock_scope(lock_);
|
||||
|
||||
if (type_ == PDE_TYPE_BYTES) {
|
||||
body.AppendBytes(static_cast<char*>(data_.bytes.bytes), data_.bytes.size);
|
||||
body.AppendCopyOfBytes(
|
||||
base::span(static_cast<uint8_t*>(data_.bytes.bytes), data_.bytes.size));
|
||||
} else if (type_ == PDE_TYPE_FILE) {
|
||||
base::FilePath path = base::FilePath(CefString(&data_.filename));
|
||||
body.AppendFileRange(path, 0, std::numeric_limits<uint64_t>::max(),
|
||||
|
@@ -494,7 +494,7 @@ CefRefPtr<CefBinaryValue> CefBinaryValue::Create(const void* data,
|
||||
}
|
||||
|
||||
const auto ptr = static_cast<const uint8_t*>(data);
|
||||
return new CefBinaryValueImpl(base::make_span(ptr, data_size));
|
||||
return new CefBinaryValueImpl(base::span(ptr, data_size));
|
||||
}
|
||||
|
||||
// static
|
||||
|
Reference in New Issue
Block a user