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

Unified Diff: mojo/gles2/gles2_context.cc

Issue 1885903002: Revert of Make lost context and error message callbacks on GpuControl go to client (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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 | « mojo/gles2/gles2_context.h ('k') | ppapi/proxy/ppapi_command_buffer_proxy.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mojo/gles2/gles2_context.cc
diff --git a/mojo/gles2/gles2_context.cc b/mojo/gles2/gles2_context.cc
index 58b86bd90d9d8e9d494b0f4c680c606d9e86a0fd..90ba14e8c957a8d4d5edce7ca41098126a1d0f92 100644
--- a/mojo/gles2/gles2_context.cc
+++ b/mojo/gles2/gles2_context.cc
@@ -28,7 +28,7 @@
mojo::ScopedMessagePipeHandle command_buffer_handle,
MojoGLES2ContextLost lost_callback,
void* closure)
- : command_buffer_(attribs, std::move(command_buffer_handle)),
+ : command_buffer_(this, attribs, std::move(command_buffer_handle)),
lost_callback_(lost_callback),
closure_(closure) {}
@@ -57,18 +57,12 @@
lose_context_when_out_of_memory,
support_client_side_arrays,
&command_buffer_));
- if (!implementation_->Initialize(kDefaultStartTransferBufferSize,
- kDefaultMinTransferBufferSize,
- kDefaultMaxTransferBufferSize,
- gpu::gles2::GLES2Implementation::kNoLimit))
- return false;
- implementation_->SetLostContextCallback(
- base::Bind(&GLES2Context::OnLostContext, base::Unretained(this)));
- return true;
+ return implementation_->Initialize(kDefaultStartTransferBufferSize,
+ kDefaultMinTransferBufferSize,
+ kDefaultMaxTransferBufferSize,
+ gpu::gles2::GLES2Implementation::kNoLimit);
}
-void GLES2Context::OnLostContext() {
- lost_callback_(closure_);
-}
+void GLES2Context::ContextLost() { lost_callback_(closure_); }
} // namespace gles2
« no previous file with comments | « mojo/gles2/gles2_context.h ('k') | ppapi/proxy/ppapi_command_buffer_proxy.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698