Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(470)

Unified Diff: third_party/WebKit/Source/core/fetch/ResourceFetcher.cpp

Issue 2578983002: Loading: move V8DOMActivityLogger dependency from core/fetch (Closed)
Patch Set: merge 2572373003/#ps20001 Created 4 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: third_party/WebKit/Source/core/fetch/ResourceFetcher.cpp
diff --git a/third_party/WebKit/Source/core/fetch/ResourceFetcher.cpp b/third_party/WebKit/Source/core/fetch/ResourceFetcher.cpp
index 75a10138695dd95f2cbed592f670964c097d269b..c54af6ad8fec55508eed67811bc6b180dbc13796 100644
--- a/third_party/WebKit/Source/core/fetch/ResourceFetcher.cpp
+++ b/third_party/WebKit/Source/core/fetch/ResourceFetcher.cpp
@@ -27,7 +27,6 @@
#include "core/fetch/ResourceFetcher.h"
-#include "bindings/core/v8/V8DOMActivityLogger.h"
#include "core/fetch/FetchContext.h"
#include "core/fetch/FetchInitiatorTypeNames.h"
#include "core/fetch/MemoryCache.h"
@@ -491,30 +490,11 @@ Resource* ResourceFetcher::requestResource(
}
context().willStartLoadingResource(
- identifier, request.mutableResourceRequest(), factory.type());
+ identifier, request.mutableResourceRequest(), factory.type(),
+ request.options().initiatorInfo.name, request.forPreload());
if (!request.url().isValid())
return nullptr;
- if (!request.forPreload()) {
- V8DOMActivityLogger* activityLogger = nullptr;
- if (request.options().initiatorInfo.name ==
- FetchInitiatorTypeNames::xmlhttprequest) {
- activityLogger = V8DOMActivityLogger::currentActivityLogger();
- } else {
- activityLogger =
- V8DOMActivityLogger::currentActivityLoggerIfIsolatedWorld();
- }
-
- if (activityLogger) {
- Vector<String> argv;
- argv.append(Resource::resourceTypeToString(
- factory.type(), request.options().initiatorInfo.name));
- argv.append(request.url());
- activityLogger->logEvent("blinkRequestResource", argv.size(),
- argv.data());
- }
- }
-
bool isDataUrl = request.resourceRequest().url().protocolIsData();
bool isStaticData = isDataUrl || substituteData.isValid() || m_archive;
Resource* resource(nullptr);

Powered by Google App Engine
This is Rietveld 408576698