Clean up WebMediaPlayerAndroid needs_establish_peer_

content/renderer/media/android/webmediaplayer_android.h

 // 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.
 
 #ifndef CONTENT_RENDERER_MEDIA_ANDROID_WEBMEDIAPLAYER_ANDROID_H_
 #define CONTENT_RENDERER_MEDIA_ANDROID_WEBMEDIAPLAYER_ANDROID_H_
 
 #include <jni.h>
 #include <string>
 #include <vector>
@@ skipping 248 matching lines @@
  protected:
   // Helper method to update the playing state.
   void UpdatePlayingState(bool is_playing_);
 
   // Helper methods for posting task for setting states and update WebKit.
   void UpdateNetworkState(blink::WebMediaPlayer::NetworkState state);
   void UpdateReadyState(blink::WebMediaPlayer::ReadyState state);
   void TryCreateStreamTextureProxyIfNeeded();
   void DoCreateStreamTexture();
 
-  // Helper method to reestablish the surface texture peer for android
-  // media player.
-  void EstablishSurfaceTexturePeer();
-
-  // Requesting whether the surface texture peer needs to be reestablished.
-  void SetNeedsEstablishPeer(bool needs_establish_peer);
+  // This method is meant to be idempotent. Should be called whenever any of
+  // conditions changes and it is ok to establish peer.
+  void EstablishSurfaceTexturePeerIfNeeded();
 
  private:
   void InitializePlayer(const GURL& url,
                         const GURL& first_party_for_cookies,
                         bool allowed_stored_credentials,
                         int demuxer_client_id);
   void Pause(bool is_media_related_action);
   void DrawRemotePlaybackText(const std::string& remote_playback_message);
   void ReallocateVideoFrame();
   void SetCurrentFrameInternal(scoped_refptr<media::VideoFrame>& frame);
@@ skipping 116 matching lines @@
   // point for when the mailbox was produced.
   gpu::Mailbox texture_mailbox_;
 
   // Stream texture ID allocated to the video.
   unsigned int stream_id_;
 
   // Whether the mediaplayer is playing.
   bool is_playing_;
 
   // Whether media player needs to re-establish the surface texture peer.
+  // This should be unset in EstablishSurfaceTexturePeerIfNeeded() only, and set
+  // we believe peer is disconnected that we need to establish it again.
+  // Setting this should not be conditioned on additional state, eg playing
+  // or full screen.
   bool needs_establish_peer_;
 
+  // This is a helper state used in EstablishSurfaceTexturePeerIfNeeded().
+  bool in_fullscreen_;
+
   // Whether |stream_texture_proxy_| is initialized.
   bool stream_texture_proxy_initialized_;
 
   // Whether the video size info is available.
   bool has_size_info_;
 
   // Object for allocating stream textures.
   scoped_refptr<StreamTextureFactory> stream_texture_factory_;
 
   // Object for calling back the compositor thread to repaint the video when a
@@ skipping 72 matching lines @@
 
   // NOTE: Weak pointers must be invalidated before all other member variables.
   base::WeakPtrFactory<WebMediaPlayerAndroid> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(WebMediaPlayerAndroid);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_RENDERER_MEDIA_ANDROID_WEBMEDIAPLAYER_ANDROID_H_