Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(596)

Unified Diff: content/common/gpu/stream_texture_manager_android.h

Issue 22824009: Remove StreamTextureManager (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: content/common/gpu/stream_texture_manager_android.h
diff --git a/content/common/gpu/stream_texture_manager_android.h b/content/common/gpu/stream_texture_manager_android.h
deleted file mode 100644
index 9421d6a0352a59fb7e32fb04de930b14e9cc7e2e..0000000000000000000000000000000000000000
--- a/content/common/gpu/stream_texture_manager_android.h
+++ /dev/null
@@ -1,112 +0,0 @@
-// Copyright (c) 2012 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_COMMON_GPU_STREAM_TEXTURE_MANAGER_ANDROID_H_
-#define CONTENT_COMMON_GPU_STREAM_TEXTURE_MANAGER_ANDROID_H_
-
-#include "base/callback.h"
-#include "base/id_map.h"
-#include "base/memory/scoped_ptr.h"
-#include "base/memory/weak_ptr.h"
-#include "content/common/android/surface_texture_peer.h"
-#include "gpu/command_buffer/service/stream_texture.h"
-#include "gpu/command_buffer/service/stream_texture_manager.h"
-
-struct GpuStreamTextureMsg_MatrixChanged_Params;
-
-namespace gfx {
-class Size;
-class SurfaceTextureBridge;
-}
-
-namespace content {
-class GpuChannel;
-
-// Class for managing the stream texture.
-class StreamTextureManagerAndroid : public gpu::StreamTextureManager {
- public:
- StreamTextureManagerAndroid(GpuChannel* channel);
- virtual ~StreamTextureManagerAndroid();
-
- // implement gpu::StreamTextureManager:
- virtual GLuint CreateStreamTexture(uint32 service_id,
- uint32 client_id) OVERRIDE;
- virtual void DestroyStreamTexture(uint32 service_id) OVERRIDE;
- virtual gpu::StreamTexture* LookupStreamTexture(uint32 service_id) OVERRIDE;
-
- // Methods invoked from GpuChannel.
- void RegisterStreamTextureProxy(int32 stream_id, int32 route_id);
- void EstablishStreamTexture(
- int32 stream_id, int32 primary_id, int32 secondary_id);
- void SetStreamTextureSize(int32 stream_id, const gfx::Size& size);
-
- // Send new transform matrix.
- void SendMatrixChanged(int route_id,
- const GpuStreamTextureMsg_MatrixChanged_Params& params);
-
- private:
- // The stream texture class for android.
- class StreamTextureAndroid
- : public gpu::StreamTexture,
- public base::SupportsWeakPtr<StreamTextureAndroid> {
- public:
- StreamTextureAndroid(GpuChannel* channel, int service_id);
- virtual ~StreamTextureAndroid();
-
- virtual void Update() OVERRIDE;
- virtual gfx::Size GetSize() OVERRIDE;
-
- scoped_refptr<gfx::SurfaceTextureBridge> surface_texture_bridge() {
- return surface_texture_bridge_;
- }
-
- // Called when a new frame is available.
- void OnFrameAvailable(int route_id);
-
- // Set surface texture size.
- void SetSize(const gfx::Size& size) { size_ = size; }
-
- // Callback function when transform matrix of the surface texture
- // has changed.
- typedef base::Callback<
- void(const GpuStreamTextureMsg_MatrixChanged_Params&)>
- MatrixChangedCB;
-
- void set_matrix_changed_callback(const MatrixChangedCB& callback) {
- matrix_callback_ = callback;
- }
-
- private:
- scoped_refptr<gfx::SurfaceTextureBridge> surface_texture_bridge_;
-
- // Current transform matrix of the surface texture.
- float current_matrix_[16];
-
- // Current size of the surface texture.
- gfx::Size size_;
-
- // Whether the surface texture has been updated.
- bool has_updated_;
-
- MatrixChangedCB matrix_callback_;
-
- GpuChannel* channel_;
- DISALLOW_COPY_AND_ASSIGN(StreamTextureAndroid);
- };
-
- GpuChannel* channel_;
-
- typedef IDMap<StreamTextureAndroid, IDMapOwnPointer> TextureMap;
- TextureMap textures_;
-
- // Map for more convenient lookup.
- typedef IDMap<gpu::StreamTexture, IDMapExternalPointer> TextureServiceIdMap;
- TextureServiceIdMap textures_from_service_id_;
-
- DISALLOW_COPY_AND_ASSIGN(StreamTextureManagerAndroid);
-};
-
-} // namespace content
-
-#endif // CONTENT_COMMON_GPU_STREAM_TEXTURE_MANAGER_ANDROID_H_

Powered by Google App Engine
This is Rietveld 408576698