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

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: Rebased 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 529 matching lines...) Expand 10 before | Expand all | Expand 10 after
540 540
541 resource_request.SetAllowStoredCredentials( 541 resource_request.SetAllowStoredCredentials(
542 request.Options().allow_credentials == kAllowStoredCredentials); 542 request.Options().allow_credentials == kAllowStoredCredentials);
543 return kContinue; 543 return kContinue;
544 } 544 }
545 545
546 Resource* ResourceFetcher::RequestResource( 546 Resource* ResourceFetcher::RequestResource(
547 FetchRequest& request, 547 FetchRequest& request,
548 const ResourceFactory& factory, 548 const ResourceFactory& factory,
549 const SubstituteData& substitute_data) { 549 const SubstituteData& substitute_data) {
550 unsigned long identifier = CreateUniqueIdentifier();
551 ResourceRequest& resource_request = request.MutableResourceRequest(); 550 ResourceRequest& resource_request = request.MutableResourceRequest();
551 int browser_generated_request_id =
552 resource_request.BrowserGeneratedRequestId();
553
554 // If set browser_generated_request_id should be a negative number
555 DCHECK_LE(browser_generated_request_id, 0);
556 // We use positive numbers for blink generated fetch identifiers so we can
557 // distinguish between them and make sure there are no collisions.
558 unsigned long identifier =
559 browser_generated_request_id
560 ? static_cast<unsigned long>(browser_generated_request_id) &
561 0xFFFFFFFF
562 : CreateUniqueIdentifier();
552 network_instrumentation::ScopedResourceLoadTracker 563 network_instrumentation::ScopedResourceLoadTracker
553 scoped_resource_load_tracker(identifier, resource_request); 564 scoped_resource_load_tracker(identifier, resource_request);
554 SCOPED_BLINK_UMA_HISTOGRAM_TIMER("Blink.Fetch.RequestResourceTime"); 565 SCOPED_BLINK_UMA_HISTOGRAM_TIMER("Blink.Fetch.RequestResourceTime");
555 // TODO(dproy): Remove this. http://crbug.com/659666 566 // TODO(dproy): Remove this. http://crbug.com/659666
556 TRACE_EVENT1("blink", "ResourceFetcher::requestResource", "url", 567 TRACE_EVENT1("blink", "ResourceFetcher::requestResource", "url",
557 UrlForTraceEvent(request.Url())); 568 UrlForTraceEvent(request.Url()));
558 569
559 Resource* resource = nullptr; 570 Resource* resource = nullptr;
560 ResourceRequestBlockedReason blocked_reason = 571 ResourceRequestBlockedReason blocked_reason =
561 ResourceRequestBlockedReason::kNone; 572 ResourceRequestBlockedReason::kNone;
(...skipping 1015 matching lines...) Expand 10 before | Expand all | Expand 10 after
1577 visitor->Trace(context_); 1588 visitor->Trace(context_);
1578 visitor->Trace(archive_); 1589 visitor->Trace(archive_);
1579 visitor->Trace(loaders_); 1590 visitor->Trace(loaders_);
1580 visitor->Trace(non_blocking_loaders_); 1591 visitor->Trace(non_blocking_loaders_);
1581 visitor->Trace(document_resources_); 1592 visitor->Trace(document_resources_);
1582 visitor->Trace(preloads_); 1593 visitor->Trace(preloads_);
1583 visitor->Trace(resource_timing_info_map_); 1594 visitor->Trace(resource_timing_info_map_);
1584 } 1595 }
1585 1596
1586 } // namespace blink 1597 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698