Chromium Code Reviews| 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 * | 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 13 matching lines...) Expand all Loading... | |
| 24 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, | 24 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, | 
| 25 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY | 25 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY | 
| 26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | 26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | 
| 27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | 27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | 
| 28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 
| 29 */ | 29 */ | 
| 30 | 30 | 
| 31 #include "config.h" | 31 #include "config.h" | 
| 32 #include "core/loader/DocumentThreadableLoader.h" | 32 #include "core/loader/DocumentThreadableLoader.h" | 
| 33 | 33 | 
| 34 #include "bindings/v8/ScriptController.h" | |
| 35 #include "core/dom/Document.h" | 34 #include "core/dom/Document.h" | 
| 36 #include "core/inspector/InspectorInstrumentation.h" | 35 #include "core/inspector/InspectorInstrumentation.h" | 
| 37 #include "core/loader/CrossOriginAccessControl.h" | 36 #include "core/loader/CrossOriginAccessControl.h" | 
| 38 #include "core/loader/CrossOriginPreflightResultCache.h" | 37 #include "core/loader/CrossOriginPreflightResultCache.h" | 
| 39 #include "core/loader/DocumentThreadableLoaderClient.h" | 38 #include "core/loader/DocumentThreadableLoaderClient.h" | 
| 40 #include "core/loader/FrameLoader.h" | 39 #include "core/loader/FrameLoader.h" | 
| 41 #include "core/loader/ProgressTracker.h" | |
| 42 #include "core/loader/ResourceLoader.h" | 40 #include "core/loader/ResourceLoader.h" | 
| 43 #include "core/loader/ThreadableLoaderClient.h" | 41 #include "core/loader/ThreadableLoaderClient.h" | 
| 44 #include "core/loader/cache/CachedRawResource.h" | 42 #include "core/loader/cache/CachedRawResource.h" | 
| 45 #include "core/loader/cache/CachedResourceLoader.h" | 43 #include "core/loader/cache/CachedResourceLoader.h" | 
| 46 #include "core/loader/cache/CachedResourceRequest.h" | 44 #include "core/loader/cache/CachedResourceRequest.h" | 
| 47 #include "core/loader/cache/CachedResourceRequestInitiators.h" | |
| 48 #include "core/page/ContentSecurityPolicy.h" | 45 #include "core/page/ContentSecurityPolicy.h" | 
| 49 #include "core/page/Frame.h" | 46 #include "core/page/Frame.h" | 
| 50 #include "core/platform/network/ResourceError.h" | 47 #include "core/platform/network/ResourceError.h" | 
| 51 #include "core/platform/network/ResourceRequest.h" | 48 #include "core/platform/network/ResourceRequest.h" | 
| 52 #include "weborigin/SchemeRegistry.h" | 49 #include "weborigin/SchemeRegistry.h" | 
| 53 #include "weborigin/SecurityOrigin.h" | 50 #include "weborigin/SecurityOrigin.h" | 
| 54 #include "wtf/Assertions.h" | 51 #include "wtf/Assertions.h" | 
| 55 #include "wtf/UnusedParam.h" | |
| 
 
pdr.
2013/06/04 04:59:15
I think this is still needed.
 
Timothy Loh
2013/06/04 05:29:57
ASSERT_UNUSED actually comes from Assertions.h. Un
 
 | |
| 56 | 52 | 
| 57 namespace WebCore { | 53 namespace WebCore { | 
| 58 | 54 | 
| 59 void DocumentThreadableLoader::loadResourceSynchronously(Document* document, con st ResourceRequest& request, ThreadableLoaderClient& client, const ThreadableLoa derOptions& options) | 55 void DocumentThreadableLoader::loadResourceSynchronously(Document* document, con st ResourceRequest& request, ThreadableLoaderClient& client, const ThreadableLoa derOptions& options) | 
| 60 { | 56 { | 
| 61 // The loader will be deleted as soon as this function exits. | 57 // The loader will be deleted as soon as this function exits. | 
| 62 RefPtr<DocumentThreadableLoader> loader = adoptRef(new DocumentThreadableLoa der(document, &client, LoadSynchronously, request, options)); | 58 RefPtr<DocumentThreadableLoader> loader = adoptRef(new DocumentThreadableLoa der(document, &client, LoadSynchronously, request, options)); | 
| 63 ASSERT(loader->hasOneRef()); | 59 ASSERT(loader->hasOneRef()); | 
| 64 } | 60 } | 
| 65 | 61 | 
| (...skipping 391 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 457 return true; | 453 return true; | 
| 458 return m_document->contentSecurityPolicy()->allowConnectToSource(url); | 454 return m_document->contentSecurityPolicy()->allowConnectToSource(url); | 
| 459 } | 455 } | 
| 460 | 456 | 
| 461 SecurityOrigin* DocumentThreadableLoader::securityOrigin() const | 457 SecurityOrigin* DocumentThreadableLoader::securityOrigin() const | 
| 462 { | 458 { | 
| 463 return m_options.securityOrigin ? m_options.securityOrigin.get() : m_documen t->securityOrigin(); | 459 return m_options.securityOrigin ? m_options.securityOrigin.get() : m_documen t->securityOrigin(); | 
| 464 } | 460 } | 
| 465 | 461 | 
| 466 } // namespace WebCore | 462 } // namespace WebCore | 
| OLD | NEW |