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 163 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
174 // FIXME: It's unfortunate that the cache layer and below get to know anythi
ng about fragment identifiers. | 174 // FIXME: It's unfortunate that the cache layer and below get to know anythi
ng about fragment identifiers. |
175 // We should look into removing the expectation of that knowledge from the p
latform network stacks. | 175 // We should look into removing the expectation of that knowledge from the p
latform network stacks. |
176 ResourceRequest request(m_resourceRequest); | 176 ResourceRequest request(m_resourceRequest); |
177 if (!m_fragmentIdentifierForRequest.isNull()) { | 177 if (!m_fragmentIdentifierForRequest.isNull()) { |
178 KURL url = request.url(); | 178 KURL url = request.url(); |
179 url.setFragmentIdentifier(m_fragmentIdentifierForRequest); | 179 url.setFragmentIdentifier(m_fragmentIdentifierForRequest); |
180 request.setURL(url); | 180 request.setURL(url); |
181 m_fragmentIdentifierForRequest = String(); | 181 m_fragmentIdentifierForRequest = String(); |
182 } | 182 } |
183 | 183 |
184 m_loader = ResourceLoader::create(cachedResourceLoader->documentLoader(), th
is, request, options); | 184 m_loader = ResourceLoader::create(cachedResourceLoader, this, request, optio
ns); |
185 if (!m_loader) { | 185 if (!m_loader) { |
186 failBeforeStarting(); | 186 failBeforeStarting(); |
187 return; | 187 return; |
188 } | 188 } |
189 m_status = Pending; | 189 m_status = Pending; |
190 } | 190 } |
191 | 191 |
192 void CachedResource::checkNotify() | 192 void CachedResource::checkNotify() |
193 { | 193 { |
194 if (isLoading()) | 194 if (isLoading()) |
(...skipping 622 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
817 if (m_callbackTimer.isActive()) | 817 if (m_callbackTimer.isActive()) |
818 m_callbackTimer.stop(); | 818 m_callbackTimer.stop(); |
819 } | 819 } |
820 | 820 |
821 void CachedResource::CachedResourceCallback::timerFired(Timer<CachedResourceCall
back>*) | 821 void CachedResource::CachedResourceCallback::timerFired(Timer<CachedResourceCall
back>*) |
822 { | 822 { |
823 m_resource->didAddClient(m_client); | 823 m_resource->didAddClient(m_client); |
824 } | 824 } |
825 | 825 |
826 } | 826 } |
OLD | NEW |