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

Unified Diff: gpu/ipc/service/stream_texture_android.cc

Issue 2264403003: Remove unused variables in StreamTexure (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 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
« no previous file with comments | « gpu/ipc/service/stream_texture_android.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: gpu/ipc/service/stream_texture_android.cc
diff --git a/gpu/ipc/service/stream_texture_android.cc b/gpu/ipc/service/stream_texture_android.cc
index 684099330ff20a4f94782496c0d9adccec0fc3dc..7d556b4dc81757ab8f3cd8ddbc64f410753a5def 100644
--- a/gpu/ipc/service/stream_texture_android.cc
+++ b/gpu/ipc/service/stream_texture_android.cc
@@ -7,7 +7,6 @@
#include <string.h>
#include "base/bind.h"
-#include "base/strings/stringize_macros.h"
#include "gpu/command_buffer/service/context_group.h"
#include "gpu/command_buffer/service/context_state.h"
#include "gpu/command_buffer/service/gles2_cmd_decoder.h"
@@ -17,8 +16,6 @@
#include "gpu/ipc/service/gpu_channel.h"
#include "ui/gfx/geometry/size.h"
#include "ui/gl/gl_context.h"
-#include "ui/gl/gl_helper.h"
-#include "ui/gl/scoped_binders.h"
#include "ui/gl/scoped_make_current.h"
namespace gpu {
@@ -68,12 +65,6 @@ StreamTexture::StreamTexture(GpuCommandBufferStub* owner_stub,
route_id_(route_id),
has_listener_(false),
texture_id_(texture_id),
- framebuffer_(0),
- vertex_shader_(0),
- fragment_shader_(0),
- program_(0),
- vertex_buffer_(0),
- u_xform_location_(-1),
weak_factory_(this) {
owner_stub->AddDestructionObserver(this);
memset(current_matrix_, 0, sizeof(current_matrix_));
@@ -103,23 +94,6 @@ void StreamTexture::OnWillDestroyStub() {
owner_stub_->RemoveDestructionObserver(this);
owner_stub_->channel()->RemoveRoute(route_id_);
- if (framebuffer_) {
- std::unique_ptr<ui::ScopedMakeCurrent> scoped_make_current(
- MakeStubCurrent());
-
- glDeleteProgram(program_);
- glDeleteShader(vertex_shader_);
- glDeleteShader(fragment_shader_);
- glDeleteBuffersARB(1, &vertex_buffer_);
- glDeleteFramebuffersEXT(1, &framebuffer_);
- program_ = 0;
- vertex_shader_ = 0;
- fragment_shader_ = 0;
- vertex_buffer_ = 0;
- framebuffer_ = 0;
- u_xform_location_ = -1;
- }
-
owner_stub_ = NULL;
// If the owner goes away, there is no need to keep the SurfaceTexture around.
« no previous file with comments | « gpu/ipc/service/stream_texture_android.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698