Update to Chromium version 91.0.4472.0 (#870763)

This commit is contained in:
Marshall Greenblatt
2021-04-20 18:52:34 -04:00
parent b189c7b472
commit ae4f68f695
193 changed files with 1381 additions and 1897 deletions

View File

@@ -461,16 +461,12 @@ void AlloyContentRendererClient::DevToolsAgentDetached() {
browser_manager_->DevToolsAgentDetached();
}
std::unique_ptr<content::URLLoaderThrottleProvider>
std::unique_ptr<blink::URLLoaderThrottleProvider>
AlloyContentRendererClient::CreateURLLoaderThrottleProvider(
content::URLLoaderThrottleProviderType provider_type) {
blink::URLLoaderThrottleProviderType provider_type) {
return std::make_unique<CefURLLoaderThrottleProviderImpl>(provider_type);
}
bool AlloyContentRendererClient::RequiresHtmlImports(const GURL& url) {
return url.SchemeIs(content::kChromeUIScheme);
}
void AlloyContentRendererClient::GetInterface(
const std::string& interface_name,
mojo::ScopedMessagePipeHandle interface_pipe) {

View File

@@ -104,10 +104,9 @@ class AlloyContentRendererClient
void RunScriptsAtDocumentIdle(content::RenderFrame* render_frame) override;
void DevToolsAgentAttached() override;
void DevToolsAgentDetached() override;
std::unique_ptr<content::URLLoaderThrottleProvider>
std::unique_ptr<blink::URLLoaderThrottleProvider>
CreateURLLoaderThrottleProvider(
content::URLLoaderThrottleProviderType provider_type) override;
bool RequiresHtmlImports(const GURL& url) override;
blink::URLLoaderThrottleProviderType provider_type) override;
// service_manager::LocalInterfaceProvider implementation.
void GetInterface(const std::string& name,

View File

@@ -18,7 +18,7 @@
#include "third_party/blink/public/platform/web_url.h"
CefURLLoaderThrottleProviderImpl::CefURLLoaderThrottleProviderImpl(
content::URLLoaderThrottleProviderType type)
blink::URLLoaderThrottleProviderType type)
: type_(type) {
DETACH_FROM_THREAD(thread_checker_);
}
@@ -33,19 +33,19 @@ CefURLLoaderThrottleProviderImpl::CefURLLoaderThrottleProviderImpl(
DETACH_FROM_THREAD(thread_checker_);
}
std::unique_ptr<content::URLLoaderThrottleProvider>
std::unique_ptr<blink::URLLoaderThrottleProvider>
CefURLLoaderThrottleProviderImpl::Clone() {
DCHECK_CALLED_ON_VALID_THREAD(thread_checker_);
return base::WrapUnique(new CefURLLoaderThrottleProviderImpl(*this));
}
std::vector<std::unique_ptr<blink::URLLoaderThrottle>>
blink::WebVector<std::unique_ptr<blink::URLLoaderThrottle>>
CefURLLoaderThrottleProviderImpl::CreateThrottles(
int render_frame_id,
const blink::WebURLRequest& request) {
DCHECK_CALLED_ON_VALID_THREAD(thread_checker_);
std::vector<std::unique_ptr<blink::URLLoaderThrottle>> throttles;
blink::WebVector<std::unique_ptr<blink::URLLoaderThrottle>> throttles;
const network::mojom::RequestDestination request_destination =
request.GetRequestDestination();
@@ -56,9 +56,9 @@ CefURLLoaderThrottleProviderImpl::CreateThrottles(
blink::IsRequestDestinationFrame(request_destination);
DCHECK(!is_frame_resource ||
type_ == content::URLLoaderThrottleProviderType::kFrame);
type_ == blink::URLLoaderThrottleProviderType::kFrame);
throttles.push_back(std::make_unique<GoogleURLLoaderThrottle>(
throttles.emplace_back(std::make_unique<GoogleURLLoaderThrottle>(
AlloyRenderThreadObserver::GetDynamicParams()));
return throttles;

View File

@@ -9,21 +9,21 @@
#include <vector>
#include "base/threading/thread_checker.h"
#include "content/public/renderer/url_loader_throttle_provider.h"
#include "third_party/blink/public/platform/url_loader_throttle_provider.h"
// Instances must be constructed on the render thread, and then used and
// destructed on a single thread, which can be different from the render thread.
class CefURLLoaderThrottleProviderImpl
: public content::URLLoaderThrottleProvider {
: public blink::URLLoaderThrottleProvider {
public:
explicit CefURLLoaderThrottleProviderImpl(
content::URLLoaderThrottleProviderType type);
blink::URLLoaderThrottleProviderType type);
~CefURLLoaderThrottleProviderImpl() override;
// content::URLLoaderThrottleProvider implementation.
std::unique_ptr<content::URLLoaderThrottleProvider> Clone() override;
std::vector<std::unique_ptr<blink::URLLoaderThrottle>> CreateThrottles(
// blink::URLLoaderThrottleProvider implementation.
std::unique_ptr<blink::URLLoaderThrottleProvider> Clone() override;
blink::WebVector<std::unique_ptr<blink::URLLoaderThrottle>> CreateThrottles(
int render_frame_id,
const blink::WebURLRequest& request) override;
void SetOnline(bool is_online) override;
@@ -34,7 +34,7 @@ class CefURLLoaderThrottleProviderImpl
CefURLLoaderThrottleProviderImpl(
const CefURLLoaderThrottleProviderImpl& other);
content::URLLoaderThrottleProviderType type_;
blink::URLLoaderThrottleProviderType type_;
THREAD_CHECKER(thread_checker_);