Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(82)

Side by Side Diff: third_party/WebKit/Source/core/loader/FrameFetchContext.cpp

Issue 2842253002: Move ReportLocalLoadFailed to ExecutionContext (Closed)
Patch Set: Revert ResourceLoader changes, handle main resource redirect in DocumentLoader Created 3 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2013 Google Inc. All rights reserved. 2 * Copyright (C) 2013 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 730 matching lines...) Expand 10 before | Expand all | Expand 10 after
741 } 741 }
742 742
743 void FrameFetchContext::DispatchDidBlockRequest( 743 void FrameFetchContext::DispatchDidBlockRequest(
744 const ResourceRequest& resource_request, 744 const ResourceRequest& resource_request,
745 const FetchInitiatorInfo& fetch_initiator_info, 745 const FetchInitiatorInfo& fetch_initiator_info,
746 ResourceRequestBlockedReason blocked_reason) const { 746 ResourceRequestBlockedReason blocked_reason) const {
747 probe::didBlockRequest(GetFrame(), resource_request, MasterDocumentLoader(), 747 probe::didBlockRequest(GetFrame(), resource_request, MasterDocumentLoader(),
748 fetch_initiator_info, blocked_reason); 748 fetch_initiator_info, blocked_reason);
749 } 749 }
750 750
751 void FrameFetchContext::ReportLocalLoadFailed(const KURL& url) const {
752 FrameLoader::ReportLocalLoadFailed(GetFrame(), url.ElidedString());
753 }
754
755 bool FrameFetchContext::ShouldBypassMainWorldCSP() const { 751 bool FrameFetchContext::ShouldBypassMainWorldCSP() const {
756 return GetFrame()->GetScriptController().ShouldBypassMainWorldCSP(); 752 return GetFrame()->GetScriptController().ShouldBypassMainWorldCSP();
757 } 753 }
758 754
759 bool FrameFetchContext::IsSVGImageChromeClient() const { 755 bool FrameFetchContext::IsSVGImageChromeClient() const {
760 return GetFrame()->GetChromeClient().IsSVGImageChromeClient(); 756 return GetFrame()->GetChromeClient().IsSVGImageChromeClient();
761 } 757 }
762 758
763 void FrameFetchContext::CountUsage(UseCounter::Feature feature) const { 759 void FrameFetchContext::CountUsage(UseCounter::Feature feature) const {
764 UseCounter::Count(GetFrame(), feature); 760 UseCounter::Count(GetFrame(), feature);
(...skipping 14 matching lines...) Expand all
779 std::unique_ptr<WebURLLoader> FrameFetchContext::CreateURLLoader() { 775 std::unique_ptr<WebURLLoader> FrameFetchContext::CreateURLLoader() {
780 return GetFrame()->CreateURLLoader(); 776 return GetFrame()->CreateURLLoader();
781 } 777 }
782 778
783 DEFINE_TRACE(FrameFetchContext) { 779 DEFINE_TRACE(FrameFetchContext) {
784 visitor->Trace(document_loader_); 780 visitor->Trace(document_loader_);
785 BaseFetchContext::Trace(visitor); 781 BaseFetchContext::Trace(visitor);
786 } 782 }
787 783
788 } // namespace blink 784 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/loader/FrameFetchContext.h ('k') | third_party/WebKit/Source/core/loader/FrameLoader.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698