[ServiceWorker] Mojofy InstallEvent of Service Worker

content/renderer/service_worker/service_worker_context_client.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.
 
 #ifndef CONTENT_RENDERER_SERVICE_WORKER_SERVICE_WORKER_CONTEXT_CLIENT_H_
 #define CONTENT_RENDERER_SERVICE_WORKER_SERVICE_WORKER_CONTEXT_CLIENT_H_
 
 #include <stddef.h>
 #include <stdint.h>
 
@@ skipping 195 matching lines @@
              std::unique_ptr<blink::WebServiceWorkerClientCallbacks>) override;
   void Navigate(
       const blink::WebString& uuid,
       const blink::WebURL&,
       std::unique_ptr<blink::WebServiceWorkerClientCallbacks>) override;
   void SkipWaiting(std::unique_ptr<blink::WebServiceWorkerSkipWaitingCallbacks>
                        callbacks) override;
   void Claim(std::unique_ptr<blink::WebServiceWorkerClientsClaimCallbacks>
                  callbacks) override;
   void RegisterForeignFetchScopes(
+      const int event_id,
       const blink::WebVector<blink::WebURL>& sub_scopes,
       const blink::WebVector<blink::WebSecurityOrigin>& origins) override;
 
  private:
+  // The key is the unique id of every install event.
+  using InstallEventMethodsMap =
+      std::map<int, mojom::ServiceWorkerInstallEventMethodsAssociatedPtr>;
+
   struct WorkerContextData;
   class NavigationPreloadRequest;
 
   // Get routing_id for sending message to the ServiceWorkerVersion
   // in the browser process.
   int GetRoutingID() const { return embedded_worker_id_; }
 
   void Send(IPC::Message* message);
   void SendWorkerStarted();
   void SetRegistrationInServiceWorkerGlobalScope(
       const ServiceWorkerRegistrationObjectInfo& info,
       const ServiceWorkerVersionAttributes& attrs);
 
   // mojom::ServiceWorkerEventDispatcher
+  void DispatchInstallEvent(
+      mojom::ServiceWorkerInstallEventMethodsAssociatedPtrInfo client,
+      const DispatchInstallEventCallback& callback) override;
   void DispatchActivateEvent(
       const DispatchActivateEventCallback& callback) override;
   void DispatchBackgroundFetchAbortEvent(
       const std::string& tag,
       const DispatchBackgroundFetchAbortEventCallback& callback) override;
   void DispatchBackgroundFetchClickEvent(
       const std::string& tag,
       mojom::BackgroundFetchState state,
       const DispatchBackgroundFetchClickEventCallback& callback) override;
   void DispatchBackgroundFetchFailEvent(
@@ skipping 29 matching lines @@
       const std::string& tag,
       blink::mojom::BackgroundSyncEventLastChance last_chance,
       const DispatchSyncEventCallback& callback) override;
   void DispatchPaymentRequestEvent(
       int payment_request_id,
       payments::mojom::PaymentAppRequestPtr app_request,
       payments::mojom::PaymentAppResponseCallbackPtr response_callback,
       const DispatchPaymentRequestEventCallback& callback) override;
   void Ping(const PingCallback& callback) override;
 
-  void OnInstallEvent(int request_id);
   void OnNotificationClickEvent(
       int request_id,
       const std::string& notification_id,
       const PlatformNotificationData& notification_data,
       int action_index,
       const base::NullableString16& reply);
   void OnNotificationCloseEvent(
       int request_id,
       const std::string& notification_id,
       const PlatformNotificationData& notification_data);
@@ skipping 44 matching lines @@
   // Not owned; this object is destroyed when proxy_ becomes invalid.
   blink::WebServiceWorkerContextProxy* proxy_;
 
   // This is bound on the worker thread.
   mojom::ServiceWorkerEventDispatcherRequest pending_dispatcher_request_;
 
   // This is bound on the main thread.
   scoped_refptr<mojom::ThreadSafeEmbeddedWorkerInstanceHostAssociatedPtr>
       instance_host_;
 
+  // Maps every install event id with its corresponding
+  // mojom::ServiceWorkerInstallEventMethodsAssociatedPt.
+  InstallEventMethodsMap install_methods_map_;

[shimazu, 2017/04/24 05:00:13]

Do you have any concerns to put this in WorkerContextData?
If it's possible to move this in WorkerContextData, you won't need to call
install_methods_map_.reset() when aborting.

[xiaofengzhang, 2017/04/25 06:01:29]

Done.

+
   // Renderer-side object corresponding to WebEmbeddedWorkerInstance.
   // This is valid from the ctor to workerContextDestroyed.
   std::unique_ptr<EmbeddedWorkerInstanceClientImpl> embedded_worker_client_;
 
   // Initialized on the worker thread in workerContextStarted and
   // destructed on the worker thread in willDestroyWorkerContext.
   std::unique_ptr<WorkerContextData> context_;
 
   DISALLOW_COPY_AND_ASSIGN(ServiceWorkerContextClient);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_RENDERER_SERVICE_WORKER_SERVICE_WORKER_CONTEXT_CLIENT_H_