Update Android IPC messages to EME WD

content/renderer/media/android/renderer_media_player_manager.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/renderer/media/android/renderer_media_player_manager.h"
 
 #include "base/bind.h"
 #include "base/message_loop/message_loop.h"
 #include "content/common/media/media_player_messages_android.h"
 #include "content/renderer/media/android/proxy_media_keys.h"
@@ skipping 39 matching lines @@
     IPC_MESSAGE_HANDLER(MediaPlayerMsg_ConnectedToRemoteDevice,
                         OnConnectedToRemoteDevice)
     IPC_MESSAGE_HANDLER(MediaPlayerMsg_DisconnectedFromRemoteDevice,
                         OnDisconnectedFromRemoteDevice)
     IPC_MESSAGE_HANDLER(MediaPlayerMsg_RequestFullscreen,
                         OnRequestFullscreen)
     IPC_MESSAGE_HANDLER(MediaPlayerMsg_DidEnterFullscreen, OnDidEnterFullscreen)
     IPC_MESSAGE_HANDLER(MediaPlayerMsg_DidExitFullscreen, OnDidExitFullscreen)
     IPC_MESSAGE_HANDLER(MediaPlayerMsg_DidMediaPlayerPlay, OnPlayerPlay)
     IPC_MESSAGE_HANDLER(MediaPlayerMsg_DidMediaPlayerPause, OnPlayerPause)
-    // TODO(jrummell): Update IPC names for EME WD and add Closed.
-    IPC_MESSAGE_HANDLER(MediaKeysMsg_KeyAdded, OnSessionReady)
-    IPC_MESSAGE_HANDLER(MediaKeysMsg_KeyError, OnSessionError)
-    IPC_MESSAGE_HANDLER(MediaKeysMsg_KeyMessage, OnSessionMessage)
-    IPC_MESSAGE_HANDLER(MediaKeysMsg_SetSessionId, OnSessionCreated)
+    IPC_MESSAGE_HANDLER(MediaKeysMsg_SessionCreated, OnSessionCreated)
+    IPC_MESSAGE_HANDLER(MediaKeysMsg_SessionMessage, OnSessionMessage)
+    IPC_MESSAGE_HANDLER(MediaKeysMsg_SessionReady, OnSessionReady)
+    IPC_MESSAGE_HANDLER(MediaKeysMsg_SessionClosed, OnSessionClosed)
+    IPC_MESSAGE_HANDLER(MediaKeysMsg_SessionError, OnSessionError)
   IPC_MESSAGE_UNHANDLED(handled = false)
   IPC_END_MESSAGE_MAP()
   return handled;
 }
 
 void RendererMediaPlayerManager::Initialize(
     MediaPlayerHostMsg_Initialize_Type type,
     int player_id,
     const GURL& url,
     const GURL& first_party_for_cookies,
@@ skipping 151 matching lines @@
 
 void RendererMediaPlayerManager::InitializeCDM(int media_keys_id,
                                                ProxyMediaKeys* media_keys,
                                                const std::vector<uint8>& uuid,
                                                const GURL& frame_url) {
   RegisterMediaKeys(media_keys_id, media_keys);
   Send(new MediaKeysHostMsg_InitializeCDM(
       routing_id(), media_keys_id, uuid, frame_url));
 }
 
-void RendererMediaPlayerManager::GenerateKeyRequest(
+void RendererMediaPlayerManager::CreateSession(
     int media_keys_id,
     uint32 session_id,
     const std::string& type,
     const std::vector<uint8>& init_data) {
-  Send(new MediaKeysHostMsg_GenerateKeyRequest(
+  Send(new MediaKeysHostMsg_CreateSession(
       routing_id(), media_keys_id, session_id, type, init_data));
 }
 
-void RendererMediaPlayerManager::AddKey(int media_keys_id,
-                                        uint32 session_id,
-                                        const std::vector<uint8>& key,
-                                        const std::vector<uint8>& init_data) {
-  Send(new MediaKeysHostMsg_AddKey(
-      routing_id(), media_keys_id, session_id, key, init_data));
+void RendererMediaPlayerManager::UpdateSession(
+    int media_keys_id,
+    uint32 session_id,
+    const std::vector<uint8>& response) {
+  Send(new MediaKeysHostMsg_UpdateSession(
+      routing_id(), media_keys_id, session_id, response));
 }
 
-void RendererMediaPlayerManager::CancelKeyRequest(int media_keys_id,
-                                                  uint32 session_id) {
-  Send(new MediaKeysHostMsg_CancelKeyRequest(
+void RendererMediaPlayerManager::ReleaseSession(int media_keys_id,
+                                                uint32 session_id) {
+  Send(new MediaKeysHostMsg_ReleaseSession(
       routing_id(), media_keys_id, session_id));
 }
 
 void RendererMediaPlayerManager::OnSessionCreated(
     int media_keys_id,
     uint32 session_id,
     const std::string& web_session_id) {
+  if (web_session_id.length() > 512) {
+    OnSessionError(
+        media_keys_id, session_id, media::MediaKeys::kUnknownError, 0);
+    return;
+  }
+
   ProxyMediaKeys* media_keys = GetMediaKeys(media_keys_id);
   if (media_keys)
     media_keys->OnSessionCreated(session_id, web_session_id);
 }
 
 void RendererMediaPlayerManager::OnSessionMessage(
     int media_keys_id,
     uint32 session_id,
     const std::vector<uint8>& message,
     const std::string& destination_url) {
+  if (message.size() > 10240) {
+    OnSessionError(
+        media_keys_id, session_id, media::MediaKeys::kUnknownError, 0);
+    return;
+  }
+  if (destination_url.length() > 10240) {

[ddorwin, 2013/12/10 23:48:08]

2K is plenty for a URL.

[palmer, 2013/12/11 00:18:18]

And use a named constant. :) There might be a standard one already defined?

[jrummell, 2013/12/11 02:21:52]

Done. Can't find a constant in GURL with a max size.

+    OnSessionError(
+        media_keys_id, session_id, media::MediaKeys::kUnknownError, 0);
+    return;
+  }
+
   ProxyMediaKeys* media_keys = GetMediaKeys(media_keys_id);
   if (media_keys)
     media_keys->OnSessionMessage(session_id, message, destination_url);
 }
 
 void RendererMediaPlayerManager::OnSessionReady(int media_keys_id,
                                                 uint32 session_id) {
   ProxyMediaKeys* media_keys = GetMediaKeys(media_keys_id);
   if (media_keys)
     media_keys->OnSessionReady(session_id);
@@ skipping 115 matching lines @@
       gfx::RectF rect;
       if (player->RetrieveGeometryChange(&rect)) {
         (*changes)[player_it->first] = rect;
       }
     }
   }
 }
 #endif
 
 }  // namespace content