| 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 337 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 348 | 348 |
| 349 // If only the fragment identifiers differ, it is the same resource. | 349 // If only the fragment identifiers differ, it is the same resource. |
| 350 url = MemoryCache::removeFragmentIdentifierIfNeeded(url); | 350 url = MemoryCache::removeFragmentIdentifierIfNeeded(url); |
| 351 | 351 |
| 352 if (!url.isValid()) | 352 if (!url.isValid()) |
| 353 return nullptr; | 353 return nullptr; |
| 354 | 354 |
| 355 if (!context().canRequest(factory.type(), request.resourceRequest(), url, re
quest.options(), request.forPreload(), request.originRestriction())) | 355 if (!context().canRequest(factory.type(), request.resourceRequest(), url, re
quest.options(), request.forPreload(), request.originRestriction())) |
| 356 return nullptr; | 356 return nullptr; |
| 357 | 357 |
| 358 context().dispatchWillRequestResource(&request); | |
| 359 | |
| 360 if (!request.forPreload()) { | 358 if (!request.forPreload()) { |
| 361 V8DOMActivityLogger* activityLogger = nullptr; | 359 V8DOMActivityLogger* activityLogger = nullptr; |
| 362 if (request.options().initiatorInfo.name == FetchInitiatorTypeNames::xml
httprequest) | 360 if (request.options().initiatorInfo.name == FetchInitiatorTypeNames::xml
httprequest) |
| 363 activityLogger = V8DOMActivityLogger::currentActivityLogger(); | 361 activityLogger = V8DOMActivityLogger::currentActivityLogger(); |
| 364 else | 362 else |
| 365 activityLogger = V8DOMActivityLogger::currentActivityLoggerIfIsolate
dWorld(); | 363 activityLogger = V8DOMActivityLogger::currentActivityLoggerIfIsolate
dWorld(); |
| 366 | 364 |
| 367 if (activityLogger) { | 365 if (activityLogger) { |
| 368 Vector<String> argv; | 366 Vector<String> argv; |
| 369 argv.append(Resource::resourceTypeToString(factory.type(), request.o
ptions().initiatorInfo)); | 367 argv.append(Resource::resourceTypeToString(factory.type(), request.o
ptions().initiatorInfo)); |
| (...skipping 777 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1147 visitor->trace(m_archiveResourceCollection); | 1145 visitor->trace(m_archiveResourceCollection); |
| 1148 visitor->trace(m_loaders); | 1146 visitor->trace(m_loaders); |
| 1149 visitor->trace(m_nonBlockingLoaders); | 1147 visitor->trace(m_nonBlockingLoaders); |
| 1150 #if ENABLE(OILPAN) | 1148 #if ENABLE(OILPAN) |
| 1151 visitor->trace(m_preloads); | 1149 visitor->trace(m_preloads); |
| 1152 visitor->trace(m_resourceTimingInfoMap); | 1150 visitor->trace(m_resourceTimingInfoMap); |
| 1153 #endif | 1151 #endif |
| 1154 } | 1152 } |
| 1155 | 1153 |
| 1156 } | 1154 } |
| OLD | NEW |