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

Unified Diff: gpu/command_buffer/client/gl_in_process_context.cc

Issue 1844843002: android: Remove in-process video path (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase r387995 Created 4 years, 8 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/command_buffer/client/gl_in_process_context.h ('k') | gpu/command_buffer/service/BUILD.gn » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: gpu/command_buffer/client/gl_in_process_context.cc
diff --git a/gpu/command_buffer/client/gl_in_process_context.cc b/gpu/command_buffer/client/gl_in_process_context.cc
index ece37153375df636e1de4f0c864fc17126b3643a..ce7ecc65241c842617b505bc6714212b657bb508 100644
--- a/gpu/command_buffer/client/gl_in_process_context.cc
+++ b/gpu/command_buffer/client/gl_in_process_context.cc
@@ -71,12 +71,6 @@ class GLInProcessContextImpl
size_t GetMappedMemoryLimit() override;
void SetLock(base::Lock* lock) override;
-#if defined(OS_ANDROID)
- scoped_refptr<gfx::SurfaceTexture> GetSurfaceTexture(
- uint32_t stream_id) override;
- uint32_t CreateStreamTexture(uint32_t texture_id) override;
-#endif
-
private:
void Destroy();
void OnSignalSyncPoint(const base::Closure& callback);
@@ -207,6 +201,7 @@ void GLInProcessContextImpl::Destroy() {
command_buffer_.reset();
}
+/*
#if defined(OS_ANDROID)
no sievers 2016/04/18 23:00:50 you forgot to remove this block after commenting i
boliu 2016/04/18 23:05:06 Oops, removed
scoped_refptr<gfx::SurfaceTexture> GLInProcessContextImpl::GetSurfaceTexture(
uint32_t stream_id) {
@@ -217,6 +212,7 @@ uint32_t GLInProcessContextImpl::CreateStreamTexture(uint32_t texture_id) {
return command_buffer_->CreateStreamTexture(texture_id);
}
#endif
+*/
} // anonymous namespace
« no previous file with comments | « gpu/command_buffer/client/gl_in_process_context.h ('k') | gpu/command_buffer/service/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698