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

Side by Side Diff: content/renderer/service_worker/worker_fetch_context_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 2017 The Chromium Authors. All rights reserved. 1 // Copyright 2017 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/service_worker/worker_fetch_context_impl.h" 5 #include "content/renderer/service_worker/worker_fetch_context_impl.h"
6 6
7 #include "content/child/request_extra_data.h" 7 #include "content/child/request_extra_data.h"
8 #include "content/child/resource_dispatcher.h" 8 #include "content/child/resource_dispatcher.h"
9 #include "content/child/web_url_loader_impl.h" 9 #include "content/child/web_url_loader_impl.h"
10 #include "mojo/public/cpp/bindings/associated_binding.h" 10 #include "mojo/public/cpp/bindings/associated_binding.h"
(...skipping 25 matching lines...) Expand all
36 } 36 }
37 37
38 std::unique_ptr<blink::WebURLLoader> WorkerFetchContextImpl::CreateURLLoader() { 38 std::unique_ptr<blink::WebURLLoader> WorkerFetchContextImpl::CreateURLLoader() {
39 return base::MakeUnique<content::WebURLLoaderImpl>(resource_dispatcher_.get(), 39 return base::MakeUnique<content::WebURLLoaderImpl>(resource_dispatcher_.get(),
40 url_loader_factory_.get()); 40 url_loader_factory_.get());
41 } 41 }
42 42
43 void WorkerFetchContextImpl::WillSendRequest(blink::WebURLRequest& request) { 43 void WorkerFetchContextImpl::WillSendRequest(blink::WebURLRequest& request) {
44 RequestExtraData* extra_data = new RequestExtraData(); 44 RequestExtraData* extra_data = new RequestExtraData();
45 extra_data->set_service_worker_provider_id(service_worker_provider_id_); 45 extra_data->set_service_worker_provider_id(service_worker_provider_id_);
46 extra_data->set_render_frame_id(parent_frame_id_);
47 request.SetExtraData(extra_data); 46 request.SetExtraData(extra_data);
48 47
49 if (!IsControlledByServiceWorker() && 48 if (!IsControlledByServiceWorker() &&
50 request.GetServiceWorkerMode() != 49 request.GetServiceWorkerMode() !=
51 blink::WebURLRequest::ServiceWorkerMode::kNone) { 50 blink::WebURLRequest::ServiceWorkerMode::kNone) {
52 request.SetServiceWorkerMode( 51 request.SetServiceWorkerMode(
53 blink::WebURLRequest::ServiceWorkerMode::kForeign); 52 blink::WebURLRequest::ServiceWorkerMode::kForeign);
54 } 53 }
55 } 54 }
56 55
(...skipping 11 matching lines...) Expand all
68 } 67 }
69 68
70 void WorkerFetchContextImpl::set_service_worker_provider_id(int id) { 69 void WorkerFetchContextImpl::set_service_worker_provider_id(int id) {
71 service_worker_provider_id_ = id; 70 service_worker_provider_id_ = id;
72 } 71 }
73 72
74 void WorkerFetchContextImpl::set_is_controlled_by_service_worker(bool flag) { 73 void WorkerFetchContextImpl::set_is_controlled_by_service_worker(bool flag) {
75 is_controlled_by_service_worker_ = flag; 74 is_controlled_by_service_worker_ = flag;
76 } 75 }
77 76
78 void WorkerFetchContextImpl::set_parent_frame_id(int id) {
79 parent_frame_id_ = id;
80 }
81
82 void WorkerFetchContextImpl::SetControllerServiceWorker( 77 void WorkerFetchContextImpl::SetControllerServiceWorker(
83 int64_t controller_version_id) { 78 int64_t controller_version_id) {
84 controller_version_id_ = controller_version_id; 79 controller_version_id_ = controller_version_id;
85 } 80 }
86 81
87 } // namespace content 82 } // namespace content
OLDNEW
« no previous file with comments | « content/renderer/service_worker/worker_fetch_context_impl.h ('k') | content/test/data/workers/worker_common.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698