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 537 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
548 | 548 |
549 return true; | 549 return true; |
550 } | 550 } |
551 | 551 |
552 bool ResourceFetcher::shouldLoadNewResource() const | 552 bool ResourceFetcher::shouldLoadNewResource() const |
553 { | 553 { |
554 if (!frame()) | 554 if (!frame()) |
555 return false; | 555 return false; |
556 if (!m_documentLoader) | 556 if (!m_documentLoader) |
557 return true; | 557 return true; |
558 return m_documentLoader == frame()->loader().activeDocumentLoader(); | 558 if (m_documentLoader == frame()->loader().activeDocumentLoader()) |
| 559 return true; |
| 560 return document() && document()->pageDismissalEventBeingDispatched() != Docu
ment::NoDismissal; |
559 } | 561 } |
560 | 562 |
561 bool ResourceFetcher::resourceNeedsLoad(Resource* resource, const FetchRequest&
request, RevalidationPolicy policy) | 563 bool ResourceFetcher::resourceNeedsLoad(Resource* resource, const FetchRequest&
request, RevalidationPolicy policy) |
562 { | 564 { |
563 if (FetchRequest::DeferredByClient == request.defer()) | 565 if (FetchRequest::DeferredByClient == request.defer()) |
564 return false; | 566 return false; |
565 if (policy != Use) | 567 if (policy != Use) |
566 return true; | 568 return true; |
567 if (resource->stillNeedsLoad()) | 569 if (resource->stillNeedsLoad()) |
568 return true; | 570 return true; |
(...skipping 751 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1320 } | 1322 } |
1321 #endif | 1323 #endif |
1322 | 1324 |
1323 const ResourceLoaderOptions& ResourceFetcher::defaultResourceOptions() | 1325 const ResourceLoaderOptions& ResourceFetcher::defaultResourceOptions() |
1324 { | 1326 { |
1325 DEFINE_STATIC_LOCAL(ResourceLoaderOptions, options, (SendCallbacks, SniffCon
tent, BufferData, AllowStoredCredentials, ClientRequestedCredentials, AskClientF
orCrossOriginCredentials, DoSecurityCheck, CheckContentSecurityPolicy, DocumentC
ontext)); | 1327 DEFINE_STATIC_LOCAL(ResourceLoaderOptions, options, (SendCallbacks, SniffCon
tent, BufferData, AllowStoredCredentials, ClientRequestedCredentials, AskClientF
orCrossOriginCredentials, DoSecurityCheck, CheckContentSecurityPolicy, DocumentC
ontext)); |
1326 return options; | 1328 return options; |
1327 } | 1329 } |
1328 | 1330 |
1329 } | 1331 } |
OLD | NEW |