| 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) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All
rights reserved. | 5 Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All
rights reserved. |
| 6 Copyright (C) 2009 Torch Mobile Inc. http://www.torchmobile.com/ | 6 Copyright (C) 2009 Torch Mobile Inc. http://www.torchmobile.com/ |
| 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 580 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 591 return true; | 591 return true; |
| 592 if (resource->stillNeedsLoad()) | 592 if (resource->stillNeedsLoad()) |
| 593 return true; | 593 return true; |
| 594 return request.options().synchronousPolicy == RequestSynchronously && resour
ce->isLoading(); | 594 return request.options().synchronousPolicy == RequestSynchronously && resour
ce->isLoading(); |
| 595 } | 595 } |
| 596 | 596 |
| 597 ResourcePtr<Resource> ResourceFetcher::requestResource(Resource::Type type, Fetc
hRequest& request) | 597 ResourcePtr<Resource> ResourceFetcher::requestResource(Resource::Type type, Fetc
hRequest& request) |
| 598 { | 598 { |
| 599 ASSERT(request.options().synchronousPolicy == RequestAsynchronously || type
== Resource::Raw); | 599 ASSERT(request.options().synchronousPolicy == RequestAsynchronously || type
== Resource::Raw); |
| 600 | 600 |
| 601 TRACE_EVENT0("webkit", "ResourceFetcher::requestResource"); |
| 602 |
| 601 KURL url = request.resourceRequest().url(); | 603 KURL url = request.resourceRequest().url(); |
| 602 | 604 |
| 603 WTF_LOG(ResourceLoading, "ResourceFetcher::requestResource '%s', charset '%s
', priority=%d, forPreload=%u, type=%s", url.elidedString().latin1().data(), req
uest.charset().latin1().data(), request.priority(), request.forPreload(), Resour
ceTypeName(type)); | 605 WTF_LOG(ResourceLoading, "ResourceFetcher::requestResource '%s', charset '%s
', priority=%d, forPreload=%u, type=%s", url.elidedString().latin1().data(), req
uest.charset().latin1().data(), request.priority(), request.forPreload(), Resour
ceTypeName(type)); |
| 604 | 606 |
| 605 // If only the fragment identifiers differ, it is the same resource. | 607 // If only the fragment identifiers differ, it is the same resource. |
| 606 url = MemoryCache::removeFragmentIdentifierIfNeeded(url); | 608 url = MemoryCache::removeFragmentIdentifierIfNeeded(url); |
| 607 | 609 |
| 608 if (!url.isValid()) | 610 if (!url.isValid()) |
| 609 return 0; | 611 return 0; |
| 610 | 612 |
| (...skipping 784 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1395 case Revalidate: | 1397 case Revalidate: |
| 1396 ++m_revalidateCount; | 1398 ++m_revalidateCount; |
| 1397 return; | 1399 return; |
| 1398 case Use: | 1400 case Use: |
| 1399 ++m_useCount; | 1401 ++m_useCount; |
| 1400 return; | 1402 return; |
| 1401 } | 1403 } |
| 1402 } | 1404 } |
| 1403 | 1405 |
| 1404 } | 1406 } |
| OLD | NEW |