Make RendererMediaPlayerManager a RenderFrameObserver.

content/renderer/media/android/stream_texture_factory_impl.cc

 // Copyright 2014 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.
 
 #include "content/renderer/media/android/stream_texture_factory_impl.h"
 
 #include "cc/output/context_provider.h"
 #include "content/common/gpu/client/gpu_channel_host.h"
 #include "content/common/gpu/gpu_messages.h"
 #include "content/renderer/gpu/stream_texture_host_android.h"
@@ skipping 63 matching lines @@
   if (client_)
     client_->DidUpdateMatrix(matrix);
 }
 
 }  // namespace
 
 // static
 scoped_refptr<StreamTextureFactoryImpl> StreamTextureFactoryImpl::Create(
     const scoped_refptr<cc::ContextProvider>& context_provider,
     GpuChannelHost* channel,
-    int view_id) {
-  return new StreamTextureFactoryImpl(context_provider, channel, view_id);
+    int frame_id) {
+  return new StreamTextureFactoryImpl(context_provider, channel, frame_id);
 }
 
 StreamTextureFactoryImpl::StreamTextureFactoryImpl(
     const scoped_refptr<cc::ContextProvider>& context_provider,
     GpuChannelHost* channel,
-    int view_id)
+    int frame_id)
     : context_provider_(context_provider),
       channel_(channel),
-      view_id_(view_id) {
+      frame_id_(frame_id) {
   DCHECK(channel);
 }
 
 StreamTextureFactoryImpl::~StreamTextureFactoryImpl() {}
 
 StreamTextureProxy* StreamTextureFactoryImpl::CreateProxy() {
   DCHECK(channel_.get());
   StreamTextureHost* host = new StreamTextureHost(channel_.get());
   return new StreamTextureProxyImpl(host);
 }
 
 void StreamTextureFactoryImpl::EstablishPeer(int32 stream_id, int player_id) {
   DCHECK(channel_.get());
   channel_->Send(
-      new GpuStreamTextureMsg_EstablishPeer(stream_id, view_id_, player_id));
+      new GpuStreamTextureMsg_EstablishPeer(stream_id, frame_id_, player_id));
 }
 
 unsigned StreamTextureFactoryImpl::CreateStreamTexture(
     unsigned texture_target,
     unsigned* texture_id,
     gpu::Mailbox* texture_mailbox) {
   GLuint stream_id = 0;
   gpu::gles2::GLES2Interface* gl = context_provider_->ContextGL();
   gl->GenTextures(1, texture_id);
 
   stream_id = gl->CreateStreamTextureCHROMIUM(*texture_id);
 
   gl->GenMailboxCHROMIUM(texture_mailbox->name);
   gl->BindTexture(texture_target, *texture_id);
   gl->ProduceTextureCHROMIUM(texture_target, texture_mailbox->name);
   return stream_id;
 }
 
 void StreamTextureFactoryImpl::SetStreamTextureSize(int32 stream_id,
                                                     const gfx::Size& size) {
   channel_->Send(new GpuStreamTextureMsg_SetSize(stream_id, size));
 }
 
 gpu::gles2::GLES2Interface* StreamTextureFactoryImpl::ContextGL() {
   return context_provider_->ContextGL();
 }
 
 }  // namespace content