| 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 413 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 424 case Resource::Image: | 424 case Resource::Image: |
| 425 case Resource::CSSStyleSheet: | 425 case Resource::CSSStyleSheet: |
| 426 case Resource::Script: | 426 case Resource::Script: |
| 427 case Resource::Font: | 427 case Resource::Font: |
| 428 case Resource::Raw: | 428 case Resource::Raw: |
| 429 case Resource::LinkPrefetch: | 429 case Resource::LinkPrefetch: |
| 430 case Resource::LinkSubresource: | 430 case Resource::LinkSubresource: |
| 431 case Resource::TextTrack: | 431 case Resource::TextTrack: |
| 432 case Resource::ImportResource: | 432 case Resource::ImportResource: |
| 433 case Resource::Media: | 433 case Resource::Media: |
| 434 case Resource::Manifest: |
| 434 // By default these types of resources can be loaded from any origin. | 435 // By default these types of resources can be loaded from any origin. |
| 435 // FIXME: Are we sure about Resource::Font? | 436 // FIXME: Are we sure about Resource::Font? |
| 436 if (originRestriction == FetchRequest::RestrictToSameOrigin && !security
Origin->canRequest(url)) { | 437 if (originRestriction == FetchRequest::RestrictToSameOrigin && !security
Origin->canRequest(url)) { |
| 437 printAccessDeniedMessage(url); | 438 printAccessDeniedMessage(url); |
| 438 return ResourceRequestBlockedReasonOrigin; | 439 return ResourceRequestBlockedReasonOrigin; |
| 439 } | 440 } |
| 440 break; | 441 break; |
| 441 case Resource::XSLStyleSheet: | 442 case Resource::XSLStyleSheet: |
| 442 ASSERT(RuntimeEnabledFeatures::xsltEnabled()); | 443 ASSERT(RuntimeEnabledFeatures::xsltEnabled()); |
| 443 case Resource::SVGDocument: | 444 case Resource::SVGDocument: |
| (...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 500 ASSERT(ContentSecurityPolicy::isFontResource(resourceRequest)); | 501 ASSERT(ContentSecurityPolicy::isFontResource(resourceRequest)); |
| 501 ASSERT(csp); | 502 ASSERT(csp); |
| 502 if (!shouldBypassMainWorldCSP && !csp->allowFontFromSource(url, redirect
Status, cspReporting)) | 503 if (!shouldBypassMainWorldCSP && !csp->allowFontFromSource(url, redirect
Status, cspReporting)) |
| 503 return ResourceRequestBlockedReasonCSP; | 504 return ResourceRequestBlockedReasonCSP; |
| 504 break; | 505 break; |
| 505 } | 506 } |
| 506 case Resource::MainResource: | 507 case Resource::MainResource: |
| 507 case Resource::Raw: | 508 case Resource::Raw: |
| 508 case Resource::LinkPrefetch: | 509 case Resource::LinkPrefetch: |
| 509 case Resource::LinkSubresource: | 510 case Resource::LinkSubresource: |
| 511 case Resource::Manifest: |
| 510 break; | 512 break; |
| 511 case Resource::Media: | 513 case Resource::Media: |
| 512 case Resource::TextTrack: | 514 case Resource::TextTrack: |
| 513 ASSERT(ContentSecurityPolicy::isMediaResource(resourceRequest)); | 515 ASSERT(ContentSecurityPolicy::isMediaResource(resourceRequest)); |
| 514 ASSERT(csp); | 516 ASSERT(csp); |
| 515 if (!shouldBypassMainWorldCSP && !csp->allowMediaFromSource(url, redirec
tStatus, cspReporting)) | 517 if (!shouldBypassMainWorldCSP && !csp->allowMediaFromSource(url, redirec
tStatus, cspReporting)) |
| 516 return ResourceRequestBlockedReasonCSP; | 518 return ResourceRequestBlockedReasonCSP; |
| 517 | 519 |
| 518 if (!frame()->loader().client()->allowMedia(url)) | 520 if (!frame()->loader().client()->allowMedia(url)) |
| 519 return ResourceRequestBlockedReasonOther; | 521 return ResourceRequestBlockedReasonOther; |
| (...skipping 260 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 780 } | 782 } |
| 781 | 783 |
| 782 DEFINE_TRACE(FrameFetchContext) | 784 DEFINE_TRACE(FrameFetchContext) |
| 783 { | 785 { |
| 784 visitor->trace(m_document); | 786 visitor->trace(m_document); |
| 785 visitor->trace(m_documentLoader); | 787 visitor->trace(m_documentLoader); |
| 786 FetchContext::trace(visitor); | 788 FetchContext::trace(visitor); |
| 787 } | 789 } |
| 788 | 790 |
| 789 } // namespace blink | 791 } // namespace blink |
| OLD | NEW |