Removed the use of WebFrame::frameForCurrentContext() in MediaStreamCenter::didStopLocalMediaStream

content/renderer/media/media_stream_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 "content/renderer/media/media_stream_impl.h"
 
 #include <utility>
 
 #include "base/logging.h"
 #include "base/string_number_conversions.h"
@@ skipping 51 matching lines @@
     MediaStreamDependencyFactory* dependency_factory)
     : content::RenderViewObserver(render_view),
       dependency_factory_(dependency_factory),
       media_stream_dispatcher_(media_stream_dispatcher),
       vc_manager_(vc_manager) {
 }
 
 MediaStreamImpl::~MediaStreamImpl() {
 }
 
-void MediaStreamImpl::StopLocalMediaStream(
-    const WebKit::WebMediaStreamDescriptor& stream) {
-  DVLOG(1) << "MediaStreamImpl::StopLocalMediaStream";
-
-  MediaStreamExtraData* extra_data =
-      static_cast<MediaStreamExtraData*>(stream.extraData());
-  if (extra_data && extra_data->local_stream()) {
-    media_stream_dispatcher_->StopStream(extra_data->local_stream()->label());
-    local_media_streams_.erase(extra_data->local_stream()->label());
-  } else {
-    NOTREACHED();
-  }
+void MediaStreamImpl::OnLocalMediaStreamStop(const std::string& label) {
+  DVLOG(1) << "MediaStreamImpl::OnLocalMediaStreamStop";
+  media_stream_dispatcher_->StopStream(label);
+  local_media_streams_.erase(label);
 }
 
 void MediaStreamImpl::requestUserMedia(
     const WebKit::WebUserMediaRequest& user_media_request,
     const WebKit::WebVector<WebKit::WebMediaStreamSource>& audio_sources,
     const WebKit::WebVector<WebKit::WebMediaStreamSource>& video_sources) {
   // Save histogram data so we can see how much GetUserMedia is used.
   // The histogram counts the number of calls to the JS API
   // webGetUserMedia.
   UpdateWebRTCMethodCount(WEBKIT_GET_USER_MEDIA);
@@ skipping 104 matching lines @@
     DVLOG(1) << "Request ID not found";
     media_stream_dispatcher_->StopStream(label);
     return;
   }
 
   WebKit::WebString webkit_label = UTF8ToUTF16(label);
   WebKit::WebMediaStreamDescriptor description;
   description.initialize(webkit_label, audio_source_vector,
                          video_source_vector);
 
-  if (!dependency_factory_->CreateNativeLocalMediaStream(&description)) {
+  if (!dependency_factory_->CreateNativeLocalMediaStream(
+      &description, base::Bind(&MediaStreamImpl::OnLocalMediaStreamStop,

[tommi (sloooow) - chröme, 2012/09/21 09:18:03]

indent

[perkj_chrome, 2012/09/21 10:47:10]

? What is wrong with this?

[tommi (sloooow) - chröme, 2012/09/21 11:23:53]

MyFunction(
bar, baz);

should in Chrome be

MyFunction(
    bar, baz);

Also, since that uses 4 space indent, then the indent of the nested base::Bind()
call should also do that.  I.e. avoid mixing indent styles.

+                               base::Unretained(this)))) {
     DVLOG(1) << "Failed to create native stream in OnStreamGenerated.";
     media_stream_dispatcher_->StopStream(label);
     it->second.request_.requestFailed();
     user_media_requests_.erase(it);
     return;
   }
   local_media_streams_[label] = it->second.frame_;
   CompleteGetUserMediaRequest(description, &it->second.request_);
   user_media_requests_.erase(it);
 }
@@ skipping 131 matching lines @@
   return new RTCVideoDecoder(
       message_loop_factory->GetMessageLoop(media::MessageLoopFactory::kDecoder),
       base::MessageLoopProxy::current(),
       stream->video_tracks()->at(0));
 }
 
 MediaStreamExtraData::MediaStreamExtraData(
     webrtc::MediaStreamInterface* remote_stream)
     : remote_stream_(remote_stream) {
 }
+
 MediaStreamExtraData::MediaStreamExtraData(
     webrtc::LocalMediaStreamInterface* local_stream)
     : local_stream_(local_stream) {
 }
+
+void MediaStreamExtraData::SetLocalStreamStopCallback(
+    const StreamStopCallback& stop_callback) {
+  stream_stop_callback_ = stop_callback;
+}
+
 MediaStreamExtraData::~MediaStreamExtraData() {
 }
+
+void MediaStreamExtraData::RunStreamStopCallback() {
+  if (!stream_stop_callback_.is_null()) {
+    stream_stop_callback_.Run(local_stream_->label());
+  }
+}