EME v0.1: Report defaultURL in KeyMessage.

webkit/media/webmediaplayer_proxy.cc

 // Copyright (c) 2012 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 "webkit/media/webmediaplayer_proxy.h"
 
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/message_loop_proxy.h"
 #include "media/base/pipeline_status.h"
@@ skipping 148 matching lines @@
     webmediaplayer_->OnKeyError(key_system, session_id,
                                 error_code, system_code);
 }
 
 void WebMediaPlayerProxy::KeyMessageTask(const std::string& key_system,
                                          const std::string& session_id,
                                          scoped_array<uint8> message,
                                          int message_length,
                                          const std::string& default_url) {
   DCHECK(render_loop_->BelongsToCurrentThread());
-  if (webmediaplayer_)
+  if (webmediaplayer_) {
+    const GURL default_url_gurl(default_url);
+    DLOG_IF(WARNING, !default_url.empty() && !default_url_gurl.is_valid())
+        << "Invalid URL in default_url: " << default_url.c_str();

[xhwang, 2012/12/08 01:16:44]

do you need c_str() here?

[ddorwin, 2012/12/08 01:20:58]

Yes. Without it, no newline is added and all text following default_str is
ignored.

[scherkus (not reviewing), 2012/12/11 21:07:43]

huh? what text following default_str?

[ddorwin, 2012/12/14 20:52:27]

Removed. Bug in the sample code. I updated cdm.h separately to clarify.

     webmediaplayer_->OnKeyMessage(key_system, session_id,
-                                  message.Pass(), message_length, default_url);
+                                  message.Pass(), message_length,
+                                  default_url_gurl);
+  }
 }
 
 void WebMediaPlayerProxy::NeedKeyTask(const std::string& key_system,
                                       const std::string& session_id,
                                       const std::string& type,
                                       scoped_array<uint8> init_data,
                                       int init_data_size) {
   DCHECK(render_loop_->BelongsToCurrentThread());
   if (webmediaplayer_)
     webmediaplayer_->OnNeedKey(key_system, session_id, type,
                                init_data.Pass(), init_data_size);
 }
 
 }  // namespace webkit_media