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

Side by Side Diff: Source/core/fetch/ResourceFetcher.cpp

Issue 1175383005: Add the requested url to requestResource trace event (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: rebase Created 5 years, 6 months 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 21 matching lines...) Expand all
32 #include "core/fetch/FetchContext.h" 32 #include "core/fetch/FetchContext.h"
33 #include "core/fetch/FetchInitiatorTypeNames.h" 33 #include "core/fetch/FetchInitiatorTypeNames.h"
34 #include "core/fetch/MemoryCache.h" 34 #include "core/fetch/MemoryCache.h"
35 #include "core/fetch/ResourceLoader.h" 35 #include "core/fetch/ResourceLoader.h"
36 #include "core/fetch/ResourceLoaderSet.h" 36 #include "core/fetch/ResourceLoaderSet.h"
37 #include "core/fetch/UniqueIdentifier.h" 37 #include "core/fetch/UniqueIdentifier.h"
38 #include "core/timing/ResourceTimingInfo.h" 38 #include "core/timing/ResourceTimingInfo.h"
39 #include "platform/Logging.h" 39 #include "platform/Logging.h"
40 #include "platform/RuntimeEnabledFeatures.h" 40 #include "platform/RuntimeEnabledFeatures.h"
41 #include "platform/TraceEvent.h" 41 #include "platform/TraceEvent.h"
42 #include "platform/TracedValue.h"
42 #include "platform/mhtml/ArchiveResource.h" 43 #include "platform/mhtml/ArchiveResource.h"
43 #include "platform/mhtml/ArchiveResourceCollection.h" 44 #include "platform/mhtml/ArchiveResourceCollection.h"
44 #include "platform/weborigin/KnownPorts.h" 45 #include "platform/weborigin/KnownPorts.h"
45 #include "platform/weborigin/SecurityOrigin.h" 46 #include "platform/weborigin/SecurityOrigin.h"
46 #include "platform/weborigin/SecurityPolicy.h" 47 #include "platform/weborigin/SecurityPolicy.h"
47 #include "public/platform/Platform.h" 48 #include "public/platform/Platform.h"
48 #include "public/platform/WebURL.h" 49 #include "public/platform/WebURL.h"
49 #include "public/platform/WebURLRequest.h" 50 #include "public/platform/WebURLRequest.h"
50 #include "wtf/text/CString.h" 51 #include "wtf/text/CString.h"
51 #include "wtf/text/WTFString.h" 52 #include "wtf/text/WTFString.h"
(...skipping 191 matching lines...) Expand 10 before | Expand all | Expand 10 after
243 if (!m_resourceTimingReportTimer.isActive()) 244 if (!m_resourceTimingReportTimer.isActive())
244 m_resourceTimingReportTimer.startOneShot(0, FROM_HERE); 245 m_resourceTimingReportTimer.startOneShot(0, FROM_HERE);
245 } 246 }
246 247
247 if (m_validatedURLs.size() >= kMaxValidatedURLsSize) { 248 if (m_validatedURLs.size() >= kMaxValidatedURLsSize) {
248 m_validatedURLs.clear(); 249 m_validatedURLs.clear();
249 } 250 }
250 m_validatedURLs.add(request.resourceRequest().url()); 251 m_validatedURLs.add(request.resourceRequest().url());
251 } 252 }
252 253
254 static PassRefPtr<TraceEvent::ConvertableToTraceFormat> urlForTraceEvent(const K URL& url)
255 {
256 RefPtr<TracedValue> value = TracedValue::create();
257 value->setString("url", url.string());
258 return value.release();
259 }
260
253 ResourcePtr<Resource> ResourceFetcher::requestResource(FetchRequest& request, co nst ResourceFactory& factory) 261 ResourcePtr<Resource> ResourceFetcher::requestResource(FetchRequest& request, co nst ResourceFactory& factory)
254 { 262 {
255 ASSERT(request.options().synchronousPolicy == RequestAsynchronously || facto ry.type() == Resource::Raw); 263 ASSERT(request.options().synchronousPolicy == RequestAsynchronously || facto ry.type() == Resource::Raw);
256 264
257 TRACE_EVENT0("blink", "ResourceFetcher::requestResource");
258
259 context().upgradeInsecureRequest(request); 265 context().upgradeInsecureRequest(request);
260 context().addClientHintsIfNecessary(request); 266 context().addClientHintsIfNecessary(request);
261 context().addCSPHeaderIfNecessary(factory.type(), request); 267 context().addCSPHeaderIfNecessary(factory.type(), request);
262 268
263 KURL url = request.resourceRequest().url(); 269 KURL url = request.resourceRequest().url();
270 TRACE_EVENT1("blink", "ResourceFetcher::requestResource", "url", urlForTrace Event(url));
264 271
265 WTF_LOG(ResourceLoading, "ResourceFetcher::requestResource '%s', charset '%s ', priority=%d, forPreload=%u, type=%s", url.elidedString().latin1().data(), req uest.charset().latin1().data(), request.priority(), request.forPreload(), Resour ceTypeName(factory.type())); 272 WTF_LOG(ResourceLoading, "ResourceFetcher::requestResource '%s', charset '%s ', priority=%d, forPreload=%u, type=%s", url.elidedString().latin1().data(), req uest.charset().latin1().data(), request.priority(), request.forPreload(), Resour ceTypeName(factory.type()));
266 273
267 // If only the fragment identifiers differ, it is the same resource. 274 // If only the fragment identifiers differ, it is the same resource.
268 url = MemoryCache::removeFragmentIdentifierIfNeeded(url); 275 url = MemoryCache::removeFragmentIdentifierIfNeeded(url);
269 276
270 if (!url.isValid()) 277 if (!url.isValid())
271 return nullptr; 278 return nullptr;
272 279
273 if (!context().canRequest(factory.type(), request.resourceRequest(), url, re quest.options(), request.forPreload(), request.originRestriction())) 280 if (!context().canRequest(factory.type(), request.resourceRequest(), url, re quest.options(), request.forPreload(), request.originRestriction()))
(...skipping 778 matching lines...) Expand 10 before | Expand all | Expand 10 after
1052 1059
1053 DEFINE_TRACE(ResourceFetcher) 1060 DEFINE_TRACE(ResourceFetcher)
1054 { 1061 {
1055 visitor->trace(m_context); 1062 visitor->trace(m_context);
1056 visitor->trace(m_archiveResourceCollection); 1063 visitor->trace(m_archiveResourceCollection);
1057 visitor->trace(m_loaders); 1064 visitor->trace(m_loaders);
1058 visitor->trace(m_nonBlockingLoaders); 1065 visitor->trace(m_nonBlockingLoaders);
1059 } 1066 }
1060 1067
1061 } 1068 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698