Implement sourceAddId() & sourceRemoveId()

webkit/media/webmediaplayer_impl.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_impl.h"
 
 #include <limits>
 #include <string>
 
 #include "base/bind.h"
@@ skipping 623 matching lines @@
   if (web_video_frame) {
     scoped_refptr<media::VideoFrame> video_frame(
         WebVideoFrameImpl::toVideoFrame(web_video_frame));
     proxy_->PutCurrentFrame(video_frame);
     delete web_video_frame;
   } else {
     proxy_->PutCurrentFrame(NULL);
   }
 }
 
+WebKit::WebMediaPlayer::AddIdStatus WebMediaPlayerImpl::sourceAddId(
+    const WebKit::WebString& id,
+    const WebKit::WebString& type) {
+    DCHECK_EQ(main_loop_, MessageLoop::current());
+    DCHECK(!id.isEmpty());

[scherkus (not reviewing), 2012/04/12 20:58:32]

are these actually DCHECK worthy?

are we protected against WebKit or JS code? if JS code can call addId("", "")
and that code hits a DCHECK here that's bad and we should remove the DCHECK

[acolwell GONE FROM CHROMIUM, 2012/04/12 22:43:12]

Done.

+    DCHECK(!type.isEmpty());
+
+    return static_cast<WebKit::WebMediaPlayer::AddIdStatus>(

[scherkus (not reviewing), 2012/04/12 20:58:32]

do we have compile asserts to back the static_cast<> up?

check out COMPILE_ASSERT_MATCHING_ENUM in this file

[acolwell GONE FROM CHROMIUM, 2012/04/12 22:43:12]

Done.

+        proxy_->DemuxerAddId(id.utf8().data(), type.utf8().data()));
+}
+
+void WebMediaPlayerImpl::sourceRemoveId(const WebKit::WebString& id) {
+  DCHECK(!id.isEmpty());
+  proxy_->DemuxerRemoveId(id.utf8().data());
+}
+
 bool WebMediaPlayerImpl::sourceAppend(const unsigned char* data,
                                       unsigned length) {
+  return sourceAppend(WebKit::WebString::fromUTF8("DefaultSourceId"),
+                      data, length);
+}
+
+bool WebMediaPlayerImpl::sourceAppend(const WebKit::WebString& id,
+                                      const unsigned char* data,
+                                      unsigned length) {
   DCHECK_EQ(main_loop_, MessageLoop::current());
-  return proxy_->DemuxerAppend(data, length);
+  DCHECK(!id.isEmpty());

[scherkus (not reviewing), 2012/04/12 20:58:32]

ditto on these DCHECKs

[acolwell GONE FROM CHROMIUM, 2012/04/12 22:43:12]

Done.

+  DCHECK(data);
+  DCHECK_GT(length, 0u);
+  return proxy_->DemuxerAppend(id.utf8().data(), data, length);
 }
 
 void WebMediaPlayerImpl::sourceEndOfStream(
     WebKit::WebMediaPlayer::EndOfStreamStatus status) {
   DCHECK_EQ(main_loop_, MessageLoop::current());
   media::PipelineStatus pipeline_status = media::PIPELINE_OK;
 
   switch(status) {
     case WebKit::WebMediaPlayer::EosNoError:
       break;
@@ skipping 256 matching lines @@
   return audio_source_provider_;
 }
 
 void WebMediaPlayerImpl::IncrementExternallyAllocatedMemory() {
   DCHECK_EQ(main_loop_, MessageLoop::current());
   incremented_externally_allocated_memory_ = true;
   v8::V8::AdjustAmountOfExternalAllocatedMemory(kPlayerExtraMemory);
 }
 
 }  // namespace webkit_media