OLD | NEW |
1 /* | 1 /* |
2 Copyright (C) 1998 Lars Knoll (knoll@mpi-hd.mpg.de) | 2 Copyright (C) 1998 Lars Knoll (knoll@mpi-hd.mpg.de) |
3 Copyright (C) 2001 Dirk Mueller (mueller@kde.org) | 3 Copyright (C) 2001 Dirk Mueller (mueller@kde.org) |
4 Copyright (C) 2002 Waldo Bastian (bastian@kde.org) | 4 Copyright (C) 2002 Waldo Bastian (bastian@kde.org) |
5 Copyright (C) 2006 Samuel Weinig (sam.weinig@gmail.com) | 5 Copyright (C) 2006 Samuel Weinig (sam.weinig@gmail.com) |
6 Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All
rights reserved. | 6 Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All
rights reserved. |
7 | 7 |
8 This library is free software; you can redistribute it and/or | 8 This library is free software; you can redistribute it and/or |
9 modify it under the terms of the GNU Library General Public | 9 modify it under the terms of the GNU Library General Public |
10 License as published by the Free Software Foundation; either | 10 License as published by the Free Software Foundation; either |
(...skipping 175 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
186 // FIXME: It's unfortunate that the cache layer and below get to know anythi
ng about fragment identifiers. | 186 // FIXME: It's unfortunate that the cache layer and below get to know anythi
ng about fragment identifiers. |
187 // We should look into removing the expectation of that knowledge from the p
latform network stacks. | 187 // We should look into removing the expectation of that knowledge from the p
latform network stacks. |
188 ResourceRequest request(m_resourceRequest); | 188 ResourceRequest request(m_resourceRequest); |
189 if (!m_fragmentIdentifierForRequest.isNull()) { | 189 if (!m_fragmentIdentifierForRequest.isNull()) { |
190 KURL url = request.url(); | 190 KURL url = request.url(); |
191 url.setFragmentIdentifier(m_fragmentIdentifierForRequest); | 191 url.setFragmentIdentifier(m_fragmentIdentifierForRequest); |
192 request.setURL(url); | 192 request.setURL(url); |
193 m_fragmentIdentifierForRequest = String(); | 193 m_fragmentIdentifierForRequest = String(); |
194 } | 194 } |
195 | 195 |
196 m_loader = ResourceLoader::create(cachedResourceLoader->documentLoader(), th
is, request, options); | 196 m_loader = ResourceLoader::create(cachedResourceLoader, this, request, optio
ns); |
197 if (!m_loader) { | 197 if (!m_loader) { |
198 failBeforeStarting(); | 198 failBeforeStarting(); |
199 return; | 199 return; |
200 } | 200 } |
201 m_status = Pending; | 201 m_status = Pending; |
202 } | 202 } |
203 | 203 |
204 void CachedResource::checkNotify() | 204 void CachedResource::checkNotify() |
205 { | 205 { |
206 if (isLoading()) | 206 if (isLoading()) |
(...skipping 647 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
854 info.addMember(m_resourceToRevalidate, "resourceToRevalidate"); | 854 info.addMember(m_resourceToRevalidate, "resourceToRevalidate"); |
855 info.addMember(m_proxyResource, "proxyResource"); | 855 info.addMember(m_proxyResource, "proxyResource"); |
856 info.addMember(m_handlesToRevalidate, "handlesToRevalidate"); | 856 info.addMember(m_handlesToRevalidate, "handlesToRevalidate"); |
857 info.addMember(m_options, "options"); | 857 info.addMember(m_options, "options"); |
858 info.ignoreMember(m_clientsAwaitingCallback); | 858 info.ignoreMember(m_clientsAwaitingCallback); |
859 | 859 |
860 if (m_purgeableData && !m_purgeableData->wasPurged()) | 860 if (m_purgeableData && !m_purgeableData->wasPurged()) |
861 info.addRawBuffer(m_purgeableData.get(), m_purgeableData->size(), "Purge
ableData", "purgeableData"); | 861 info.addRawBuffer(m_purgeableData.get(), m_purgeableData->size(), "Purge
ableData", "purgeableData"); |
862 } | 862 } |
863 } | 863 } |
OLD | NEW |