mirror of
https://bitbucket.org/chromiumembedded/cef
synced 2024-12-13 10:06:28 +01:00
5ef0fb8ac8
- SSE3 is now required on x86 processors (see https://crbug.com/1123353).
37 lines
1.6 KiB
Diff
37 lines
1.6 KiB
Diff
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 {
|
|
class Context;
|
|
class RequestPeerImpl;
|
|
|
|
- void Cancel();
|
|
-
|
|
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
|