ServiceWorker: plumbing for ClientQueryOptions (2/2, chromium)

content/common/service_worker/service_worker_messages.h

 // Copyright 2014 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.
 
 // Message definition file, included multiple times, hence no include guard.
 
 #include <string>
 #include <vector>
 
 #include "base/strings/string16.h"
@@ skipping 22 matching lines @@
 
 IPC_ENUM_TRAITS_MAX_VALUE(blink::WebServiceWorkerEventResult,
                           blink::WebServiceWorkerEventResultLast)
 
 IPC_ENUM_TRAITS_MAX_VALUE(blink::WebServiceWorkerState,
                           blink::WebServiceWorkerStateLast)
 
 IPC_ENUM_TRAITS_MAX_VALUE(blink::WebServiceWorkerResponseType,
                           blink::WebServiceWorkerResponseTypeLast)
 
+IPC_ENUM_TRAITS_MAX_VALUE(blink::WebServiceWorkerClientType,
+                          blink::WebServiceWorkerClientTypeLast)
+
 IPC_ENUM_TRAITS_MAX_VALUE(content::ServiceWorkerProviderType,
                           content::SERVICE_WORKER_PROVIDER_TYPE_LAST)
 
 IPC_STRUCT_TRAITS_BEGIN(content::ServiceWorkerFetchRequest)
   IPC_STRUCT_TRAITS_MEMBER(mode)
   IPC_STRUCT_TRAITS_MEMBER(request_context_type)
   IPC_STRUCT_TRAITS_MEMBER(frame_type)
   IPC_STRUCT_TRAITS_MEMBER(url)
   IPC_STRUCT_TRAITS_MEMBER(method)
   IPC_STRUCT_TRAITS_MEMBER(headers)
@@ skipping 54 matching lines @@
   IPC_STRUCT_TRAITS_MEMBER(waiting)
   IPC_STRUCT_TRAITS_MEMBER(active)
 IPC_STRUCT_TRAITS_END()
 
 IPC_STRUCT_TRAITS_BEGIN(content::ServiceWorkerClientInfo)
   IPC_STRUCT_TRAITS_MEMBER(client_id)
   IPC_STRUCT_TRAITS_MEMBER(page_visibility_state)
   IPC_STRUCT_TRAITS_MEMBER(is_focused)
   IPC_STRUCT_TRAITS_MEMBER(url)
   IPC_STRUCT_TRAITS_MEMBER(frame_type)
+  IPC_STRUCT_TRAITS_MEMBER(client_type)
+IPC_STRUCT_TRAITS_END()
+
+IPC_STRUCT_TRAITS_BEGIN(content::ServiceWorkerClientQueryOptions)
+  IPC_STRUCT_TRAITS_MEMBER(client_type)
+  IPC_STRUCT_TRAITS_MEMBER(include_uncontrolled)

[Tom Sepez, 2015/03/06 17:53:21]

nit: "uncontrolled" is an adjective, I'd like a noun here.  Maybe
include_uncontrolled_clients"?

[kinuko, 2015/03/07 12:11:38]

Yup I agree that a noun'd be better... while this field name is taken from the
spec [1], so I'd like to stick to it to match with it.

[1]
https://slightlyoff.github.io/ServiceWorker/spec/service_worker/#serviceworke...

 IPC_STRUCT_TRAITS_END()
 
 IPC_ENUM_TRAITS_MAX_VALUE(
     blink::WebServiceWorkerCacheError,
     blink::WebServiceWorkerCacheErrorLast)
 
 IPC_ENUM_TRAITS_MAX_VALUE(blink::WebGeofencingEventType,
                           blink::WebGeofencingEventTypeLast)
 
 //---------------------------------------------------------------------------
@@ skipping 91 matching lines @@
 IPC_MESSAGE_ROUTED1(ServiceWorkerHostMsg_GeofencingEventFinished,
                     int /* request_id */)
 IPC_MESSAGE_ROUTED2(ServiceWorkerHostMsg_CrossOriginConnectEventFinished,
                     int /* request_id */,
                     bool /* accept_connection */)
 
 // Responds to a Ping from the browser.
 // Routed to the target ServiceWorkerVersion.
 IPC_MESSAGE_ROUTED0(ServiceWorkerHostMsg_Pong)
 
-// Asks the browser to retrieve documents controlled by the sender
+// Asks the browser to retrieve clients controlled by the sender

[falken, 2015/03/04 07:16:43]

I guess "controlled" is now wrong too, since there's include_uncontrolled.

[kinuko, 2015/03/07 12:11:38]

Done.

 // ServiceWorker.
-IPC_MESSAGE_ROUTED1(ServiceWorkerHostMsg_GetClientDocuments,
-                    int /* request_id */)
+IPC_MESSAGE_ROUTED2(ServiceWorkerHostMsg_GetClients,
+                    int /* request_id */,
+                    content::ServiceWorkerClientQueryOptions)
 
 // Sends a 'message' event to a client document (renderer->browser).
 IPC_MESSAGE_ROUTED3(
     ServiceWorkerHostMsg_PostMessageToDocument,
     int /* client_id */,
     base::string16 /* message */,
     std::vector<content::TransferredMessagePort> /* sent_message_ports */)
 
 // ServiceWorker -> Browser message to request that the ServiceWorkerStorage
 // cache |data| associated with |url|.
@@ skipping 225 matching lines @@
 IPC_MESSAGE_CONTROL1(ServiceWorkerMsg_DidClaimClients,
                      int /* request_id */)
 IPC_MESSAGE_CONTROL3(ServiceWorkerMsg_ClaimClientsError,
                      int /* request_id */,
                      blink::WebServiceWorkerError::ErrorType /* code */,
                      base::string16 /* message */)
 
 // Sent via EmbeddedWorker to Ping the worker, expecting a Pong in response.
 IPC_MESSAGE_CONTROL0(ServiceWorkerMsg_Ping)
 
-// Sent via EmbeddedWorker as a response of GetClientDocuments.
-IPC_MESSAGE_CONTROL2(ServiceWorkerMsg_DidGetClientDocuments,
+// Sent via EmbeddedWorker as a response of GetClients.
+IPC_MESSAGE_CONTROL2(ServiceWorkerMsg_DidGetClients,
                      int /* request_id */,
                      std::vector<content::ServiceWorkerClientInfo>)
 
 // Sent via EmbeddedWorker as a response of OpenWindow.
 IPC_MESSAGE_CONTROL2(ServiceWorkerMsg_OpenWindowResponse,
                      int /* request_id */,
                      content::ServiceWorkerClientInfo /* client */)
 
 // Sent via EmbeddedWorker as an error response of OpenWindow.
 IPC_MESSAGE_CONTROL1(ServiceWorkerMsg_OpenWindowError,
@@ skipping 56 matching lines @@
                      blink::WebServiceWorkerCacheError)
 IPC_MESSAGE_CONTROL2(ServiceWorkerMsg_CacheMatchAllError,
                      int /* request_id */,
                      blink::WebServiceWorkerCacheError)
 IPC_MESSAGE_CONTROL2(ServiceWorkerMsg_CacheKeysError,
                      int /* request_id */,
                      blink::WebServiceWorkerCacheError)
 IPC_MESSAGE_CONTROL2(ServiceWorkerMsg_CacheBatchError,
                      int /* request_id */,
                      blink::WebServiceWorkerCacheError)