| 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 ResourcePtr<RawResource> ResourceFetcher::fetchMainResource(FetchRequest& reques
t, const SubstituteData& substituteData) | 369 ResourcePtr<RawResource> ResourceFetcher::fetchMainResource(FetchRequest& reques
t, const SubstituteData& substituteData) |
| 370 { | 370 { |
| 371 if (substituteData.isValid()) | 371 if (substituteData.isValid()) |
| 372 preCacheSubstituteDataForMainResource(request, substituteData); | 372 preCacheSubstituteDataForMainResource(request, substituteData); |
| 373 return toRawResource(requestResource(Resource::MainResource, request)); | 373 return toRawResource(requestResource(Resource::MainResource, request)); |
| 374 } | 374 } |
| 375 | 375 |
| 376 void ResourceFetcher::preCacheSubstituteDataForMainResource(const FetchRequest&
request, const SubstituteData& substituteData) | 376 void ResourceFetcher::preCacheSubstituteDataForMainResource(const FetchRequest&
request, const SubstituteData& substituteData) |
| 377 { | 377 { |
| 378 const KURL& url = request.url(); | 378 const KURL& url = request.url(); |
| 379 ASSERT(!memoryCache()->resourceForURL(url)); | 379 if (Resource* oldResource = memoryCache()->resourceForURL(url)) |
| 380 memoryCache()->remove(oldResource); |
| 380 | 381 |
| 381 ResourceResponse response(url, substituteData.mimeType(), substituteData.con
tent()->size(), substituteData.textEncoding(), emptyString()); | 382 ResourceResponse response(url, substituteData.mimeType(), substituteData.con
tent()->size(), substituteData.textEncoding(), emptyString()); |
| 382 ResourcePtr<Resource> resource = createResource(Resource::MainResource, requ
est.resourceRequest(), substituteData.textEncoding()); | 383 ResourcePtr<Resource> resource = createResource(Resource::MainResource, requ
est.resourceRequest(), substituteData.textEncoding()); |
| 384 resource->setNeedsSynchronousCacheHit(substituteData.forceSynchronousLoad())
; |
| 383 resource->setOptions(request.options()); | 385 resource->setOptions(request.options()); |
| 384 resource->setDataBufferingPolicy(BufferData); | 386 resource->setDataBufferingPolicy(BufferData); |
| 385 resource->responseReceived(response); | 387 resource->responseReceived(response); |
| 386 if (substituteData.content()->size()) | 388 if (substituteData.content()->size()) |
| 387 resource->setResourceBuffer(substituteData.content()); | 389 resource->setResourceBuffer(substituteData.content()); |
| 388 resource->finish(); | 390 resource->finish(); |
| 389 memoryCache()->add(resource.get()); | 391 memoryCache()->add(resource.get()); |
| 390 } | 392 } |
| 391 | 393 |
| 392 bool ResourceFetcher::checkInsecureContent(Resource::Type type, const KURL& url,
MixedContentBlockingTreatment treatment) const | 394 bool ResourceFetcher::checkInsecureContent(Resource::Type type, const KURL& url,
MixedContentBlockingTreatment treatment) const |
| (...skipping 952 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1345 } | 1347 } |
| 1346 #endif | 1348 #endif |
| 1347 | 1349 |
| 1348 const ResourceLoaderOptions& ResourceFetcher::defaultResourceOptions() | 1350 const ResourceLoaderOptions& ResourceFetcher::defaultResourceOptions() |
| 1349 { | 1351 { |
| 1350 DEFINE_STATIC_LOCAL(ResourceLoaderOptions, options, (SniffContent, BufferDat
a, AllowStoredCredentials, ClientRequestedCredentials, AskClientForCrossOriginCr
edentials, DoSecurityCheck, CheckContentSecurityPolicy, DocumentContext)); | 1352 DEFINE_STATIC_LOCAL(ResourceLoaderOptions, options, (SniffContent, BufferDat
a, AllowStoredCredentials, ClientRequestedCredentials, AskClientForCrossOriginCr
edentials, DoSecurityCheck, CheckContentSecurityPolicy, DocumentContext)); |
| 1351 return options; | 1353 return options; |
| 1352 } | 1354 } |
| 1353 | 1355 |
| 1354 } | 1356 } |
| OLD | NEW |