| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2011, 2012 Google Inc. All rights reserved. | 2 * Copyright (C) 2011, 2012 Google Inc. All rights reserved. |
| 3 * Copyright (C) 2013, Intel Corporation | 3 * Copyright (C) 2013, Intel Corporation |
| 4 * | 4 * |
| 5 * Redistribution and use in source and binary forms, with or without | 5 * Redistribution and use in source and binary forms, with or without |
| 6 * modification, are permitted provided that the following conditions are | 6 * modification, are permitted provided that the following conditions are |
| 7 * met: | 7 * met: |
| 8 * | 8 * |
| 9 * * Redistributions of source code must retain the above copyright | 9 * * Redistributions of source code must retain the above copyright |
| 10 * notice, this list of conditions and the following disclaimer. | 10 * notice, this list of conditions and the following disclaimer. |
| (...skipping 19 matching lines...) Expand all Loading... |
| 30 */ | 30 */ |
| 31 | 31 |
| 32 #include "config.h" | 32 #include "config.h" |
| 33 #include "core/loader/DocumentThreadableLoader.h" | 33 #include "core/loader/DocumentThreadableLoader.h" |
| 34 | 34 |
| 35 #include "core/dom/Document.h" | 35 #include "core/dom/Document.h" |
| 36 #include "core/fetch/CrossOriginAccessControl.h" | 36 #include "core/fetch/CrossOriginAccessControl.h" |
| 37 #include "core/fetch/FetchRequest.h" | 37 #include "core/fetch/FetchRequest.h" |
| 38 #include "core/fetch/Resource.h" | 38 #include "core/fetch/Resource.h" |
| 39 #include "core/fetch/ResourceFetcher.h" | 39 #include "core/fetch/ResourceFetcher.h" |
| 40 #include "core/frame/ContentSecurityPolicy.h" | |
| 41 #include "core/frame/LocalFrame.h" | 40 #include "core/frame/LocalFrame.h" |
| 41 #include "core/frame/csp/ContentSecurityPolicy.h" |
| 42 #include "core/inspector/InspectorInstrumentation.h" | 42 #include "core/inspector/InspectorInstrumentation.h" |
| 43 #include "core/loader/CrossOriginPreflightResultCache.h" | 43 #include "core/loader/CrossOriginPreflightResultCache.h" |
| 44 #include "core/loader/DocumentThreadableLoaderClient.h" | 44 #include "core/loader/DocumentThreadableLoaderClient.h" |
| 45 #include "core/loader/FrameLoader.h" | 45 #include "core/loader/FrameLoader.h" |
| 46 #include "core/loader/ThreadableLoaderClient.h" | 46 #include "core/loader/ThreadableLoaderClient.h" |
| 47 #include "platform/SharedBuffer.h" | 47 #include "platform/SharedBuffer.h" |
| 48 #include "platform/network/ResourceRequest.h" | 48 #include "platform/network/ResourceRequest.h" |
| 49 #include "platform/weborigin/SchemeRegistry.h" | 49 #include "platform/weborigin/SchemeRegistry.h" |
| 50 #include "platform/weborigin/SecurityOrigin.h" | 50 #include "platform/weborigin/SecurityOrigin.h" |
| 51 #include "wtf/Assertions.h" | 51 #include "wtf/Assertions.h" |
| (...skipping 403 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 455 return true; | 455 return true; |
| 456 return m_document->contentSecurityPolicy()->allowConnectToSource(url); | 456 return m_document->contentSecurityPolicy()->allowConnectToSource(url); |
| 457 } | 457 } |
| 458 | 458 |
| 459 SecurityOrigin* DocumentThreadableLoader::securityOrigin() const | 459 SecurityOrigin* DocumentThreadableLoader::securityOrigin() const |
| 460 { | 460 { |
| 461 return m_options.securityOrigin ? m_options.securityOrigin.get() : m_documen
t->securityOrigin(); | 461 return m_options.securityOrigin ? m_options.securityOrigin.get() : m_documen
t->securityOrigin(); |
| 462 } | 462 } |
| 463 | 463 |
| 464 } // namespace WebCore | 464 } // namespace WebCore |
| OLD | NEW |