Revert 88698 - Implement AssignGLESBuffers for VideoDecode PPAPI

Fills in implementation for AssignGLESBuffers where it was missing. Also
updates OmxVideoDecodeAccelerator to reflect the changes.

BUG=NONE
TEST=NONE

Review URL: http://codereview.chromium.org/6965010

TBR=vrk@google.com
Review URL: http://codereview.chromium.org/7044115

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@88702 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 12 insertions, 7 deletions

diff --git a/media/video/picture.cc b/media/video/picture.cc
index 60fd3f5..f2d6632 100644
--- a/media/video/picture.cc
+++ b/media/video/picture.cc
@@ -15,9 +15,9 @@ BaseBuffer::~BaseBuffer() {}
 BaseBuffer::BaseBuffer(int32 id, gfx::Size size) : id_(id), size_(size) {
 }
 
-GLESBuffer::GLESBuffer(int32 id, gfx::Size size, uint32 texture_id)
-    : BaseBuffer(id, size),
-      texture_id_(texture_id) {
+GLESBuffer::GLESBuffer(
+    int32 id, gfx::Size size, uint32 texture_id, uint32 context_id)
+    : BaseBuffer(id, size), texture_id_(texture_id), context_id_(context_id) {
 }
 
 SysmemBuffer::SysmemBuffer(int32 id, gfx::Size size, void* data)
diff --git a/media/video/picture.h b/media/video/picture.h
index e28a5c4..e268c51 100644
--- a/media/video/picture.h
+++ b/media/video/picture.h
@@ -6,7 +6,6 @@
 #define MEDIA_VIDEO_PICTURE_H_
 
 #include "base/basictypes.h"
-#include "ui/gfx/gl/gl_context.h"
 #include "ui/gfx/size.h"
 
 struct PP_BufferInfo_Dev;
@@ -43,18 +42,24 @@ class BaseBuffer {
 // This is the media-namespace equivalent of PP_GLESBuffer_Dev.
 class GLESBuffer : public BaseBuffer {
  public:
-  GLESBuffer(int32 id, gfx::Size size, uint32 texture_id);
+  GLESBuffer(int32 id, gfx::Size size, uint32 texture_id, uint32 context_id);
   GLESBuffer(const PP_GLESBuffer_Dev& buffer);
 
   // Returns the id of the texture.
-  // NOTE: The texture id in the renderer process corresponds to a different
-  // texture id in the GPU process.
   uint32 texture_id() const {
     return texture_id_;
   }
 
+  // Returns the id of the context in which this texture lives.
+  // TODO(vrk): I'm not sure if "id" is what we want, or some reference to the
+  // PPB_Context3D_Dev. Not sure how this eventually gets used.
+  uint32 context_id() const {
+    return context_id_;
+  }
+
  private:
   uint32 texture_id_;
+  uint32 context_id_;
 };
 
 // A picture buffer that lives in system memory.