bcarrella/cef
1
0
Fork 0
mirror of https://bitbucket.org/chromiumembedded/cef synced 2025-06-05 21:39:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

Update to Chromium version 111.0.5563.0 (#1097615)

Browse Source
This commit is contained in:
Marshall Greenblatt
2023-01-30 12:43:54 -05:00
parent 4c41f14360
commit dc2231cdfb
179 changed files with 986 additions and 930 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libcef/browser/net_service/cookie_helper.cc
View File

@@ -7,7 +7,7 @@
#include "libcef/browser/thread_util.h"
#include "libcef/common/net_service/net_service_util.h"
#include "base/bind.h"
#include "base/functional/bind.h"
#include "content/public/browser/browser_context.h"
#include "content/public/browser/storage_partition.h"
#include "content/public/common/url_constants.h"

2
libcef/browser/net_service/cookie_helper.h
View File

@@ -7,7 +7,7 @@
#include "libcef/browser/browser_context.h"
#include "base/callback_forward.h"
#include "base/functional/callback_forward.h"
#include "net/cookies/canonical_cookie.h"
namespace net {

2
libcef/browser/net_service/cookie_manager_impl.cc
View File

@@ -7,7 +7,7 @@
#include "libcef/common/net_service/net_service_util.h"
#include "libcef/common/time_util.h"
#include "base/bind.h"
#include "base/functional/bind.h"
#include "base/logging.h"
#include "content/public/browser/browser_context.h"
#include "content/public/browser/storage_partition.h"

4
libcef/browser/net_service/login_delegate.cc
View File

@@ -9,7 +9,7 @@
#include "libcef/browser/thread_util.h"
#include "base/memory/scoped_refptr.h"
#include "base/threading/sequenced_task_runner_handle.h"
#include "base/task/sequenced_task_runner.h"
#include "content/public/browser/global_request_id.h"
#include "content/public/browser/web_contents.h"
@@ -21,7 +21,7 @@ class AuthCallbackImpl : public CefAuthCallback {
public:
explicit AuthCallbackImpl(base::WeakPtr<LoginDelegate> delegate)
: delegate_(delegate),
task_runner_(base::SequencedTaskRunnerHandle::Get()) {}
task_runner_(base::SequencedTaskRunner::GetCurrentDefault()) {}
AuthCallbackImpl(const AuthCallbackImpl&) = delete;
AuthCallbackImpl& operator=(const AuthCallbackImpl&) = delete;

8
libcef/browser/net_service/proxy_url_loader_factory.cc
View File

@@ -760,8 +760,8 @@ void InterceptedRequest::InterceptResponseReceived(
current_response_->headers = headers;
current_response_->encoded_data_length = headers->raw_headers().length();
current_response_->content_length = current_response_->encoded_body_length =
0;
current_response_->content_length = 0;
current_response_->encoded_body_length = 0;
std::string origin;
if (request_.headers.GetHeader(net::HttpRequestHeaders::kOrigin, &origin) &&
@@ -917,8 +917,8 @@ net::RedirectInfo InterceptedRequest::MakeRedirectResponseAndInfo(
net::HttpRequestHeaders::kContentType);
// Clear the Content-Length values.
current_response_->content_length = current_response_->encoded_body_length =
0;
current_response_->content_length = 0;
current_response_->encoded_body_length = 0;
current_response_->headers->RemoveHeader(
net::HttpRequestHeaders::kContentLength);

2
libcef/browser/net_service/proxy_url_loader_factory.h
View File

@@ -8,8 +8,8 @@
#include "libcef/browser/net_service/stream_reader_url_loader.h"
#include "base/callback.h"
#include "base/containers/unique_ptr_adapters.h"
#include "base/functional/callback.h"
#include "base/hash/hash.h"
#include "base/strings/string_piece.h"
#include "content/public/browser/content_browser_client.h"

9
libcef/browser/net_service/resource_handler_wrapper.cc
View File

@@ -20,7 +20,8 @@ class SkipCallbackWrapper : public CefResourceSkipCallback {
public:
explicit SkipCallbackWrapper(InputStream::SkipCallback callback)
: callback_(std::move(callback)),
work_thread_task_runner_(base::SequencedTaskRunnerHandle::Get()) {}
work_thread_task_runner_(
base::SequencedTaskRunner::GetCurrentDefault()) {}
SkipCallbackWrapper(const SkipCallbackWrapper&) = delete;
SkipCallbackWrapper& operator=(const SkipCallbackWrapper&) = delete;
@@ -59,7 +60,8 @@ class ReadCallbackWrapper : public CefResourceReadCallback {
public:
explicit ReadCallbackWrapper(InputStream::ReadCallback callback)
: callback_(std::move(callback)),
work_thread_task_runner_(base::SequencedTaskRunnerHandle::Get()) {}
work_thread_task_runner_(
base::SequencedTaskRunner::GetCurrentDefault()) {}
ReadCallbackWrapper(const ReadCallbackWrapper&) = delete;
ReadCallbackWrapper& operator=(const ReadCallbackWrapper&) = delete;
@@ -314,7 +316,8 @@ class OpenCallbackWrapper : public CefCallback {
std::unique_ptr<InputStreamWrapper> stream)
: callback_(std::move(callback)),
stream_(std::move(stream)),
work_thread_task_runner_(base::SequencedTaskRunnerHandle::Get()) {}
work_thread_task_runner_(
base::SequencedTaskRunner::GetCurrentDefault()) {}
OpenCallbackWrapper(const OpenCallbackWrapper&) = delete;
OpenCallbackWrapper& operator=(const OpenCallbackWrapper&) = delete;

3
libcef/browser/net_service/resource_request_handler_wrapper.cc
View File

@@ -48,7 +48,8 @@ class RequestCallbackWrapper : public CefCallback {
using Callback = base::OnceCallback<void(bool /* allow */)>;
explicit RequestCallbackWrapper(Callback callback)
: callback_(std::move(callback)),
work_thread_task_runner_(base::SequencedTaskRunnerHandle::Get()) {}
work_thread_task_runner_(
base::SequencedTaskRunner::GetCurrentDefault()) {}
RequestCallbackWrapper(const RequestCallbackWrapper&) = delete;
RequestCallbackWrapper& operator=(const RequestCallbackWrapper&) = delete;

2
libcef/browser/net_service/resource_request_handler_wrapper.h
View File

@@ -5,7 +5,7 @@
#ifndef CEF_LIBCEF_BROWSER_NET_SERVICE_RESOURCE_REQUEST_HANDLER_WRAPPER_H_
#define CEF_LIBCEF_BROWSER_NET_SERVICE_RESOURCE_REQUEST_HANDLER_WRAPPER_H_
#include "base/callback_forward.h"
#include "base/functional/callback_forward.h"
#include "content/public/browser/web_contents.h"
namespace content {

2
libcef/browser/net_service/response_filter_wrapper.h
View File

@@ -7,7 +7,7 @@
#include "include/cef_response_filter.h"
#include "base/callback_forward.h"
#include "base/functional/callback_forward.h"
#include "mojo/public/cpp/system/data_pipe.h"
namespace net_service {

19
libcef/browser/net_service/stream_reader_url_loader.cc
View File

@@ -8,14 +8,14 @@
#include "libcef/browser/thread_util.h"
#include "libcef/common/net_service/net_service_util.h"
#include "base/bind.h"
#include "base/callback.h"
#include "base/functional/bind.h"
#include "base/functional/callback.h"
#include "base/strings/string_number_conversions.h"
#include "base/strings/string_util.h"
#include "base/strings/stringprintf.h"
#include "base/task/single_thread_task_runner.h"
#include "base/task/thread_pool.h"
#include "base/threading/thread.h"
#include "base/threading/thread_task_runner_handle.h"
#include "content/public/browser/browser_thread.h"
#include "net/base/io_buffer.h"
#include "net/http/http_status_code.h"
@@ -45,7 +45,7 @@ class OpenInputStreamWrapper
OnInputStreamOpenedCallback callback) {
scoped_refptr<OpenInputStreamWrapper> wrapper = new OpenInputStreamWrapper(
std::move(delegate), work_thread_task_runner,
base::ThreadTaskRunnerHandle::Get(), std::move(callback));
base::SingleThreadTaskRunner::GetCurrentDefault(), std::move(callback));
wrapper->Start(request_id, request);
return wrapper->GetCancelCallback();
@@ -242,7 +242,8 @@ InputStreamReader::InputStreamReader(
scoped_refptr<base::SequencedTaskRunner> work_thread_task_runner)
: stream_(std::move(stream)),
work_thread_task_runner_(work_thread_task_runner),
job_thread_task_runner_(base::ThreadTaskRunnerHandle::Get()) {
job_thread_task_runner_(
base::SingleThreadTaskRunner::GetCurrentDefault()) {
CEF_REQUIRE_IOT();
DCHECK(stream_);
DCHECK(work_thread_task_runner_);
@@ -485,7 +486,7 @@ StreamReaderURLLoader::StreamReaderURLLoader(
response_delegate_(std::move(response_delegate)),
writable_handle_watcher_(FROM_HERE,
mojo::SimpleWatcher::ArmingPolicy::MANUAL,
base::SequencedTaskRunnerHandle::Get()),
base::SequencedTaskRunner::GetCurrentDefault()),
weak_factory_(this) {
DCHECK(response_delegate_);
// If there is a client error, clean up the request.
@@ -696,8 +697,8 @@ void StreamReaderURLLoader::ContinueWithResponseHeaders(
const auto has_redirect_url = redirect_url && !redirect_url->is_empty();
if (has_redirect_url || pending_headers->IsRedirect(&location)) {
pending_response->encoded_data_length = header_length_;
pending_response->content_length = pending_response->encoded_body_length =
0;
pending_response->content_length = 0;
pending_response->encoded_body_length = 0;
const GURL new_location =
has_redirect_url ? *redirect_url : request_.url.Resolve(location);
client_->OnReceiveRedirect(
@@ -794,7 +795,7 @@ void StreamReaderURLLoader::OnReaderReadCompleted(int bytes_read) {
client_->OnTransferSizeUpdated(bytes_read);
total_bytes_read_ += bytes_read;
base::ThreadTaskRunnerHandle::Get()->PostTask(
base::SingleThreadTaskRunner::GetCurrentDefault()->PostTask(
FROM_HERE, base::BindOnce(&StreamReaderURLLoader::ReadMore,
weak_factory_.GetWeakPtr()));
}

2
libcef/browser/net_service/stream_reader_url_loader.h
View File

@@ -8,7 +8,7 @@
#include <map>
#include "base/callback.h"
#include "base/functional/callback.h"
#include "base/threading/thread_checker.h"
#include "mojo/public/cpp/bindings/remote.h"
#include "mojo/public/cpp/system/simple_watcher.h"

4
libcef/browser/net_service/url_loader_factory_getter.cc
View File

@@ -8,7 +8,7 @@
#include "libcef/browser/thread_util.h"
#include "libcef/common/app_manager.h"
#include "base/threading/thread_task_runner_handle.h"
#include "base/task/single_thread_task_runner.h"
#include "content/browser/devtools/devtools_instrumentation.h"
#include "content/browser/renderer_host/render_frame_host_impl.h"
#include "content/public/browser/browser_context.h"
@@ -90,7 +90,7 @@ scoped_refptr<network::SharedURLLoaderFactory>
URLLoaderFactoryGetter::GetURLLoaderFactory() {
// On first call we associate with the current thread.
if (!task_runner_) {
task_runner_ = base::ThreadTaskRunnerHandle::Get();
task_runner_ = base::SingleThreadTaskRunner::GetCurrentDefault();
} else {
DCHECK(task_runner_->RunsTasksInCurrentSequence());
}