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

Side by Side Diff: content/browser/service_worker/service_worker_provider_host.cc

Issue 1257553002: [Proof-of-concept] PlzNavigate and Service Worker Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Pass navigation_provider_id Created 5 years, 4 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/browser/service_worker/service_worker_provider_host.h" 5 #include "content/browser/service_worker/service_worker_provider_host.h"
6 6
7 #include "base/command_line.h"
7 #include "base/guid.h" 8 #include "base/guid.h"
8 #include "base/stl_util.h" 9 #include "base/stl_util.h"
9 #include "content/browser/frame_host/frame_tree.h" 10 #include "content/browser/frame_host/frame_tree.h"
10 #include "content/browser/frame_host/frame_tree_node.h" 11 #include "content/browser/frame_host/frame_tree_node.h"
11 #include "content/browser/frame_host/render_frame_host_impl.h" 12 #include "content/browser/frame_host/render_frame_host_impl.h"
12 #include "content/browser/message_port_message_filter.h" 13 #include "content/browser/message_port_message_filter.h"
13 #include "content/browser/service_worker/service_worker_context_core.h" 14 #include "content/browser/service_worker/service_worker_context_core.h"
14 #include "content/browser/service_worker/service_worker_context_request_handler. h" 15 #include "content/browser/service_worker/service_worker_context_request_handler. h"
15 #include "content/browser/service_worker/service_worker_controllee_request_handl er.h" 16 #include "content/browser/service_worker/service_worker_controllee_request_handl er.h"
16 #include "content/browser/service_worker/service_worker_dispatcher_host.h" 17 #include "content/browser/service_worker/service_worker_dispatcher_host.h"
17 #include "content/browser/service_worker/service_worker_handle.h" 18 #include "content/browser/service_worker/service_worker_handle.h"
18 #include "content/browser/service_worker/service_worker_registration_handle.h" 19 #include "content/browser/service_worker/service_worker_registration_handle.h"
19 #include "content/browser/service_worker/service_worker_utils.h" 20 #include "content/browser/service_worker/service_worker_utils.h"
20 #include "content/browser/service_worker/service_worker_version.h" 21 #include "content/browser/service_worker/service_worker_version.h"
21 #include "content/browser/web_contents/web_contents_impl.h" 22 #include "content/browser/web_contents/web_contents_impl.h"
22 #include "content/common/resource_request_body.h" 23 #include "content/common/resource_request_body.h"
23 #include "content/common/service_worker/service_worker_messages.h" 24 #include "content/common/service_worker/service_worker_messages.h"
24 #include "content/common/service_worker/service_worker_types.h" 25 #include "content/common/service_worker/service_worker_types.h"
25 #include "content/public/browser/render_frame_host.h" 26 #include "content/public/browser/render_frame_host.h"
26 #include "content/public/browser/render_widget_host_view.h" 27 #include "content/public/browser/render_widget_host_view.h"
27 #include "content/public/browser/web_contents.h" 28 #include "content/public/browser/web_contents.h"
28 #include "content/public/common/child_process_host.h" 29 #include "content/public/common/child_process_host.h"
30 #include "content/public/common/content_switches.h"
29 31
30 namespace content { 32 namespace content {
31 33
32 namespace { 34 namespace {
33 35
34 ServiceWorkerClientInfo FocusOnUIThread(int render_process_id, 36 ServiceWorkerClientInfo FocusOnUIThread(int render_process_id,
35 int render_frame_id) { 37 int render_frame_id) {
36 RenderFrameHostImpl* render_frame_host = 38 RenderFrameHostImpl* render_frame_host =
37 RenderFrameHostImpl::FromID(render_process_id, render_frame_id); 39 RenderFrameHostImpl::FromID(render_process_id, render_frame_id);
38 WebContentsImpl* web_contents = static_cast<WebContentsImpl*>( 40 WebContentsImpl* web_contents = static_cast<WebContentsImpl*>(
(...skipping 12 matching lines...) Expand all
51 53
52 // Move the web contents to the foreground. 54 // Move the web contents to the foreground.
53 web_contents->Activate(); 55 web_contents->Activate();
54 56
55 return ServiceWorkerProviderHost::GetWindowClientInfoOnUI(render_process_id, 57 return ServiceWorkerProviderHost::GetWindowClientInfoOnUI(render_process_id,
56 render_frame_id); 58 render_frame_id);
57 } 59 }
58 60
59 } // anonymous namespace 61 } // anonymous namespace
60 62
63 // PlzNavigate:
64 int ServiceWorkerProviderHost::kVirtualProcessIDForNavigationRequest = -2;
65
61 ServiceWorkerProviderHost::OneShotGetReadyCallback::OneShotGetReadyCallback( 66 ServiceWorkerProviderHost::OneShotGetReadyCallback::OneShotGetReadyCallback(
62 const GetRegistrationForReadyCallback& callback) 67 const GetRegistrationForReadyCallback& callback)
63 : callback(callback), 68 : callback(callback),
64 called(false) { 69 called(false) {
65 } 70 }
66 71
67 ServiceWorkerProviderHost::OneShotGetReadyCallback::~OneShotGetReadyCallback() { 72 ServiceWorkerProviderHost::OneShotGetReadyCallback::~OneShotGetReadyCallback() {
68 } 73 }
69 74
70 ServiceWorkerProviderHost::ServiceWorkerProviderHost( 75 ServiceWorkerProviderHost::ServiceWorkerProviderHost(
71 int render_process_id, 76 int render_process_id,
72 int route_id, 77 int route_id,
73 int provider_id, 78 int provider_id,
74 ServiceWorkerProviderType provider_type, 79 ServiceWorkerProviderType provider_type,
75 base::WeakPtr<ServiceWorkerContextCore> context, 80 base::WeakPtr<ServiceWorkerContextCore> context,
76 ServiceWorkerDispatcherHost* dispatcher_host) 81 ServiceWorkerDispatcherHost* dispatcher_host)
77 : client_uuid_(base::GenerateGUID()), 82 : client_uuid_(base::GenerateGUID()),
78 render_process_id_(render_process_id), 83 render_process_id_(render_process_id),
79 route_id_(route_id), 84 route_id_(route_id),
80 render_thread_id_(kDocumentMainThreadId), 85 render_thread_id_(kDocumentMainThreadId),
81 provider_id_(provider_id), 86 provider_id_(provider_id),
82 provider_type_(provider_type), 87 provider_type_(provider_type),
83 context_(context), 88 context_(context),
84 dispatcher_host_(dispatcher_host), 89 dispatcher_host_(dispatcher_host),
85 allow_association_(true) { 90 allow_association_(true) {
86 DCHECK_NE(ChildProcessHost::kInvalidUniqueID, render_process_id_); 91 DCHECK_NE(ChildProcessHost::kInvalidUniqueID, render_process_id_);
87 DCHECK_NE(SERVICE_WORKER_PROVIDER_UNKNOWN, provider_type_); 92 DCHECK_NE(SERVICE_WORKER_PROVIDER_UNKNOWN, provider_type_);
88 DCHECK_NE(SERVICE_WORKER_PROVIDER_FOR_SANDBOXED_FRAME, provider_type_); 93 DCHECK_NE(SERVICE_WORKER_PROVIDER_FOR_SANDBOXED_FRAME, provider_type_);
94
95 // PlzNavigate:
96 if (render_process_id == kVirtualProcessIDForNavigationRequest) {
97 CHECK(base::CommandLine::ForCurrentProcess()->HasSwitch(
98 switches::kEnableBrowserSideNavigation));
99 }
89 if (provider_type_ == SERVICE_WORKER_PROVIDER_FOR_CONTROLLER) { 100 if (provider_type_ == SERVICE_WORKER_PROVIDER_FOR_CONTROLLER) {
90 // Actual thread id is set when the service worker context gets started. 101 // Actual thread id is set when the service worker context gets started.
91 render_thread_id_ = kInvalidEmbeddedWorkerThreadId; 102 render_thread_id_ = kInvalidEmbeddedWorkerThreadId;
92 } 103 }
93 context_->RegisterProviderHostByClientID(client_uuid_, this); 104 context_->RegisterProviderHostByClientID(client_uuid_, this);
94 } 105 }
95 106
96 ServiceWorkerProviderHost::~ServiceWorkerProviderHost() { 107 ServiceWorkerProviderHost::~ServiceWorkerProviderHost() {
97 if (context_) 108 if (context_)
98 context_->UnregisterProviderHostByClientID(client_uuid_); 109 context_->UnregisterProviderHostByClientID(client_uuid_);
(...skipping 409 matching lines...) Expand 10 before | Expand all | Expand 10 after
508 provider_type_ = SERVICE_WORKER_PROVIDER_UNKNOWN; 519 provider_type_ = SERVICE_WORKER_PROVIDER_UNKNOWN;
509 dispatcher_host_ = nullptr; 520 dispatcher_host_ = nullptr;
510 } 521 }
511 522
512 void ServiceWorkerProviderHost::CompleteCrossSiteTransfer( 523 void ServiceWorkerProviderHost::CompleteCrossSiteTransfer(
513 int new_process_id, 524 int new_process_id,
514 int new_frame_id, 525 int new_frame_id,
515 int new_provider_id, 526 int new_provider_id,
516 ServiceWorkerProviderType new_provider_type, 527 ServiceWorkerProviderType new_provider_type,
517 ServiceWorkerDispatcherHost* new_dispatcher_host) { 528 ServiceWorkerDispatcherHost* new_dispatcher_host) {
518 DCHECK_EQ(ChildProcessHost::kInvalidUniqueID, render_process_id_); 529 DCHECK(render_process_id_ == ChildProcessHost::kInvalidUniqueID ||
530 render_process_id_ == kVirtualProcessIDForNavigationRequest);
519 DCHECK_NE(ChildProcessHost::kInvalidUniqueID, new_process_id); 531 DCHECK_NE(ChildProcessHost::kInvalidUniqueID, new_process_id);
520 DCHECK_NE(MSG_ROUTING_NONE, new_frame_id); 532 DCHECK_NE(MSG_ROUTING_NONE, new_frame_id);
521 533
522 render_process_id_ = new_process_id; 534 render_process_id_ = new_process_id;
523 route_id_ = new_frame_id; 535 route_id_ = new_frame_id;
524 render_thread_id_ = kDocumentMainThreadId; 536 render_thread_id_ = kDocumentMainThreadId;
525 provider_id_ = new_provider_id; 537 provider_id_ = new_provider_id;
526 provider_type_ = new_provider_type; 538 provider_type_ = new_provider_type;
527 dispatcher_host_ = new_dispatcher_host; 539 dispatcher_host_ = new_dispatcher_host;
528 540
(...skipping 152 matching lines...) Expand 10 before | Expand all | Expand 10 after
681 return context_ != NULL; 693 return context_ != NULL;
682 } 694 }
683 695
684 void ServiceWorkerProviderHost::Send(IPC::Message* message) const { 696 void ServiceWorkerProviderHost::Send(IPC::Message* message) const {
685 DCHECK(dispatcher_host_); 697 DCHECK(dispatcher_host_);
686 DCHECK(IsReadyToSendMessages()); 698 DCHECK(IsReadyToSendMessages());
687 dispatcher_host_->Send(message); 699 dispatcher_host_->Send(message);
688 } 700 }
689 701
690 } // namespace content 702 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698