Media Remoting: Remove old interstitial implementation.

media/remoting/renderer_controller.h

 // Copyright 2016 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.
 
 #ifndef MEDIA_REMOTING_RENDERER_CONTROLLER_H_
 #define MEDIA_REMOTING_RENDERER_CONTROLLER_H_
 
 #include "base/callback.h"
 #include "base/memory/weak_ptr.h"
 #include "base/optional.h"
 #include "media/base/media_observer.h"
-#include "media/remoting/interstitial.h"
 #include "media/remoting/metrics.h"
 #include "media/remoting/shared_session.h"
 #include "third_party/skia/include/core/SkBitmap.h"

[miu, 2017/04/13 02:15:10]

Can we remove the SkBitmap #include?

[xjz, 2017/04/13 23:48:36]

Yes. Done.

 
 namespace media {
 namespace remoting {
 
 class RpcBroker;
 
 // This class:
 // 1) Implements the SharedSession::Client;
 // 2) Monitors player events as a MediaObserver;
 // 3) May trigger the switch of the media renderer between local playback
@@ skipping 10 matching lines @@
 
   // MediaObserver implementation.
   void OnEnteredFullscreen() override;
   void OnExitedFullscreen() override;
   void OnBecameDominantVisibleContent(bool is_dominant) override;
   void OnSetCdm(CdmContext* cdm_context) override;
   void OnMetadataChanged(const PipelineMetadata& metadata) override;
   void OnRemotePlaybackDisabled(bool disabled) override;
   void OnPlaying() override;
   void OnPaused() override;
-  void OnSetPoster(const GURL& poster) override;
+  void OnSetPoster(const GURL& poster) override {}

[miu, 2017/04/13 02:15:10]

We should remove OnSetPoster() from the interface, and the calls to it from
WMPI. Unless something else is using it?

[xjz, 2017/04/13 23:48:36]

Done.

   void SetClient(MediaObserverClient* client) override;
 
-  using ShowInterstitialCallback = base::Callback<
-      void(const SkBitmap&, const gfx::Size&, InterstitialType type)>;
-  // Called by the CourierRenderer constructor to set the callback to draw and
-  // show remoting interstial.
-  void SetShowInterstitialCallback(const ShowInterstitialCallback& cb);
-  using DownloadPosterCallback =
-      base::Callback<void(const GURL&,
-                          const base::Callback<void(const SkBitmap&)>&)>;
-  // Set the callback to download poster image.
-  void SetDownloadPosterCallback(const DownloadPosterCallback& cb);
-
   base::WeakPtr<RendererController> GetWeakPtr() {
     return weak_factory_.GetWeakPtr();
   }
 
   // Used by AdaptiveRendererFactory to query whether to create a Media
   // Remoting Renderer.
   bool remote_rendering_started() const {
     DCHECK(thread_checker_.CalledOnValidThread());
     return remote_rendering_started_;
   }
@@ skipping 36 matching lines @@
   // Helper to decide whether to enter or leave Remoting mode.
   bool ShouldBeRemoting();
 
   // Determines whether to enter or leave Remoting mode and switches if
   // necessary. Each call to this method could cause a remoting session to be
   // started or stopped; and if that happens, the |start_trigger| or
   // |stop_trigger| must be the reason.
   void UpdateAndMaybeSwitch(StartTrigger start_trigger,
                             StopTrigger stop_trigger);
 
-  // Called to download the poster image. Called when:
-  // 1. Poster URL changes.
-  // 2. ShowInterstitialCallback is set.
-  // 3. DownloadPosterCallback is set.
-  void DownloadPosterImage();
-
-  // Called when poster image is downloaded.
-  void OnPosterImageDownloaded(const GURL& download_url,
-                               base::TimeTicks download_start_time,
-                               const SkBitmap& image);
-
-  // Update remoting interstitial with |image|. When |image| is not set,
-  // interstitial will be drawn on previously downloaded poster image (in
-  // CourierRenderer) or black background if none was downloaded before.
-  // Call this when:
-  // 1. SetShowInterstitialCallback() is called (CourierRenderer is created).
-  // 2. The remoting session is shut down (to update the status message in the
-  //    interstitial).
-  // 3. The size of the canvas is changed (to update the background image and
-  //    the position of the status message).
-  // 4. Poster image is downloaded (to update the background image).
-  void UpdateInterstitial(const base::Optional<SkBitmap>& image);
-
   // Indicates whether this media element is in full screen.
   bool is_fullscreen_ = false;
 
   // Indicates whether remoting is started.
   bool remote_rendering_started_ = false;
 
   // Indicates whether audio or video is encrypted.
   bool is_encrypted_ = false;
 
   // Indicates whether remote playback is currently disabled. This starts out as
@@ skipping 24 matching lines @@
   // replaced with a different instance later if OnSetCdm() is called.
   scoped_refptr<SharedSession> session_;
 
   // This is used to check all the methods are called on the current thread in
   // debug builds.
   base::ThreadChecker thread_checker_;
 
   // Current pipeline metadata.
   PipelineMetadata pipeline_metadata_;
 
-  // The callback to show the remoting interstitial. It is set shortly after
-  // remoting is started (when CourierRenderer is constructed, it calls
-  // SetShowInterstitialCallback()), and is reset shortly after remoting has
-  // ended.
-  ShowInterstitialCallback show_interstitial_cb_;
-
-  // The arguments passed in the last call to the interstitial callback. On each
-  // call to UpdateInterstitial(), one or more of these may be changed. If any
-  // change, the callback will be run.
-  SkBitmap interstitial_background_;
-  gfx::Size interstitial_natural_size_;
-  InterstitialType interstitial_type_ = InterstitialType::BETWEEN_SESSIONS;
-
-  // Current poster URL, whose image will feed into the local UI.
-  GURL poster_url_;
-
-  // The callback to download the poster image. Called when |poster_url_|
-  // changes during a remoting session or the show interstial callback is set.
-  // OnPosterImageDownloaded() will be called when download completes.
-  DownloadPosterCallback download_poster_cb_;
-
   // Records session events of interest.
   SessionMetricsRecorder metrics_recorder_;
 
   // Not own by this class. Can only be set once by calling SetClient().
   MediaObserverClient* client_ = nullptr;
 
   base::WeakPtrFactory<RendererController> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(RendererController);
 };
 
 }  // namespace remoting
 }  // namespace media
 
 #endif  // MEDIA_REMOTING_RENDERER_CONTROLLER_H_