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

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

Issue 1569543002: Revert of Apply the Surface Texture transformation matrix during texture copy. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 11 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
« no previous file with comments | « no previous file | content/common/gpu/stream_texture_android.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/common/gpu/stream_texture_android.h
diff --git a/content/common/gpu/stream_texture_android.h b/content/common/gpu/stream_texture_android.h
index e19fc1b321a23cff8c83892b195c7517fa2113e7..a5afb8eaca0ec01d2256c3c642acc50f70eb4ecc 100644
--- a/content/common/gpu/stream_texture_android.h
+++ b/content/common/gpu/stream_texture_android.h
@@ -13,10 +13,6 @@
#include "ipc/ipc_listener.h"
#include "ui/gl/android/surface_texture.h"
#include "ui/gl/gl_image.h"
-
-namespace ui {
-class ScopedMakeCurrent;
-}
namespace gfx {
class Size;
@@ -60,10 +56,6 @@
// GpuCommandBufferStub::DestructionObserver implementation.
void OnWillDestroyStub() override;
- scoped_ptr<ui::ScopedMakeCurrent> MakeStubCurrent();
-
- void UpdateTexImage();
-
// Called when a new frame is available for the SurfaceTexture.
void OnFrameAvailable();
@@ -94,13 +86,6 @@
bool has_listener_;
uint32_t texture_id_;
- unsigned framebuffer_;
- unsigned vertex_shader_;
- unsigned fragment_shader_;
- unsigned program_;
- unsigned vertex_buffer_;
- int u_xform_location_;
-
base::WeakPtrFactory<StreamTexture> weak_factory_;
DISALLOW_COPY_AND_ASSIGN(StreamTexture);
};
« no previous file with comments | « no previous file | content/common/gpu/stream_texture_android.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698