| Index: third_party/WebKit/Source/core/loader/FrameFetchContext.h
|
| diff --git a/third_party/WebKit/Source/core/loader/FrameFetchContext.h b/third_party/WebKit/Source/core/loader/FrameFetchContext.h
|
| index 1bf5355ad91d8ae7e4645ce9c6885266a3fb8175..833558d26e7d35746f659a5388785e97851b22b3 100644
|
| --- a/third_party/WebKit/Source/core/loader/FrameFetchContext.h
|
| +++ b/third_party/WebKit/Source/core/loader/FrameFetchContext.h
|
| @@ -116,18 +116,6 @@ class CORE_EXPORT FrameFetchContext final : public BaseFetchContext {
|
|
|
| void AddResourceTiming(const ResourceTimingInfo&) override;
|
| bool AllowImage(bool images_enabled, const KURL&) const override;
|
| - ResourceRequestBlockedReason CanRequest(
|
| - Resource::Type,
|
| - const ResourceRequest&,
|
| - const KURL&,
|
| - const ResourceLoaderOptions&,
|
| - SecurityViolationReportingPolicy,
|
| - FetchParameters::OriginRestriction) const override;
|
| - ResourceRequestBlockedReason AllowResponse(
|
| - Resource::Type,
|
| - const ResourceRequest&,
|
| - const KURL&,
|
| - const ResourceLoaderOptions&) const override;
|
|
|
| bool IsControlledByServiceWorker() const override;
|
| int64_t ServiceWorkerID() const override;
|
| @@ -174,19 +162,26 @@ class CORE_EXPORT FrameFetchContext final : public BaseFetchContext {
|
| Document* GetDocument() const;
|
| LocalFrame* GetFrame() const;
|
| LocalFrameClient* GetLocalFrameClient() const;
|
| -
|
| - ContentSettingsClient* GetContentSettingsClient() const;
|
| -
|
| LocalFrame* FrameOfImportsController() const;
|
|
|
| - ResourceRequestBlockedReason CanRequestInternal(
|
| - Resource::Type,
|
| + // BaseFetchContext overrides:
|
| + ContentSettingsClient* GetContentSettingsClient() const override;
|
| + Settings* GetSettings() const override;
|
| + SubresourceFilter* GetSubresourceFilter() const override;
|
| + SecurityContext* GetMainResourceSecurityContext() const override;
|
| + bool ShouldBlockRequestByInspector(const ResourceRequest&) const override;
|
| + void DispatchDidBlockRequest(const ResourceRequest&,
|
| + const FetchInitiatorInfo&,
|
| + ResourceRequestBlockedReason) const override;
|
| + void ReportLocalLoadFailed(const KURL&) const override;
|
| + bool ShouldBypassMainWorldCSP() const override;
|
| + bool IsSVGImageChromeClient() const override;
|
| + void CountUsage(UseCounter::Feature) const override;
|
| + void CountDeprecation(UseCounter::Feature) const override;
|
| + bool ShouldBlockFetchByMixedContentCheck(
|
| const ResourceRequest&,
|
| const KURL&,
|
| - const ResourceLoaderOptions&,
|
| - SecurityViolationReportingPolicy,
|
| - FetchParameters::OriginRestriction,
|
| - ResourceRequest::RedirectStatus) const;
|
| + SecurityViolationReportingPolicy) const override;
|
|
|
| Member<DocumentLoader> document_loader_;
|
| };
|
|
|