| OLD | NEW |
| 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 764 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 775 if (!security_origin->CanRequest(url)) { | 775 if (!security_origin->CanRequest(url)) { |
| 776 PrintAccessDeniedMessage(url); | 776 PrintAccessDeniedMessage(url); |
| 777 return ResourceRequestBlockedReason::kOrigin; | 777 return ResourceRequestBlockedReason::kOrigin; |
| 778 } | 778 } |
| 779 break; | 779 break; |
| 780 } | 780 } |
| 781 | 781 |
| 782 // FIXME: Convert this to check the isolated world's Content Security Policy | 782 // FIXME: Convert this to check the isolated world's Content Security Policy |
| 783 // once webkit.org/b/104520 is solved. | 783 // once webkit.org/b/104520 is solved. |
| 784 bool should_bypass_main_world_csp = | 784 bool should_bypass_main_world_csp = |
| 785 GetFrame()->Script().ShouldBypassMainWorldCSP() || | 785 GetFrame()->GetScriptController().ShouldBypassMainWorldCSP() || |
| 786 options.content_security_policy_option == | 786 options.content_security_policy_option == |
| 787 kDoNotCheckContentSecurityPolicy; | 787 kDoNotCheckContentSecurityPolicy; |
| 788 | 788 |
| 789 if (document_) { | 789 if (document_) { |
| 790 DCHECK(document_->GetContentSecurityPolicy()); | 790 DCHECK(document_->GetContentSecurityPolicy()); |
| 791 if (!should_bypass_main_world_csp && | 791 if (!should_bypass_main_world_csp && |
| 792 !document_->GetContentSecurityPolicy()->AllowRequest( | 792 !document_->GetContentSecurityPolicy()->AllowRequest( |
| 793 resource_request.GetRequestContext(), url, | 793 resource_request.GetRequestContext(), url, |
| 794 options.content_security_policy_nonce, options.integrity_metadata, | 794 options.content_security_policy_nonce, options.integrity_metadata, |
| 795 options.parser_disposition, redirect_status, reporting_policy)) | 795 options.parser_disposition, redirect_status, reporting_policy)) |
| (...skipping 291 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1087 return GetFrame()->FrameScheduler()->LoadingTaskRunner(); | 1087 return GetFrame()->FrameScheduler()->LoadingTaskRunner(); |
| 1088 } | 1088 } |
| 1089 | 1089 |
| 1090 DEFINE_TRACE(FrameFetchContext) { | 1090 DEFINE_TRACE(FrameFetchContext) { |
| 1091 visitor->Trace(document_); | 1091 visitor->Trace(document_); |
| 1092 visitor->Trace(document_loader_); | 1092 visitor->Trace(document_loader_); |
| 1093 FetchContext::Trace(visitor); | 1093 FetchContext::Trace(visitor); |
| 1094 } | 1094 } |
| 1095 | 1095 |
| 1096 } // namespace blink | 1096 } // namespace blink |
| OLD | NEW |