Remove StreamTextureManager

ui/gl/android/gl_image_stream.cc

+// Copyright (c) 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.
+
+#include "ui/gl/android/gl_image_stream.h"
+
+#include "base/bind.h"
+#include "ui/gfx/size.h"
+#include "ui/gl/android/surface_texture_bridge.h"
+#include "ui/gl/gl_bindings.h"
+
+namespace gfx {
+
+GLImageStream::GLImageStream(uint32 texture_id)
+    : has_updated_(false),
+      surface_texture_bridge_(new gfx::SurfaceTextureBridge(texture_id)) {
+  memset(&current_matrix_, 0, sizeof(current_matrix_));
+}
+
+GLImageStream::~GLImageStream() {}
+
+void GLImageStream::Destroy() {
+}
+
+gfx::Size GLImageStream::GetSize() {
+  return size_;
+}
+
+void GLImageStream::UpdateTexImage() {
+  surface_texture_bridge_->UpdateTexImage();
+  if (matrix_callback_.is_null())
+    return;
+
+  Matrix new_matrix;
+  surface_texture_bridge_->GetTransformMatrix(new_matrix.components);
+
+  // Only query the matrix once we have bound a valid frame.
+  if (has_updated_ &&
+      memcmp(&current_matrix_, &new_matrix, sizeof(new_matrix)) != 0) {
+    memcpy(&current_matrix_, &new_matrix, sizeof(new_matrix));
+    matrix_callback_.Run(new_matrix);
+  }
+}
+
+SurfaceTextureBridge* GLImageStream::GetSurfaceTexture()
+{

[piman, 2013/08/13 00:52:04]

nit: { on previous line

[no sievers, 2013/08/14 04:01:23]

Done.

+  return surface_texture_bridge_;
+}
+
+void GLImageStream::SetFrameAvailableCallback(const base::Closure& callback) {
+  frame_callback_ = callback;
+  base::Closure frame_cb = base::Bind(&GLImageStream::OnFrameAvailable, this);
+  surface_texture_bridge_->SetFrameAvailableCallback(frame_cb);

[piman, 2013/08/13 00:52:04]

Doesn't this cause a reference cycle?
frame_cb references this, this references surface_texture_bridge_ and
surface_texture_bridge_ references frame_cb (its storage is refcounted).

[no sievers, 2013/08/14 04:01:23]

Thanks, no point for the callback to add a ref back to |this| anyway. I added a
weak ptr factory.

+}
+
+void GLImageStream::OnFrameAvailable() {
+  has_updated_ = true;
+  frame_callback_.Run();
+}
+
+bool GLImageStream::BindTexImageExternal() {
+  surface_texture_bridge_->AttachToGLContext();
+  return true;
+}
+
+void GLImageStream::ReleaseTexImageExternal() {
+  surface_texture_bridge_->DetachFromGLContext();
+}
+
+}  // namespace gfx