Reland of Delete webrtc::VideoFrame::CopyFrame.

webrtc/video_frame.h

 /*
  *  Copyright (c) 2014 The WebRTC project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
@@ skipping 52 matching lines @@
   // CreateFrame: Sets the frame's members and buffers. If required size is
   // bigger than allocated one, new buffers of adequate size will be allocated.
   // |buffer| must be a packed I420 buffer.
 
   // TODO(nisse): Deprecated, see above method for advice.
   void CreateFrame(const uint8_t* buffer,
                   int width,
                   int height,
                   VideoRotation rotation);
 
-  // Deep copy frame: If required size is bigger than allocated one, new
-  // buffers of adequate size will be allocated.
-  // TODO(nisse): Should be deleted in the cricket::VideoFrame and
-  // webrtc::VideoFrame merge. Instead, use I420Buffer::Copy to make a copy of
-  // the pixel data, and use the constructor to wrap it into a VideoFrame.
-  void CopyFrame(const VideoFrame& videoFrame);
-
   // Creates a shallow copy of |videoFrame|, i.e, the this object will retain a
   // reference to the video buffer also retained by |videoFrame|.
   // TODO(nisse): Deprecated. Should be deleted in the cricket::VideoFrame and
   // webrtc::VideoFrame merge. Instead, pass video_frame_buffer() and timestamps
   // to the constructor.
   void ShallowCopy(const VideoFrame& videoFrame);
 
   // Get frame width.
   int width() const;
 
@@ skipping 123 matching lines @@
   int qp_ = -1;  // Quantizer value.
 
   // When an application indicates non-zero values here, it is taken as an
   // indication that all future frames will be constrained with those limits
   // until the application indicates a change again.
   PlayoutDelay playout_delay_ = {-1, -1};
 };
 
 }  // namespace webrtc
 #endif  // WEBRTC_VIDEO_FRAME_H_