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

Side by Side Diff: content/renderer/render_frame_impl.cc

Issue 2894523002: (false positive) Revert of Set render_frame_id while fetching from the dedicated worker ... (Closed)
Patch Set: Created 3 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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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 #include "content/renderer/render_frame_impl.h" 5 #include "content/renderer/render_frame_impl.h"
6 6
7 #include <map> 7 #include <map>
8 #include <string> 8 #include <string>
9 #include <utility> 9 #include <utility>
10 #include <vector> 10 #include <vector>
(...skipping 3014 matching lines...) Expand 10 before | Expand all | Expand 10 after
3025 RenderFrameImpl::CreateWorkerFetchContext() { 3025 RenderFrameImpl::CreateWorkerFetchContext() {
3026 DCHECK(base::FeatureList::IsEnabled(features::kOffMainThreadFetch)); 3026 DCHECK(base::FeatureList::IsEnabled(features::kOffMainThreadFetch));
3027 mojom::WorkerURLLoaderFactoryProviderPtr worker_url_loader_factory_provider; 3027 mojom::WorkerURLLoaderFactoryProviderPtr worker_url_loader_factory_provider;
3028 RenderThreadImpl::current() 3028 RenderThreadImpl::current()
3029 ->blink_platform_impl() 3029 ->blink_platform_impl()
3030 ->GetInterfaceProvider() 3030 ->GetInterfaceProvider()
3031 ->GetInterface(mojo::MakeRequest(&worker_url_loader_factory_provider)); 3031 ->GetInterface(mojo::MakeRequest(&worker_url_loader_factory_provider));
3032 std::unique_ptr<WorkerFetchContextImpl> worker_fetch_context = 3032 std::unique_ptr<WorkerFetchContextImpl> worker_fetch_context =
3033 base::MakeUnique<WorkerFetchContextImpl>( 3033 base::MakeUnique<WorkerFetchContextImpl>(
3034 worker_url_loader_factory_provider.PassInterface()); 3034 worker_url_loader_factory_provider.PassInterface());
3035 worker_fetch_context->set_parent_frame_id(routing_id_);
3036 blink::WebServiceWorkerNetworkProvider* web_provider = 3035 blink::WebServiceWorkerNetworkProvider* web_provider =
3037 frame_->DataSource()->GetServiceWorkerNetworkProvider(); 3036 frame_->DataSource()->GetServiceWorkerNetworkProvider();
3038 if (web_provider) { 3037 if (web_provider) {
3039 ServiceWorkerNetworkProvider* provider = 3038 ServiceWorkerNetworkProvider* provider =
3040 ServiceWorkerNetworkProvider::FromWebServiceWorkerNetworkProvider( 3039 ServiceWorkerNetworkProvider::FromWebServiceWorkerNetworkProvider(
3041 web_provider); 3040 web_provider);
3042 worker_fetch_context->set_service_worker_provider_id( 3041 worker_fetch_context->set_service_worker_provider_id(
3043 provider->provider_id()); 3042 provider->provider_id());
3044 worker_fetch_context->set_is_controlled_by_service_worker( 3043 worker_fetch_context->set_is_controlled_by_service_worker(
3045 provider->IsControlledByServiceWorker()); 3044 provider->IsControlledByServiceWorker());
(...skipping 4008 matching lines...) Expand 10 before | Expand all | Expand 10 after
7054 policy(info.default_policy), 7053 policy(info.default_policy),
7055 replaces_current_history_item(info.replaces_current_history_item), 7054 replaces_current_history_item(info.replaces_current_history_item),
7056 history_navigation_in_new_child_frame( 7055 history_navigation_in_new_child_frame(
7057 info.is_history_navigation_in_new_child_frame), 7056 info.is_history_navigation_in_new_child_frame),
7058 client_redirect(info.is_client_redirect), 7057 client_redirect(info.is_client_redirect),
7059 cache_disabled(info.is_cache_disabled), 7058 cache_disabled(info.is_cache_disabled),
7060 form(info.form), 7059 form(info.form),
7061 source_location(info.source_location) {} 7060 source_location(info.source_location) {}
7062 7061
7063 } // namespace content 7062 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/shared_worker/worker_browsertest.cc ('k') | content/renderer/service_worker/worker_fetch_context_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698