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

Unified Diff: content/browser/service_worker/service_worker_provider_host.cc

Issue 1149383004: [3/5 chromium] Shows the clients which are controlled by ServiceWorker in DevTools. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: incorporated dcheng's comment Created 5 years, 6 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 side-by-side diff with in-line comments
Download patch
Index: content/browser/service_worker/service_worker_provider_host.cc
diff --git a/content/browser/service_worker/service_worker_provider_host.cc b/content/browser/service_worker/service_worker_provider_host.cc
index 599047519bc3e313936a6e6c7b1b44f56bd9c907..d9a04a3efe4b86c766352d92b101d08248ec0873 100644
--- a/content/browser/service_worker/service_worker_provider_host.cc
+++ b/content/browser/service_worker/service_worker_provider_host.cc
@@ -31,11 +31,9 @@ namespace content {
namespace {
-ServiceWorkerClientInfo FocusOnUIThread(
- int render_process_id,
- int render_frame_id) {
+ServiceWorkerClientInfo FocusOnUIThread(int render_process_id, int route_id) {
dcheng 2015/06/17 23:21:13 Nit: keep this named "render_frame_id"
horo 2015/06/17 23:51:07 Done.
RenderFrameHostImpl* render_frame_host =
- RenderFrameHostImpl::FromID(render_process_id, render_frame_id);
+ RenderFrameHostImpl::FromID(render_process_id, route_id);
WebContentsImpl* web_contents = static_cast<WebContentsImpl*>(
WebContents::FromRenderFrameHost(render_frame_host));
@@ -54,7 +52,7 @@ ServiceWorkerClientInfo FocusOnUIThread(
web_contents->Activate();
return ServiceWorkerProviderHost::GetWindowClientInfoOnUI(render_process_id,
- render_frame_id);
+ route_id);
}
} // anonymous namespace
@@ -70,14 +68,14 @@ ServiceWorkerProviderHost::OneShotGetReadyCallback::~OneShotGetReadyCallback() {
ServiceWorkerProviderHost::ServiceWorkerProviderHost(
int render_process_id,
- int render_frame_id,
+ int route_id,
int provider_id,
ServiceWorkerProviderType provider_type,
base::WeakPtr<ServiceWorkerContextCore> context,
ServiceWorkerDispatcherHost* dispatcher_host)
: client_uuid_(base::GenerateGUID()),
render_process_id_(render_process_id),
- render_frame_id_(render_frame_id),
+ route_id_(route_id),
render_thread_id_(kDocumentMainThreadId),
provider_id_(provider_id),
provider_type_(provider_type),
@@ -112,6 +110,12 @@ ServiceWorkerProviderHost::~ServiceWorkerProviderHost() {
DecreaseProcessReference(pattern);
}
+int ServiceWorkerProviderHost::frame_id() const {
+ if (provider_type_ == SERVICE_WORKER_PROVIDER_FOR_WINDOW)
+ return route_id_;
+ return MSG_ROUTING_NONE;
+}
+
void ServiceWorkerProviderHost::OnVersionAttributesChanged(
ServiceWorkerRegistration* registration,
ChangedVersionAttributesMask changed_mask,
@@ -386,12 +390,13 @@ void ServiceWorkerProviderHost::PostMessage(
}
void ServiceWorkerProviderHost::Focus(const GetClientInfoCallback& callback) {
+ if (provider_type_ != SERVICE_WORKER_PROVIDER_FOR_WINDOW) {
+ callback.Run(ServiceWorkerClientInfo());
+ return;
+ }
BrowserThread::PostTaskAndReplyWithResult(
BrowserThread::UI, FROM_HERE,
- base::Bind(&FocusOnUIThread,
- render_process_id_,
- render_frame_id_),
- callback);
+ base::Bind(&FocusOnUIThread, render_process_id_, route_id_), callback);
}
void ServiceWorkerProviderHost::GetWindowClientInfo(
@@ -399,16 +404,16 @@ void ServiceWorkerProviderHost::GetWindowClientInfo(
BrowserThread::PostTaskAndReplyWithResult(
BrowserThread::UI, FROM_HERE,
base::Bind(&ServiceWorkerProviderHost::GetWindowClientInfoOnUI,
- render_process_id_, render_frame_id_),
+ render_process_id_, route_id_),
callback);
}
// static
ServiceWorkerClientInfo ServiceWorkerProviderHost::GetWindowClientInfoOnUI(
int render_process_id,
- int render_frame_id) {
+ int route_id) {
RenderFrameHostImpl* render_frame_host =
- RenderFrameHostImpl::FromID(render_process_id, render_frame_id);
+ RenderFrameHostImpl::FromID(render_process_id, route_id);
if (!render_frame_host)
return ServiceWorkerClientInfo();
@@ -453,7 +458,7 @@ bool ServiceWorkerProviderHost::GetRegistrationForReady(
void ServiceWorkerProviderHost::PrepareForCrossSiteTransfer() {
DCHECK_NE(ChildProcessHost::kInvalidUniqueID, render_process_id_);
- DCHECK_NE(MSG_ROUTING_NONE, render_frame_id_);
+ DCHECK_NE(MSG_ROUTING_NONE, route_id_);
DCHECK_EQ(kDocumentMainThreadId, render_thread_id_);
DCHECK_NE(SERVICE_WORKER_PROVIDER_UNKNOWN, provider_type_);
@@ -471,7 +476,7 @@ void ServiceWorkerProviderHost::PrepareForCrossSiteTransfer() {
}
render_process_id_ = ChildProcessHost::kInvalidUniqueID;
- render_frame_id_ = MSG_ROUTING_NONE;
+ route_id_ = MSG_ROUTING_NONE;
render_thread_id_ = kInvalidEmbeddedWorkerThreadId;
provider_id_ = kInvalidServiceWorkerProviderId;
provider_type_ = SERVICE_WORKER_PROVIDER_UNKNOWN;
@@ -489,7 +494,7 @@ void ServiceWorkerProviderHost::CompleteCrossSiteTransfer(
DCHECK_NE(MSG_ROUTING_NONE, new_frame_id);
render_process_id_ = new_process_id;
- render_frame_id_ = new_frame_id;
+ route_id_ = new_frame_id;
render_thread_id_ = kDocumentMainThreadId;
provider_id_ = new_provider_id;
provider_type_ = new_provider_type;
« no previous file with comments | « content/browser/service_worker/service_worker_provider_host.h ('k') | content/browser/service_worker/service_worker_version.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698