Update to Chromium version 90.0.4430.0 (#857950)

- Linux ARM builds require use_vaapi=false (see https://crbug.com/1185348)
- Windows official builds require use_thin_lto=false (see https://crbug.com/1177001)
This commit is contained in:
Marshall Greenblatt
2021-03-04 17:36:57 -05:00
parent 1587d6da03
commit 74db00fc89
134 changed files with 1245 additions and 1204 deletions

View File

@@ -1,16 +1,16 @@
diff --git content/renderer/loader/web_url_loader_impl.h content/renderer/loader/web_url_loader_impl.h
index 883a088152d5..578f64c3bdc5 100644
--- content/renderer/loader/web_url_loader_impl.h
+++ content/renderer/loader/web_url_loader_impl.h
@@ -102,6 +102,7 @@ class CONTENT_EXPORT WebURLLoaderImpl : public blink::WebURLLoader {
std::unique_ptr<blink::ResourceLoadInfoNotifierWrapper>
resource_load_info_notifier_wrapper,
blink::WebURLLoaderClient* client) override;
+ void Cancel() override;
void SetDefersLoading(DeferType value) override;
void DidChangePriority(blink::WebURLRequest::Priority new_priority,
int intra_priority_value) override;
@@ -112,8 +113,6 @@ class CONTENT_EXPORT WebURLLoaderImpl : public blink::WebURLLoader {
diff --git third_party/blink/public/platform/web_url_loader.h third_party/blink/public/platform/web_url_loader.h
index 48b95a412fe0..569e8c750e0a 100644
--- third_party/blink/public/platform/web_url_loader.h
+++ third_party/blink/public/platform/web_url_loader.h
@@ -161,12 +161,14 @@ class BLINK_PLATFORM_EXPORT WebURLLoader {
void SetResourceRequestSenderForTesting(
std::unique_ptr<WebResourceRequestSender> resource_request_sender);
+ // Cancels an asynchronous load. This will appear as a load error to
+ // the client.
+ void Cancel();
+
private:
class Context;
class RequestPeerImpl;
@@ -18,19 +18,4 @@ index 883a088152d5..578f64c3bdc5 100644
-
scoped_refptr<Context> context_;
DISALLOW_COPY_AND_ASSIGN(WebURLLoaderImpl);
diff --git third_party/blink/public/platform/web_url_loader.h third_party/blink/public/platform/web_url_loader.h
index 2db7b64b7948..fc77260fc9c0 100644
--- third_party/blink/public/platform/web_url_loader.h
+++ third_party/blink/public/platform/web_url_loader.h
@@ -94,6 +94,10 @@ class WebURLLoader {
std::unique_ptr<ResourceLoadInfoNotifierWrapper>,
WebURLLoaderClient*) = 0;
+ // Cancels an asynchronous load. This will appear as a load error to
+ // the client.
+ virtual void Cancel() {}
+
// |kDeferred| is when an asynchronous load is suspended.
// |kDeferredWithBackForwardCache| is when an asynchronous load is suspended
// with BackForwardCache, and BackForwardCache entry can be evicted when
DISALLOW_COPY_AND_ASSIGN(WebURLLoader);