| 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 24 matching lines...) Expand all Loading... |
| 35 #include "CachedResourceLoader.h" | 35 #include "CachedResourceLoader.h" |
| 36 #include "CachedResourceRequest.h" | 36 #include "CachedResourceRequest.h" |
| 37 #include "CrossOriginAccessControl.h" | 37 #include "CrossOriginAccessControl.h" |
| 38 #include "CrossOriginPreflightResultCache.h" | 38 #include "CrossOriginPreflightResultCache.h" |
| 39 #include "Document.h" | 39 #include "Document.h" |
| 40 #include "DocumentThreadableLoaderClient.h" | 40 #include "DocumentThreadableLoaderClient.h" |
| 41 #include "Frame.h" | 41 #include "Frame.h" |
| 42 #include "FrameLoader.h" | 42 #include "FrameLoader.h" |
| 43 #include "InspectorInstrumentation.h" | 43 #include "InspectorInstrumentation.h" |
| 44 #include "ProgressTracker.h" | 44 #include "ProgressTracker.h" |
| 45 #include "ResourceError.h" | |
| 46 #include "ResourceLoader.h" | 45 #include "ResourceLoader.h" |
| 47 #include "ResourceRequest.h" | |
| 48 #include "SchemeRegistry.h" | 46 #include "SchemeRegistry.h" |
| 49 #include "SecurityOrigin.h" | 47 #include "SecurityOrigin.h" |
| 50 #include "ThreadableLoaderClient.h" | 48 #include "ThreadableLoaderClient.h" |
| 49 #include "core/platform/network/ResourceError.h" |
| 50 #include "core/platform/network/ResourceRequest.h" |
| 51 #include <wtf/Assertions.h> | 51 #include <wtf/Assertions.h> |
| 52 #include <wtf/UnusedParam.h> | 52 #include <wtf/UnusedParam.h> |
| 53 | 53 |
| 54 namespace WebCore { | 54 namespace WebCore { |
| 55 | 55 |
| 56 void DocumentThreadableLoader::loadResourceSynchronously(Document* document, con
st ResourceRequest& request, ThreadableLoaderClient& client, const ThreadableLoa
derOptions& options) | 56 void DocumentThreadableLoader::loadResourceSynchronously(Document* document, con
st ResourceRequest& request, ThreadableLoaderClient& client, const ThreadableLoa
derOptions& options) |
| 57 { | 57 { |
| 58 // The loader will be deleted as soon as this function exits. | 58 // The loader will be deleted as soon as this function exits. |
| 59 RefPtr<DocumentThreadableLoader> loader = adoptRef(new DocumentThreadableLoa
der(document, &client, LoadSynchronously, request, options)); | 59 RefPtr<DocumentThreadableLoader> loader = adoptRef(new DocumentThreadableLoa
der(document, &client, LoadSynchronously, request, options)); |
| 60 ASSERT(loader->hasOneRef()); | 60 ASSERT(loader->hasOneRef()); |
| (...skipping 367 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 428 | 428 |
| 429 return m_sameOriginRequest && securityOrigin()->canRequest(url); | 429 return m_sameOriginRequest && securityOrigin()->canRequest(url); |
| 430 } | 430 } |
| 431 | 431 |
| 432 SecurityOrigin* DocumentThreadableLoader::securityOrigin() const | 432 SecurityOrigin* DocumentThreadableLoader::securityOrigin() const |
| 433 { | 433 { |
| 434 return m_options.securityOrigin ? m_options.securityOrigin.get() : m_documen
t->securityOrigin(); | 434 return m_options.securityOrigin ? m_options.securityOrigin.get() : m_documen
t->securityOrigin(); |
| 435 } | 435 } |
| 436 | 436 |
| 437 } // namespace WebCore | 437 } // namespace WebCore |
| OLD | NEW |