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

Side by Side Diff: third_party/WebKit/Source/platform/loader/fetch/ResourceFetcher.cpp

Issue 2776523005: Plumbing devtools agent host id and request id between processes (Closed)
Patch Set: Full plumbing Created 3 years, 8 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
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 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 504 matching lines...) Expand 10 before | Expand all | Expand 10 after
515 515
516 resourceRequest.setAllowStoredCredentials( 516 resourceRequest.setAllowStoredCredentials(
517 request.options().allowCredentials == AllowStoredCredentials); 517 request.options().allowCredentials == AllowStoredCredentials);
518 return Continue; 518 return Continue;
519 } 519 }
520 520
521 Resource* ResourceFetcher::requestResource( 521 Resource* ResourceFetcher::requestResource(
522 FetchRequest& request, 522 FetchRequest& request,
523 const ResourceFactory& factory, 523 const ResourceFactory& factory,
524 const SubstituteData& substituteData) { 524 const SubstituteData& substituteData) {
525 unsigned long identifier = createUniqueIdentifier();
526 ResourceRequest& resourceRequest = request.mutableResourceRequest(); 525 ResourceRequest& resourceRequest = request.mutableResourceRequest();
526 unsigned browserGeneratedRequestId =
527 resourceRequest.browserGeneratedRequestId();
528
529 // If set browserGeneratedRequestId should be an odd number.
530 DCHECK(browserGeneratedRequestId == 0 || browserGeneratedRequestId & 1);
531 // We use even numbers for blink generated fetch identifiers so we can
532 // distinguish between them and make sure there are no collisions.
533 unsigned long identifier = browserGeneratedRequestId
534 ? browserGeneratedRequestId
535 : createUniqueIdentifier() * 2;
527 network_instrumentation::ScopedResourceLoadTracker scopedResourceLoadTracker( 536 network_instrumentation::ScopedResourceLoadTracker scopedResourceLoadTracker(
528 identifier, resourceRequest); 537 identifier, resourceRequest);
529 SCOPED_BLINK_UMA_HISTOGRAM_TIMER("Blink.Fetch.RequestResourceTime"); 538 SCOPED_BLINK_UMA_HISTOGRAM_TIMER("Blink.Fetch.RequestResourceTime");
530 // TODO(dproy): Remove this. http://crbug.com/659666 539 // TODO(dproy): Remove this. http://crbug.com/659666
531 TRACE_EVENT1("blink", "ResourceFetcher::requestResource", "url", 540 TRACE_EVENT1("blink", "ResourceFetcher::requestResource", "url",
532 urlForTraceEvent(request.url())); 541 urlForTraceEvent(request.url()));
533 542
534 Resource* resource = nullptr; 543 Resource* resource = nullptr;
535 ResourceRequestBlockedReason blockedReason = 544 ResourceRequestBlockedReason blockedReason =
536 ResourceRequestBlockedReason::None; 545 ResourceRequestBlockedReason::None;
(...skipping 1015 matching lines...) Expand 10 before | Expand all | Expand 10 after
1552 visitor->trace(m_context); 1561 visitor->trace(m_context);
1553 visitor->trace(m_archive); 1562 visitor->trace(m_archive);
1554 visitor->trace(m_loaders); 1563 visitor->trace(m_loaders);
1555 visitor->trace(m_nonBlockingLoaders); 1564 visitor->trace(m_nonBlockingLoaders);
1556 visitor->trace(m_documentResources); 1565 visitor->trace(m_documentResources);
1557 visitor->trace(m_preloads); 1566 visitor->trace(m_preloads);
1558 visitor->trace(m_resourceTimingInfoMap); 1567 visitor->trace(m_resourceTimingInfoMap);
1559 } 1568 }
1560 1569
1561 } // namespace blink 1570 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698