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

content/renderer/service_worker/service_worker_script_context.cc

 // 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.
 
 #include "content/renderer/service_worker/service_worker_script_context.h"
 
 #include "base/logging.h"
 #include "base/metrics/histogram.h"
 #include "base/trace_event/trace_event.h"
 #include "content/child/notifications/notification_data_conversions.h"
 #include "content/child/service_worker/web_service_worker_registration_impl.h"
 #include "content/child/thread_safe_sender.h"
 #include "content/child/webmessageportchannel_impl.h"
 #include "content/common/message_port_messages.h"
 #include "content/common/service_worker/service_worker_messages.h"
 #include "content/public/common/referrer.h"
 #include "content/renderer/service_worker/embedded_worker_context_client.h"
 #include "ipc/ipc_message.h"
 #include "third_party/WebKit/public/platform/WebCrossOriginServiceWorkerClient.h"
 #include "third_party/WebKit/public/platform/WebReferrerPolicy.h"
+#include "third_party/WebKit/public/platform/WebServiceWorkerClientQueryOptions.h"
 #include "third_party/WebKit/public/platform/WebServiceWorkerRequest.h"
 #include "third_party/WebKit/public/platform/WebString.h"
 #include "third_party/WebKit/public/platform/WebURL.h"
 #include "third_party/WebKit/public/platform/modules/notifications/WebNotificationData.h"
 #include "third_party/WebKit/public/web/WebServiceWorkerContextClient.h"
 #include "third_party/WebKit/public/web/WebServiceWorkerContextProxy.h"
 
 namespace content {
 
 namespace {
@@ skipping 47 matching lines @@
 ToWebServiceWorkerClientInfo(const ServiceWorkerClientInfo& client_info) {
   DCHECK(client_info.IsValid());
 
   blink::WebServiceWorkerClientInfo web_client_info;
 
   web_client_info.clientID = client_info.client_id;
   web_client_info.pageVisibilityState = client_info.page_visibility_state;
   web_client_info.isFocused = client_info.is_focused;
   web_client_info.url = client_info.url;
   web_client_info.frameType = GetBlinkFrameType(client_info.frame_type);
+  web_client_info.clientType = client_info.client_type;
 
   return web_client_info;
 }
 
 }  // namespace
 
 ServiceWorkerScriptContext::ServiceWorkerScriptContext(
     EmbeddedWorkerContextClient* embedded_context,
     blink::WebServiceWorkerContextProxy* proxy)
     : cache_storage_dispatcher_(new ServiceWorkerCacheStorageDispatcher(this)),
@@ skipping 13 matching lines @@
     IPC_MESSAGE_HANDLER(ServiceWorkerMsg_SyncEvent, OnSyncEvent)
     IPC_MESSAGE_HANDLER(ServiceWorkerMsg_NotificationClickEvent,
                         OnNotificationClickEvent)
     IPC_MESSAGE_HANDLER(ServiceWorkerMsg_PushEvent, OnPushEvent)
     IPC_MESSAGE_HANDLER(ServiceWorkerMsg_GeofencingEvent, OnGeofencingEvent)
     IPC_MESSAGE_HANDLER(ServiceWorkerMsg_CrossOriginConnectEvent,
                         OnCrossOriginConnectEvent)
     IPC_MESSAGE_HANDLER(ServiceWorkerMsg_MessageToWorker, OnPostMessage)
     IPC_MESSAGE_HANDLER(ServiceWorkerMsg_CrossOriginMessageToWorker,
                         OnCrossOriginMessageToWorker)
-    IPC_MESSAGE_HANDLER(ServiceWorkerMsg_DidGetClientDocuments,
-                        OnDidGetClientDocuments)
+    IPC_MESSAGE_HANDLER(ServiceWorkerMsg_DidGetClients,
+                        OnDidGetClients)
     IPC_MESSAGE_HANDLER(ServiceWorkerMsg_OpenWindowResponse,
                         OnOpenWindowResponse)
     IPC_MESSAGE_HANDLER(ServiceWorkerMsg_OpenWindowError,
                         OnOpenWindowError)
     IPC_MESSAGE_HANDLER(ServiceWorkerMsg_FocusClientResponse,
                         OnFocusClientResponse)
     IPC_MESSAGE_HANDLER(ServiceWorkerMsg_DidSkipWaiting, OnDidSkipWaiting)
     IPC_MESSAGE_HANDLER(ServiceWorkerMsg_DidClaimClients, OnDidClaimClients)
     IPC_MESSAGE_HANDLER(ServiceWorkerMsg_ClaimClientsError, OnClaimClientsError)
     IPC_MESSAGE_HANDLER(ServiceWorkerMsg_Ping, OnPing);
@@ skipping 81 matching lines @@
       GetRoutingID(), request_id));
 }
 
 void ServiceWorkerScriptContext::DidHandleCrossOriginConnectEvent(
     int request_id,
     bool accept_connection) {
   Send(new ServiceWorkerHostMsg_CrossOriginConnectEventFinished(
       GetRoutingID(), request_id, accept_connection));
 }
 
-void ServiceWorkerScriptContext::GetClientDocuments(
+void ServiceWorkerScriptContext::GetClients(
+    const blink::WebServiceWorkerClientQueryOptions& weboptions,
     blink::WebServiceWorkerClientsCallbacks* callbacks) {
   DCHECK(callbacks);
   int request_id = pending_clients_callbacks_.Add(callbacks);
-  Send(new ServiceWorkerHostMsg_GetClientDocuments(
-      GetRoutingID(), request_id));
+  ServiceWorkerClientQueryOptions options;
+  options.client_type = weboptions.clientType;
+  options.include_uncontrolled = weboptions.includeUncontrolled;
+  Send(new ServiceWorkerHostMsg_GetClients(
+      GetRoutingID(), request_id, options));
 }
 
 void ServiceWorkerScriptContext::OpenWindow(
     const GURL& url, blink::WebServiceWorkerClientCallbacks* callbacks) {
   DCHECK(callbacks);
   int request_id = pending_client_callbacks_.Add(callbacks);
   Send(new ServiceWorkerHostMsg_OpenWindow(GetRoutingID(), request_id, url));
 }
 
 void ServiceWorkerScriptContext::SetCachedMetadata(const GURL& url,
@@ skipping 198 matching lines @@
           sent_message_ports, new_routing_ids,
           embedded_context_->main_thread_task_runner());
 
   blink::WebCrossOriginServiceWorkerClient web_client;
   web_client.origin = client.origin;
   web_client.targetURL = client.target_url;
   web_client.clientID = client.message_port_id;
   proxy_->dispatchCrossOriginMessageEvent(web_client, message, ports);
 }
 
-void ServiceWorkerScriptContext::OnDidGetClientDocuments(
+void ServiceWorkerScriptContext::OnDidGetClients(
     int request_id, const std::vector<ServiceWorkerClientInfo>& clients) {
   TRACE_EVENT0("ServiceWorker",
-               "ServiceWorkerScriptContext::OnDidGetClientDocuments");
+               "ServiceWorkerScriptContext::OnDidGetClients");
   blink::WebServiceWorkerClientsCallbacks* callbacks =
       pending_clients_callbacks_.Lookup(request_id);
   if (!callbacks) {
     NOTREACHED() << "Got stray response: " << request_id;
     return;
   }
   scoped_ptr<blink::WebServiceWorkerClientsInfo> info(
       new blink::WebServiceWorkerClientsInfo);
   blink::WebVector<blink::WebServiceWorkerClientInfo> convertedClients(
       clients.size());
@@ skipping 111 matching lines @@
       new blink::WebServiceWorkerError(error_type, message));
   callbacks->onError(error.release());
   pending_claim_clients_callbacks_.Remove(request_id);
 }
 
 void ServiceWorkerScriptContext::OnPing() {
   Send(new ServiceWorkerHostMsg_Pong(GetRoutingID()));
 }
 
 }  // namespace content