Chromium Code Reviews| 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 315 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 326 } | 326 } |
| 327 | 327 |
| 328 ResourcePtr<Resource> ResourceFetcher::fetchLinkResource(Resource::Type type, Fe tchRequest& request) | 328 ResourcePtr<Resource> ResourceFetcher::fetchLinkResource(Resource::Type type, Fe tchRequest& request) |
| 329 { | 329 { |
| 330 ASSERT(type == Resource::LinkPrefetch || type == Resource::LinkSubresource); | 330 ASSERT(type == Resource::LinkPrefetch || type == Resource::LinkSubresource); |
| 331 ASSERT(request.resourceRequest().frameType() == WebURLRequest::FrameTypeNone ); | 331 ASSERT(request.resourceRequest().frameType() == WebURLRequest::FrameTypeNone ); |
| 332 request.mutableResourceRequest().setRequestContext(type == Resource::LinkPre fetch ? WebURLRequest::RequestContextPrefetch : WebURLRequest::RequestContextSub resource); | 332 request.mutableResourceRequest().setRequestContext(type == Resource::LinkPre fetch ? WebURLRequest::RequestContextPrefetch : WebURLRequest::RequestContextSub resource); |
| 333 return requestResource(type, request); | 333 return requestResource(type, request); |
| 334 } | 334 } |
| 335 | 335 |
| 336 ResourcePtr<Resource> ResourceFetcher::fetchLinkPreloadResource(Resource::Type t ype, FetchRequest& request) | |
| 337 { | |
| 338 ASSERT(request.resourceRequest().frameType() == WebURLRequest::FrameTypeNone ); | |
|
Mike West
2015/04/07 06:26:28
Should this have a matching `preload` context as w
Yoav Weiss
2015/04/07 07:26:14
Quite possible. Do you think it should be part of
Mike West
2015/04/07 12:23:01
If you already know that you need the context, the
| |
| 339 determineRequestContext(request.mutableResourceRequest(), type); | |
| 340 return requestResource(type, request); | |
| 341 } | |
| 342 | |
| 336 ResourcePtr<RawResource> ResourceFetcher::fetchRawResource(FetchRequest& request ) | 343 ResourcePtr<RawResource> ResourceFetcher::fetchRawResource(FetchRequest& request ) |
| 337 { | 344 { |
| 338 ASSERT(request.resourceRequest().frameType() == WebURLRequest::FrameTypeNone ); | 345 ASSERT(request.resourceRequest().frameType() == WebURLRequest::FrameTypeNone ); |
| 339 ASSERT(request.resourceRequest().requestContext() != WebURLRequest::RequestC ontextUnspecified); | 346 ASSERT(request.resourceRequest().requestContext() != WebURLRequest::RequestC ontextUnspecified); |
| 340 return toRawResource(requestResource(Resource::Raw, request)); | 347 return toRawResource(requestResource(Resource::Raw, request)); |
| 341 } | 348 } |
| 342 | 349 |
| 343 ResourcePtr<RawResource> ResourceFetcher::fetchMainResource(FetchRequest& reques t, const SubstituteData& substituteData) | 350 ResourcePtr<RawResource> ResourceFetcher::fetchMainResource(FetchRequest& reques t, const SubstituteData& substituteData) |
| 344 { | 351 { |
| 345 ASSERT(request.resourceRequest().frameType() != WebURLRequest::FrameTypeNone ); | 352 ASSERT(request.resourceRequest().frameType() != WebURLRequest::FrameTypeNone ); |
| (...skipping 944 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1290 ResourceLoaderHost::trace(visitor); | 1297 ResourceLoaderHost::trace(visitor); |
| 1291 } | 1298 } |
| 1292 | 1299 |
| 1293 ResourceFetcher* ResourceFetcher::toResourceFetcher(ResourceLoaderHost* host) | 1300 ResourceFetcher* ResourceFetcher::toResourceFetcher(ResourceLoaderHost* host) |
| 1294 { | 1301 { |
| 1295 ASSERT(host->objectType() == ResourceLoaderHost::ResourceFetcherType); | 1302 ASSERT(host->objectType() == ResourceLoaderHost::ResourceFetcherType); |
| 1296 return static_cast<ResourceFetcher*>(host); | 1303 return static_cast<ResourceFetcher*>(host); |
| 1297 } | 1304 } |
| 1298 | 1305 |
| 1299 } | 1306 } |
| OLD | NEW |