| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2013 Google Inc. All rights reserved. | 2 * Copyright (C) 2013 Google Inc. All rights reserved. |
| 3 * | 3 * |
| 4 * Redistribution and use in source and binary forms, with or without | 4 * Redistribution and use in source and binary forms, with or without |
| 5 * modification, are permitted provided that the following conditions are | 5 * modification, are permitted provided that the following conditions are |
| 6 * met: | 6 * met: |
| 7 * | 7 * |
| 8 * * Redistributions of source code must retain the above copyright | 8 * * Redistributions of source code must retain the above copyright |
| 9 * notice, this list of conditions and the following disclaimer. | 9 * notice, this list of conditions and the following disclaimer. |
| 10 * * Redistributions in binary form must reproduce the above | 10 * * Redistributions in binary form must reproduce the above |
| (...skipping 546 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 557 V8DOMActivityLogger* activityLogger = nullptr; | 557 V8DOMActivityLogger* activityLogger = nullptr; |
| 558 if (fetchInitiatorName == FetchInitiatorTypeNames::xmlhttprequest) { | 558 if (fetchInitiatorName == FetchInitiatorTypeNames::xmlhttprequest) { |
| 559 activityLogger = V8DOMActivityLogger::currentActivityLogger(); | 559 activityLogger = V8DOMActivityLogger::currentActivityLogger(); |
| 560 } else { | 560 } else { |
| 561 activityLogger = | 561 activityLogger = |
| 562 V8DOMActivityLogger::currentActivityLoggerIfIsolatedWorld(); | 562 V8DOMActivityLogger::currentActivityLoggerIfIsolatedWorld(); |
| 563 } | 563 } |
| 564 | 564 |
| 565 if (activityLogger) { | 565 if (activityLogger) { |
| 566 Vector<String> argv; | 566 Vector<String> argv; |
| 567 argv.append(Resource::resourceTypeToString(type, fetchInitiatorName)); | 567 argv.push_back(Resource::resourceTypeToString(type, fetchInitiatorName)); |
| 568 argv.append(request.url()); | 568 argv.append(request.url()); |
| 569 activityLogger->logEvent("blinkRequestResource", argv.size(), | 569 activityLogger->logEvent("blinkRequestResource", argv.size(), |
| 570 argv.data()); | 570 argv.data()); |
| 571 } | 571 } |
| 572 } | 572 } |
| 573 } | 573 } |
| 574 | 574 |
| 575 void FrameFetchContext::didLoadResource(Resource* resource) { | 575 void FrameFetchContext::didLoadResource(Resource* resource) { |
| 576 if (resource->isLoadEventBlockingResourceType()) | 576 if (resource->isLoadEventBlockingResourceType()) |
| 577 frame()->loader().checkCompleted(); | 577 frame()->loader().checkCompleted(); |
| (...skipping 462 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1040 response); | 1040 response); |
| 1041 } | 1041 } |
| 1042 | 1042 |
| 1043 DEFINE_TRACE(FrameFetchContext) { | 1043 DEFINE_TRACE(FrameFetchContext) { |
| 1044 visitor->trace(m_document); | 1044 visitor->trace(m_document); |
| 1045 visitor->trace(m_documentLoader); | 1045 visitor->trace(m_documentLoader); |
| 1046 FetchContext::trace(visitor); | 1046 FetchContext::trace(visitor); |
| 1047 } | 1047 } |
| 1048 | 1048 |
| 1049 } // namespace blink | 1049 } // namespace blink |
| OLD | NEW |