summaryrefslogtreecommitdiff
path: root/chromium/third_party/blink/renderer/core/loader/subresource_filter.cc
diff options
context:
space:
mode:
Diffstat (limited to 'chromium/third_party/blink/renderer/core/loader/subresource_filter.cc')
-rw-r--r--chromium/third_party/blink/renderer/core/loader/subresource_filter.cc9
1 files changed, 4 insertions, 5 deletions
diff --git a/chromium/third_party/blink/renderer/core/loader/subresource_filter.cc b/chromium/third_party/blink/renderer/core/loader/subresource_filter.cc
index b290e634ba6..1c7168a5ea3 100644
--- a/chromium/third_party/blink/renderer/core/loader/subresource_filter.cc
+++ b/chromium/third_party/blink/renderer/core/loader/subresource_filter.cc
@@ -14,6 +14,7 @@
#include "third_party/blink/renderer/core/inspector/console_message.h"
#include "third_party/blink/renderer/core/loader/document_loader.h"
#include "third_party/blink/renderer/platform/weborigin/kurl.h"
+#include "third_party/blink/renderer/platform/wtf/functional.h"
#include "third_party/blink/renderer/platform/wtf/text/string_builder.h"
namespace blink {
@@ -37,7 +38,8 @@ String GetErrorStringForDisallowedLoad(const KURL& url) {
SubresourceFilter* SubresourceFilter::Create(
ExecutionContext& execution_context,
std::unique_ptr<WebDocumentSubresourceFilter> filter) {
- return new SubresourceFilter(&execution_context, std::move(filter));
+ return MakeGarbageCollected<SubresourceFilter>(&execution_context,
+ std::move(filter));
}
SubresourceFilter::SubresourceFilter(
@@ -50,7 +52,7 @@ SubresourceFilter::SubresourceFilter(
// associated with an ad subframe.
if (auto* document = DynamicTo<Document>(execution_context_.Get())) {
auto* loader = document->Loader();
- if (subresource_filter_->GetIsAssociatedWithAdSubframe()) {
+ if (document->GetFrame()->IsAdSubframe()) {
ReportAdRequestId(loader->GetResponse().RequestId());
}
}
@@ -96,9 +98,6 @@ bool SubresourceFilter::AllowWebSocketConnection(const KURL& url) {
bool SubresourceFilter::IsAdResource(
const KURL& resource_url,
mojom::RequestContextType request_context) {
- if (subresource_filter_->GetIsAssociatedWithAdSubframe())
- return true;
-
WebDocumentSubresourceFilter::LoadPolicy load_policy;
if (last_resource_check_result_.first ==
std::make_pair(resource_url, request_context)) {