| 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 342 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 353 return currentAge(response, responseTimestamp) <= freshnessLifetime(response
, responseTimestamp); | 353 return currentAge(response, responseTimestamp) <= freshnessLifetime(response
, responseTimestamp); |
| 354 } | 354 } |
| 355 | 355 |
| 356 const ResourceRequest& Resource::lastResourceRequest() const | 356 const ResourceRequest& Resource::lastResourceRequest() const |
| 357 { | 357 { |
| 358 if (!m_redirectChain.size()) | 358 if (!m_redirectChain.size()) |
| 359 return m_resourceRequest; | 359 return m_resourceRequest; |
| 360 return m_redirectChain.last().m_request; | 360 return m_redirectChain.last().m_request; |
| 361 } | 361 } |
| 362 | 362 |
| 363 void Resource::willSendRequest(ResourceRequest& request, const ResourceResponse&
response) | 363 void Resource::willFollowRedirect(ResourceRequest& newRequest, const ResourceRes
ponse& redirectResponse) |
| 364 { | 364 { |
| 365 m_redirectChain.append(RedirectPair(request, response)); | 365 m_redirectChain.append(RedirectPair(newRequest, redirectResponse)); |
| 366 m_requestedFromNetworkingLayer = true; | 366 m_requestedFromNetworkingLayer = true; |
| 367 } | 367 } |
| 368 | 368 |
| 369 bool Resource::unlock() | 369 bool Resource::unlock() |
| 370 { | 370 { |
| 371 if (!m_data) | 371 if (!m_data) |
| 372 return false; | 372 return false; |
| 373 | 373 |
| 374 if (!m_data->isLocked()) | 374 if (!m_data->isLocked()) |
| 375 return true; | 375 return true; |
| (...skipping 631 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1007 return "ImportResource"; | 1007 return "ImportResource"; |
| 1008 case Resource::Media: | 1008 case Resource::Media: |
| 1009 return "Media"; | 1009 return "Media"; |
| 1010 } | 1010 } |
| 1011 ASSERT_NOT_REACHED(); | 1011 ASSERT_NOT_REACHED(); |
| 1012 return "Unknown"; | 1012 return "Unknown"; |
| 1013 } | 1013 } |
| 1014 #endif // !LOG_DISABLED | 1014 #endif // !LOG_DISABLED |
| 1015 | 1015 |
| 1016 } | 1016 } |
| OLD | NEW |