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

Side by Side Diff: content/browser/loader/resource_dispatcher_host_impl.cc

Issue 1093923003: Change FrameTreeNode id from int64 to int. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Change FrameTreeNode id from int64 to int Created 5 years, 7 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 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 // See http://dev.chromium.org/developers/design-documents/multi-process-resourc e-loading 5 // See http://dev.chromium.org/developers/design-documents/multi-process-resourc e-loading
6 6
7 #include "content/browser/loader/resource_dispatcher_host_impl.h" 7 #include "content/browser/loader/resource_dispatcher_host_impl.h"
8 8
9 #include <algorithm> 9 #include <algorithm>
10 #include <set> 10 #include <set>
(...skipping 1832 matching lines...) Expand 10 before | Expand all | Expand 10 after
1843 } 1843 }
1844 1844
1845 void ResourceDispatcherHostImpl::FinishedWithResourcesForRequest( 1845 void ResourceDispatcherHostImpl::FinishedWithResourcesForRequest(
1846 net::URLRequest* request) { 1846 net::URLRequest* request) {
1847 ResourceRequestInfoImpl* info = ResourceRequestInfoImpl::ForRequest(request); 1847 ResourceRequestInfoImpl* info = ResourceRequestInfoImpl::ForRequest(request);
1848 IncrementOutstandingRequestsCount(-1, info); 1848 IncrementOutstandingRequestsCount(-1, info);
1849 } 1849 }
1850 1850
1851 void ResourceDispatcherHostImpl::BeginNavigationRequest( 1851 void ResourceDispatcherHostImpl::BeginNavigationRequest(
1852 ResourceContext* resource_context, 1852 ResourceContext* resource_context,
1853 int64 frame_tree_node_id, 1853 int frame_tree_node_id,
1854 const NavigationRequestInfo& info, 1854 const NavigationRequestInfo& info,
1855 NavigationURLLoaderImplCore* loader) { 1855 NavigationURLLoaderImplCore* loader) {
1856 // PlzNavigate: BeginNavigationRequest currently should only be used for the 1856 // PlzNavigate: BeginNavigationRequest currently should only be used for the
1857 // browser-side navigations project. 1857 // browser-side navigations project.
1858 CHECK(base::CommandLine::ForCurrentProcess()->HasSwitch( 1858 CHECK(base::CommandLine::ForCurrentProcess()->HasSwitch(
1859 switches::kEnableBrowserSideNavigation)); 1859 switches::kEnableBrowserSideNavigation));
1860 1860
1861 ResourceType resource_type = info.is_main_frame ? 1861 ResourceType resource_type = info.is_main_frame ?
1862 RESOURCE_TYPE_MAIN_FRAME : RESOURCE_TYPE_SUB_FRAME; 1862 RESOURCE_TYPE_MAIN_FRAME : RESOURCE_TYPE_SUB_FRAME;
1863 1863
(...skipping 480 matching lines...) Expand 10 before | Expand all | Expand 10 after
2344 2344
2345 // Add a flag to selectively bypass the data reduction proxy if the resource 2345 // Add a flag to selectively bypass the data reduction proxy if the resource
2346 // type is not an image. 2346 // type is not an image.
2347 if (request_data.resource_type != RESOURCE_TYPE_IMAGE) 2347 if (request_data.resource_type != RESOURCE_TYPE_IMAGE)
2348 load_flags |= net::LOAD_BYPASS_DATA_REDUCTION_PROXY; 2348 load_flags |= net::LOAD_BYPASS_DATA_REDUCTION_PROXY;
2349 2349
2350 return load_flags; 2350 return load_flags;
2351 } 2351 }
2352 2352
2353 } // namespace content 2353 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/loader/resource_dispatcher_host_impl.h ('k') | content/browser/web_contents/web_contents_impl_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698