Update MediaKeySession to keep related code blocks together

third_party/WebKit/Source/modules/encryptedmedia/MediaKeySession.h

 /*
  * Copyright (C) 2013 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 70 matching lines @@
   double expiration() const { return m_expiration; }
   ScriptPromise closed(ScriptState*);
   MediaKeyStatusMap* keyStatuses();
   DEFINE_ATTRIBUTE_EVENT_LISTENER(keystatuseschange);
   DEFINE_ATTRIBUTE_EVENT_LISTENER(message);
 
   ScriptPromise generateRequest(ScriptState*,
                                 const String& initDataType,
                                 const DOMArrayPiece& initData);
   ScriptPromise load(ScriptState*, const String& sessionId);
-
   ScriptPromise update(ScriptState*, const DOMArrayPiece& response);
   ScriptPromise close(ScriptState*);
   ScriptPromise remove(ScriptState*);
 
   // EventTarget
   const AtomicString& interfaceName() const override;
   ExecutionContext* getExecutionContext() const override;
 
   // ScriptWrappable
   bool hasPendingActivity() const final;
 
   // ActiveDOMObject
   void contextDestroyed() override;
 
   DECLARE_VIRTUAL_TRACE();
 
  private:
   class PendingAction;
   friend class NewSessionResultPromise;
   friend class LoadSessionResultPromise;
 
   MediaKeySession(ScriptState*, MediaKeys*, WebEncryptedMediaSessionType);
   void dispose();
 
   void actionTimerFired(TimerBase*);
 
+  // The following perform the asynchronous part of the command referenced.
+  void generateRequestTask(ContentDecryptionModuleResult*,
+                           WebEncryptedMediaInitDataType,
+                           DOMArrayBuffer* initDataBuffer);
+  void finishGenerateRequest();
+  void loadTask(ContentDecryptionModuleResult*, const String& sessionId);
+  void finishLoad();
+  void updateTask(ContentDecryptionModuleResult*,
+                  DOMArrayBuffer* sanitizedResponse);
+  void closeTask(ContentDecryptionModuleResult*);
+  void removeTask(ContentDecryptionModuleResult*);
+
   // WebContentDecryptionModuleSession::Client
   void message(MessageType,
                const unsigned char* message,
                size_t messageLength) override;
   void close() override;
   void expirationChanged(double updatedExpiryTimeInMS) override;
   void keysStatusesChange(const WebVector<WebEncryptedMediaKeyInformation>&,
                           bool hasAdditionalUsableKey) override;
 
-  // Called by NewSessionResult when the new session has been created.
-  void finishGenerateRequest();
-
-  // Called by LoadSessionResult when the session has been loaded.
-  void finishLoad();
-
   Member<GenericEventQueue> m_asyncEventQueue;
   std::unique_ptr<WebContentDecryptionModuleSession> m_session;
 
   // Used to determine if MediaKeys is still active.
   WeakMember<MediaKeys> m_mediaKeys;
 
   // Session properties.
   WebEncryptedMediaSessionType m_sessionType;
   double m_expiration;
   Member<MediaKeyStatusMap> m_keyStatusesMap;
@@ skipping 10 matching lines @@
       ClosedPromise;
   Member<ClosedPromise> m_closedPromise;
 
   HeapDeque<Member<PendingAction>> m_pendingActions;
   Timer<MediaKeySession> m_actionTimer;
 };
 
 }  // namespace blink
 
 #endif  // MediaKeySession_h