| 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 358 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 369 } | 369 } |
| 370 | 370 |
| 371 ResourcePtr<RawResource> ResourceFetcher::fetchRawResource(FetchRequest& request
) | 371 ResourcePtr<RawResource> ResourceFetcher::fetchRawResource(FetchRequest& request
) |
| 372 { | 372 { |
| 373 ASSERT(request.resourceRequest().requestContext() != WebURLRequest::RequestC
ontextUnspecified); | 373 ASSERT(request.resourceRequest().requestContext() != WebURLRequest::RequestC
ontextUnspecified); |
| 374 return toRawResource(requestResource(Resource::Raw, request)); | 374 return toRawResource(requestResource(Resource::Raw, request)); |
| 375 } | 375 } |
| 376 | 376 |
| 377 ResourcePtr<RawResource> ResourceFetcher::fetchMainResource(FetchRequest& reques
t, const SubstituteData& substituteData) | 377 ResourcePtr<RawResource> ResourceFetcher::fetchMainResource(FetchRequest& reques
t, const SubstituteData& substituteData) |
| 378 { | 378 { |
| 379 ASSERT(request.resourceRequest().frameType() != WebURLRequest::FrameTypeNone
); |
| 379 if (substituteData.isValid()) | 380 if (substituteData.isValid()) |
| 380 preCacheSubstituteDataForMainResource(request, substituteData); | 381 preCacheSubstituteDataForMainResource(request, substituteData); |
| 381 return toRawResource(requestResource(Resource::MainResource, request)); | 382 return toRawResource(requestResource(Resource::MainResource, request)); |
| 382 } | 383 } |
| 383 | 384 |
| 384 ResourcePtr<RawResource> ResourceFetcher::fetchMedia(FetchRequest& request) | 385 ResourcePtr<RawResource> ResourceFetcher::fetchMedia(FetchRequest& request) |
| 385 { | 386 { |
| 386 return toRawResource(requestResource(Resource::Media, request)); | 387 return toRawResource(requestResource(Resource::Media, request)); |
| 387 } | 388 } |
| 388 | 389 |
| (...skipping 1133 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1522 } | 1523 } |
| 1523 } | 1524 } |
| 1524 | 1525 |
| 1525 void ResourceFetcher::trace(Visitor* visitor) | 1526 void ResourceFetcher::trace(Visitor* visitor) |
| 1526 { | 1527 { |
| 1527 visitor->trace(m_document); | 1528 visitor->trace(m_document); |
| 1528 ResourceLoaderHost::trace(visitor); | 1529 ResourceLoaderHost::trace(visitor); |
| 1529 } | 1530 } |
| 1530 | 1531 |
| 1531 } | 1532 } |
| OLD | NEW |