commit 87e2af31b90edee8e4edb8798188b84e22ab3cb8
author Bo Liu <boliu@google.com> Mon Sep 15 13:52:31 2014 -0700
committer Bo Liu <boliu@google.com> Wed Sep 17 08:43:54 2014 -0700
tree c55bd770e0b7b5797ac992bf21bf7501a3c9e630
parent d8024ab0a038fddb82e77aed15fe14c253321b56

Compile fix for cherry-pick

Compile fixes for crrev.com/7a2b1cb83546418638417fc4d3c9aa6172fe02e9

BUG: 17354106

Change-Id: I3e07ab4bfd36c17ce006a73f44402251d5c83138

content/renderer/media/android/webmediaplayer_android.cc

diff --git a/content/renderer/media/android/webmediaplayer_android.cc b/content/renderer/media/android/webmediaplayer_android.cc
index 64202b9..7edcc61 100644
--- a/content/renderer/media/android/webmediaplayer_android.cc
+++ b/content/renderer/media/android/webmediaplayer_android.cc
@@ -1081,13 +1081,11 @@
     video_frame = current_frame_;
   }
 
-  if (!stream_texture_proxy_initialized_ && stream_texture_proxy_ &&
+  if (stream_texture_proxy_ &&
       stream_id_ && !needs_external_surface_ && !is_remote_) {
     gfx::Size natural_size = video_frame->natural_size();
     // TODO(sievers): These variables are accessed on the wrong thread here.
-    stream_texture_proxy_->BindToCurrentThread(stream_id_);
     stream_texture_factory_->SetStreamTextureSize(stream_id_, natural_size);
-    stream_texture_proxy_initialized_ = true;
     cached_stream_texture_size_ = natural_size;
   }
 
@@ -1111,7 +1109,7 @@
   stream_texture_proxy_.reset();
   needs_establish_peer_ = !needs_external_surface_ && !is_remote_ &&
                           !player_manager_->IsInFullscreen(frame_) &&
-                          (hasVideo() || IsHLSStream());
+                          hasVideo();
 
   TryCreateStreamTextureProxyIfNeeded();
   if (needs_establish_peer_ && is_playing_)