Snapshot of all changes to get jumbo in blink and content.

content/renderer/media/media_stream_video_track.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/media_stream_video_track.h"
 
 #include <string>
 #include <utility>
 
 #include "base/bind.h"
 #include "base/location.h"
 #include "base/macros.h"
 #include "base/memory/ptr_util.h"
 #include "base/single_thread_task_runner.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "build/build_config.h"
 #include "content/renderer/media/media_stream_constraints_util_video_device.h"
 #include "media/capture/video_capture_types.h"
 
 namespace content {
 
 namespace {
 void ResetCallback(std::unique_ptr<VideoCaptureDeliverFrameCB> callback) {
   // |callback| will be deleted when this exits.
 }
 
 // Empty method used for keeping a reference to the original media::VideoFrame.
 // The reference to |frame| is kept in the closure that calls this method.
-void ReleaseOriginalFrame(const scoped_refptr<media::VideoFrame>& frame) {
+void ReleaseOriginalVideoFrame(const scoped_refptr<media::VideoFrame>& frame) {
 }
 
 }  // namespace
 
 // MediaStreamVideoTrack::FrameDeliverer is a helper class used for registering
 // VideoCaptureDeliverFrameCB on the main render thread to receive video frames
 // on the IO-thread.
 // Frames are only delivered to the sinks if the track is enabled. If the track
 // is disabled, a black frame is instead forwarded to the sinks at the same
 // frame rate.
@@ skipping 139 matching lines @@
 
   // Wrap |black_frame_| so we get a fresh timestamp we can modify. Frames
   // returned from this function may still be in use.
   scoped_refptr<media::VideoFrame> wrapped_black_frame =
       media::VideoFrame::WrapVideoFrame(black_frame_, black_frame_->format(),
                                         black_frame_->visible_rect(),
                                         black_frame_->natural_size());
   if (!wrapped_black_frame)
     return nullptr;
   wrapped_black_frame->AddDestructionObserver(
-      base::Bind(&ReleaseOriginalFrame, black_frame_));
+      base::Bind(&ReleaseOriginalVideoFrame, black_frame_));
 
   wrapped_black_frame->set_timestamp(reference_frame->timestamp());
   base::TimeTicks reference_time;
   if (reference_frame->metadata()->GetTimeTicks(
           media::VideoFrameMetadata::REFERENCE_TIME, &reference_time)) {
     wrapped_black_frame->metadata()->SetTimeTicks(
         media::VideoFrameMetadata::REFERENCE_TIME, reference_time);
   }
 
   return wrapped_black_frame;
@@ skipping 207 matching lines @@
 }
 
 void MediaStreamVideoTrack::OnReadyStateChanged(
     blink::WebMediaStreamSource::ReadyState state) {
   DCHECK(main_render_thread_checker_.CalledOnValidThread());
   for (auto* sink : sinks_)
     sink->OnReadyStateChanged(state);
 }
 
 }  // namespace content