From 127782bbb11da802ad2494939965cc50119ecd38 Mon Sep 17 00:00:00 2001
From: nisse <nisse@webrtc.org>
Date: Tue, 12 Jan 2016 03:39:14 -0800
Subject: [PATCH] Add default dummy implementation of
 cricket::VideoRenderer::SetSize, to easy later removal.

BUG=webrtc:5426

Review URL: https://codereview.webrtc.org/1581583002

Cr-Commit-Position: refs/heads/master@{#11218}
---
 talk/app/webrtc/videosource.cc         |  2 --
 talk/app/webrtc/videotrackrenderers.cc |  4 ----
 talk/app/webrtc/videotrackrenderers.h  |  1 -
 talk/media/base/videorenderer.h        | 11 ++++++-----
 4 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/talk/app/webrtc/videosource.cc b/talk/app/webrtc/videosource.cc
index 5bd735af1c..4b371e3ed5 100644
--- a/talk/app/webrtc/videosource.cc
+++ b/talk/app/webrtc/videosource.cc
@@ -304,8 +304,6 @@ class FrameInputWrapper : public cricket::VideoRenderer {
   virtual ~FrameInputWrapper() {}
 
   // VideoRenderer implementation.
-  bool SetSize(int width, int height, int reserved) override { return true; }
-
   bool RenderFrame(const cricket::VideoFrame* frame) override {
     if (!capturer_->IsRunning()) {
       return true;
diff --git a/talk/app/webrtc/videotrackrenderers.cc b/talk/app/webrtc/videotrackrenderers.cc
index 3c47c6edab..3f9301b718 100644
--- a/talk/app/webrtc/videotrackrenderers.cc
+++ b/talk/app/webrtc/videotrackrenderers.cc
@@ -54,10 +54,6 @@ void VideoTrackRenderers::SetEnabled(bool enable) {
   enabled_ = enable;
 }
 
-bool VideoTrackRenderers::SetSize(int width, int height, int reserved) {
-  return true;
-}
-
 bool VideoTrackRenderers::RenderFrame(const cricket::VideoFrame* frame) {
   rtc::CritScope cs(&critical_section_);
   if (!enabled_) {
diff --git a/talk/app/webrtc/videotrackrenderers.h b/talk/app/webrtc/videotrackrenderers.h
index 15274a1530..3262e22dff 100644
--- a/talk/app/webrtc/videotrackrenderers.h
+++ b/talk/app/webrtc/videotrackrenderers.h
@@ -48,7 +48,6 @@ class VideoTrackRenderers : public cricket::VideoRenderer {
   ~VideoTrackRenderers();
 
   // Implements cricket::VideoRenderer
-  virtual bool SetSize(int width, int height, int reserved);
   virtual bool RenderFrame(const cricket::VideoFrame* frame);
 
   void AddRenderer(VideoRendererInterface* renderer);
diff --git a/talk/media/base/videorenderer.h b/talk/media/base/videorenderer.h
index 0a0ee51817..a18c4e3c29 100644
--- a/talk/media/base/videorenderer.h
+++ b/talk/media/base/videorenderer.h
@@ -42,11 +42,12 @@ class VideoFrame;
 class VideoRenderer {
  public:
   virtual ~VideoRenderer() {}
-  // Called when the video has changed size. This is also used as an
-  // initialization method to set the UI size before any video frame
-  // rendered. webrtc::ExternalRenderer's FrameSizeChange will invoke this when
-  // it's called or later when a VideoRenderer is attached.
-  virtual bool SetSize(int width, int height, int reserved) = 0;
+  // Called when the video has changed size.
+  // TODO(nisse): This method is not really used, and should be
+  // deleted. Provide a default do-nothing implementation, to easy the
+  // transition as the method is deleted in subclasses, in particular,
+  // chrome's MockVideoRenderer class.
+  virtual bool SetSize(int width, int height, int reserved) { return true; };
   // Called when a new frame is available for display.
   virtual bool RenderFrame(const VideoFrame *frame) = 0;