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 | 5 Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All |
6 rights reserved. | 6 rights reserved. |
7 Copyright (C) 2009 Torch Mobile Inc. http://www.torchmobile.com/ | 7 Copyright (C) 2009 Torch Mobile Inc. http://www.torchmobile.com/ |
8 | 8 |
9 This library is free software; you can redistribute it and/or | 9 This library is free software; you can redistribute it and/or |
10 modify it under the terms of the GNU Library General Public | 10 modify it under the terms of the GNU Library General Public |
(...skipping 490 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
501 FetchInitiatorTypeNames::xmlhttprequest) { | 501 FetchInitiatorTypeNames::xmlhttprequest) { |
502 activityLogger = V8DOMActivityLogger::currentActivityLogger(); | 502 activityLogger = V8DOMActivityLogger::currentActivityLogger(); |
503 } else { | 503 } else { |
504 activityLogger = | 504 activityLogger = |
505 V8DOMActivityLogger::currentActivityLoggerIfIsolatedWorld(); | 505 V8DOMActivityLogger::currentActivityLoggerIfIsolatedWorld(); |
506 } | 506 } |
507 | 507 |
508 if (activityLogger) { | 508 if (activityLogger) { |
509 Vector<String> argv; | 509 Vector<String> argv; |
510 argv.append(Resource::resourceTypeToString( | 510 argv.append(Resource::resourceTypeToString( |
511 factory.type(), request.options().initiatorInfo)); | 511 factory.type(), request.options().initiatorInfo.name)); |
512 argv.append(request.url()); | 512 argv.append(request.url()); |
513 activityLogger->logEvent("blinkRequestResource", argv.size(), | 513 activityLogger->logEvent("blinkRequestResource", argv.size(), |
514 argv.data()); | 514 argv.data()); |
515 } | 515 } |
516 } | 516 } |
517 | 517 |
518 bool isDataUrl = request.resourceRequest().url().protocolIsData(); | 518 bool isDataUrl = request.resourceRequest().url().protocolIsData(); |
519 bool isStaticData = isDataUrl || substituteData.isValid() || m_archive; | 519 bool isStaticData = isDataUrl || substituteData.isValid() || m_archive; |
520 Resource* resource(nullptr); | 520 Resource* resource(nullptr); |
521 if (isStaticData) { | 521 if (isStaticData) { |
(...skipping 1000 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1522 visitor->trace(m_context); | 1522 visitor->trace(m_context); |
1523 visitor->trace(m_archive); | 1523 visitor->trace(m_archive); |
1524 visitor->trace(m_loaders); | 1524 visitor->trace(m_loaders); |
1525 visitor->trace(m_nonBlockingLoaders); | 1525 visitor->trace(m_nonBlockingLoaders); |
1526 visitor->trace(m_documentResources); | 1526 visitor->trace(m_documentResources); |
1527 visitor->trace(m_preloads); | 1527 visitor->trace(m_preloads); |
1528 visitor->trace(m_resourceTimingInfoMap); | 1528 visitor->trace(m_resourceTimingInfoMap); |
1529 } | 1529 } |
1530 | 1530 |
1531 } // namespace blink | 1531 } // namespace blink |
OLD | NEW |