Service Worker: Add Clients.get(id)

content/browser/service_worker/service_worker_version.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/browser/service_worker/service_worker_version.h"
 
 #include <stddef.h>
 
 #include <map>
 #include <string>
@@ skipping 937 matching lines @@
                                            source_identifier,
                                            message_level,
                                            message,
                                            line_number,
                                            source_url));
 }
 
 bool ServiceWorkerVersion::OnMessageReceived(const IPC::Message& message) {
   bool handled = true;
   IPC_BEGIN_MESSAGE_MAP(ServiceWorkerVersion, message)
+    IPC_MESSAGE_HANDLER(ServiceWorkerHostMsg_GetClient, OnGetClient)
     IPC_MESSAGE_HANDLER(ServiceWorkerHostMsg_GetClients,
                         OnGetClients)
     IPC_MESSAGE_HANDLER(ServiceWorkerHostMsg_ActivateEventFinished,
                         OnActivateEventFinished)
     IPC_MESSAGE_HANDLER(ServiceWorkerHostMsg_InstallEventFinished,
                         OnInstallEventFinished)
     IPC_MESSAGE_HANDLER(ServiceWorkerHostMsg_FetchEventFinished,
                         OnFetchEventFinished)
     IPC_MESSAGE_HANDLER(ServiceWorkerHostMsg_OpenWindow,
                         OnOpenWindow)
@@ skipping 50 matching lines @@
   int request_id = AddRequest(callback, &activate_requests_, REQUEST_ACTIVATE,
                               ServiceWorkerMetrics::EventType::ACTIVATE);
   ServiceWorkerStatusCode status =
       embedded_worker_->SendMessage(ServiceWorkerMsg_ActivateEvent(request_id));
   if (status != SERVICE_WORKER_OK) {
     activate_requests_.Remove(request_id);
     RunSoon(base::Bind(callback, status));
   }
 }
 
+void ServiceWorkerVersion::OnGetClient(int request_id, const std::string& id) {

[nhiroki, 2016/02/08 06:27:02]

id -> client_uuid

[jungkees, 2016/02/12 15:03:21]

Done.

+  TRACE_EVENT_ASYNC_BEGIN1("ServiceWorker", "ServiceWorkerVersion::OnGetClient",
+                           request_id, "id", id);

[nhiroki, 2016/02/08 06:27:02]

ditto.

[jungkees, 2016/02/12 15:03:21]

Done.

+  service_worker_client_utils::GetClient(
+      weak_factory_.GetWeakPtr(), id, context_,
+      base::Bind(&ServiceWorkerVersion::OnGetClientFinished,
+                 weak_factory_.GetWeakPtr(), request_id));
+}
+
+void ServiceWorkerVersion::OnGetClientFinished(

[zino, 2016/02/05 06:21:44]

If you modify this callback to take client_uuid, you can set uuid to client info
here.
(e.g. ServiceWorkerVersion::OnOpenWindowFinished() : 
https://code.google.com/p/chromium/codesearch#chromium/src/content/browser/se...)

Then, you can avoid these changes:
  https://codereview.chromium.org/1439333002/patch/160001/170003

[jungkees, 2016/02/12 15:03:21]

If I change GetClientInfoCallback to take |client_uuid|,
ServiceWorkerProviderHost::Focus and
ServiceWorkerProviderHost::GetWindowClientInfo should be changed as they use
PostTaskAndReplyWithResult with a GetClientInfoCallback-type callback which
expects a single client info argument. I just retained my previous change that
initialize |client_uuid| of the ServiceWorkerClientInfo object in its
constructor when a value is given.

+    int request_id,
+    const ServiceWorkerClientInfo& client) {
+  DCHECK_CURRENTLY_ON(BrowserThread::IO);
+  TRACE_EVENT_ASYNC_END1("ServiceWorker", "ServiceWorkerVersion::OnGetClient",
+                         request_id, "The retrieved client", &client);

[nhiroki, 2016/02/08 06:27:02]

|&client| might not be very useful for investigating trace information. 

ServiceWorkerVersion::OnGetClient() goes through different code paths based on
the client type, so adding the client type could be useful to identify a slow
path.

  TRACE_EVENT_ASYNC_END1("ServiceWorker", "ServiceWorkerVersion::OnGetClient",
request_id, "client_type", client.client_type);

[jungkees, 2016/02/12 15:03:21]

Addressed. Thanks.

+
+  // When Clients.matchAll() is called on the script evaluation phase, the
+  // running status can be STARTING here.
+  if (running_status() != STARTING && running_status() != RUNNING)
+    return;
+
+  embedded_worker_->SendMessage(
+      ServiceWorkerMsg_DidGetClient(request_id, client));
+}
+
 void ServiceWorkerVersion::OnGetClients(
     int request_id,
     const ServiceWorkerClientQueryOptions& options) {
   TRACE_EVENT_ASYNC_BEGIN2(
       "ServiceWorker", "ServiceWorkerVersion::OnGetClients", request_id,
       "client_type", options.client_type, "include_uncontrolled",
       options.include_uncontrolled);
   service_worker_client_utils::GetClients(
       weak_factory_.GetWeakPtr(), options,
       base::Bind(&ServiceWorkerVersion::OnGetClientsFinished,
@@ skipping 893 matching lines @@
 void ServiceWorkerVersion::OnBeginEvent() {
   if (should_exclude_from_uma_ || running_status() != RUNNING ||
       idle_time_.is_null()) {
     return;
   }
   ServiceWorkerMetrics::RecordTimeBetweenEvents(base::TimeTicks::Now() -
                                                 idle_time_);
 }
 
 }  // namespace content