| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2011 Google Inc. All Rights Reserved. | 2 * Copyright (C) 2011 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 | 5 * modification, are permitted provided that the following conditions |
| 6 * are met: | 6 * are met: |
| 7 * 1. Redistributions of source code must retain the above copyright | 7 * 1. Redistributions of source code must retain the above copyright |
| 8 * notice, this list of conditions and the following disclaimer. | 8 * notice, this list of conditions and the following disclaimer. |
| 9 * 2. Redistributions in binary form must reproduce the above copyright | 9 * 2. Redistributions in binary form must reproduce the above copyright |
| 10 * notice, this list of conditions and the following disclaimer in the | 10 * notice, this list of conditions and the following disclaimer in the |
| 11 * documentation and/or other materials provided with the distribution. | 11 * documentation and/or other materials provided with the distribution. |
| 12 * | 12 * |
| 13 * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS ``AS IS'' AND ANY | 13 * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS ``AS IS'' AND ANY |
| 14 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | 14 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE |
| 15 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR | 15 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR |
| 16 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR | 16 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR |
| 17 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, | 17 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, |
| 18 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, | 18 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, |
| 19 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR | 19 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR |
| 20 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY | 20 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY |
| 21 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | 21 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
| 22 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | 22 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE |
| 23 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 23 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
| 24 */ | 24 */ |
| 25 | 25 |
| 26 #include "core/fetch/RawResource.h" | 26 #include "platform/loader/fetch/RawResource.h" |
| 27 | 27 |
| 28 #include "core/fetch/FetchRequest.h" | |
| 29 #include "core/fetch/MemoryCache.h" | |
| 30 #include "core/fetch/ResourceClientWalker.h" | |
| 31 #include "core/fetch/ResourceFetcher.h" | |
| 32 #include "core/fetch/ResourceLoader.h" | |
| 33 #include "platform/HTTPNames.h" | 28 #include "platform/HTTPNames.h" |
| 29 #include "platform/loader/fetch/FetchRequest.h" |
| 30 #include "platform/loader/fetch/MemoryCache.h" |
| 31 #include "platform/loader/fetch/ResourceClientWalker.h" |
| 32 #include "platform/loader/fetch/ResourceFetcher.h" |
| 33 #include "platform/loader/fetch/ResourceLoader.h" |
| 34 #include <memory> | 34 #include <memory> |
| 35 | 35 |
| 36 namespace blink { | 36 namespace blink { |
| 37 | 37 |
| 38 RawResource* RawResource::fetchSynchronously(FetchRequest& request, | 38 RawResource* RawResource::fetchSynchronously(FetchRequest& request, |
| 39 ResourceFetcher* fetcher) { | 39 ResourceFetcher* fetcher) { |
| 40 request.makeSynchronous(); | 40 request.makeSynchronous(); |
| 41 return toRawResource( | 41 return toRawResource( |
| 42 fetcher->requestResource(request, RawResourceFactory(Resource::Raw))); | 42 fetcher->requestResource(request, RawResourceFactory(Resource::Raw))); |
| 43 } | 43 } |
| (...skipping 311 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 355 SECURITY_CHECK(m_state != NotAddedAsClient); | 355 SECURITY_CHECK(m_state != NotAddedAsClient); |
| 356 SECURITY_CHECK(m_state != NotifyFinished); | 356 SECURITY_CHECK(m_state != NotifyFinished); |
| 357 SECURITY_CHECK(resource->errorOccurred() || | 357 SECURITY_CHECK(resource->errorOccurred() || |
| 358 (m_state == ResponseReceived || | 358 (m_state == ResponseReceived || |
| 359 m_state == SetSerializedCachedMetadata || | 359 m_state == SetSerializedCachedMetadata || |
| 360 m_state == DataReceived || m_state == DataDownloaded)); | 360 m_state == DataReceived || m_state == DataDownloaded)); |
| 361 m_state = NotifyFinished; | 361 m_state = NotifyFinished; |
| 362 } | 362 } |
| 363 | 363 |
| 364 } // namespace blink | 364 } // namespace blink |
| OLD | NEW |