| 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 1377 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1388 } | 1388 } |
| 1389 | 1389 |
| 1390 void ResourceFetcher::willTerminateResourceLoader(ResourceLoader* loader) | 1390 void ResourceFetcher::willTerminateResourceLoader(ResourceLoader* loader) |
| 1391 { | 1391 { |
| 1392 if (m_loaders && m_loaders->contains(loader)) | 1392 if (m_loaders && m_loaders->contains(loader)) |
| 1393 m_loaders->remove(loader); | 1393 m_loaders->remove(loader); |
| 1394 else if (m_nonBlockingLoaders && m_nonBlockingLoaders->contains(loader)) | 1394 else if (m_nonBlockingLoaders && m_nonBlockingLoaders->contains(loader)) |
| 1395 m_nonBlockingLoaders->remove(loader); | 1395 m_nonBlockingLoaders->remove(loader); |
| 1396 else | 1396 else |
| 1397 ASSERT_NOT_REACHED(); | 1397 ASSERT_NOT_REACHED(); |
| 1398 | |
| 1399 if (LocalFrame* frame = this->frame()) | |
| 1400 frame->loader().checkLoadComplete(); | |
| 1401 } | 1398 } |
| 1402 | 1399 |
| 1403 void ResourceFetcher::willStartLoadingResource(Resource* resource, ResourceReque
st& request) | 1400 void ResourceFetcher::willStartLoadingResource(Resource* resource, ResourceReque
st& request) |
| 1404 { | 1401 { |
| 1405 if (m_documentLoader) | 1402 if (m_documentLoader) |
| 1406 m_documentLoader->applicationCacheHost()->willStartLoadingResource(reque
st); | 1403 m_documentLoader->applicationCacheHost()->willStartLoadingResource(reque
st); |
| 1407 | 1404 |
| 1408 storeResourceTimingInitiatorInformation(resource); | 1405 storeResourceTimingInitiatorInformation(resource); |
| 1409 TRACE_EVENT_ASYNC_BEGIN2("net", "Resource", resource, "url", resource->url()
.string().ascii(), "priority", resource->resourceRequest().priority()); | 1406 TRACE_EVENT_ASYNC_BEGIN2("net", "Resource", resource, "url", resource->url()
.string().ascii(), "priority", resource->resourceRequest().priority()); |
| 1410 } | 1407 } |
| (...skipping 164 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1575 | 1572 |
| 1576 void ResourceFetcher::trace(Visitor* visitor) | 1573 void ResourceFetcher::trace(Visitor* visitor) |
| 1577 { | 1574 { |
| 1578 visitor->trace(m_document); | 1575 visitor->trace(m_document); |
| 1579 visitor->trace(m_loaders); | 1576 visitor->trace(m_loaders); |
| 1580 visitor->trace(m_nonBlockingLoaders); | 1577 visitor->trace(m_nonBlockingLoaders); |
| 1581 ResourceLoaderHost::trace(visitor); | 1578 ResourceLoaderHost::trace(visitor); |
| 1582 } | 1579 } |
| 1583 | 1580 |
| 1584 } | 1581 } |
| OLD | NEW |