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

Side by Side Diff: blimp/client/feature/compositor/blimp_context_provider.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 unified diff | Download patch
« no previous file with comments | « blimp/client/BUILD.gn ('k') | cc/test/test_context_provider.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "blimp/client/feature/compositor/blimp_context_provider.h" 5 #include "blimp/client/feature/compositor/blimp_context_provider.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/callback_helpers.h" 8 #include "base/callback_helpers.h"
9 #include "base/lazy_instance.h" 9 #include "base/lazy_instance.h"
10 #include "gpu/command_buffer/client/gl_in_process_context.h" 10 #include "gpu/command_buffer/client/gl_in_process_context.h"
(...skipping 27 matching lines...) Expand all
38 attribs_for_gles2.fail_if_major_perf_caveat = false; 38 attribs_for_gles2.fail_if_major_perf_caveat = false;
39 attribs_for_gles2.bind_generates_resource = false; 39 attribs_for_gles2.bind_generates_resource = false;
40 attribs_for_gles2.context_type = gpu::gles2::CONTEXT_TYPE_OPENGLES2; 40 attribs_for_gles2.context_type = gpu::gles2::CONTEXT_TYPE_OPENGLES2;
41 attribs_for_gles2.lose_context_when_out_of_memory = true; 41 attribs_for_gles2.lose_context_when_out_of_memory = true;
42 42
43 context_.reset(gpu::GLInProcessContext::Create( 43 context_.reset(gpu::GLInProcessContext::Create(
44 nullptr /* service */, nullptr /* surface */, false /* is_offscreen */, 44 nullptr /* service */, nullptr /* surface */, false /* is_offscreen */,
45 widget, gfx::Size(1, 1), nullptr /* share_context */, attribs_for_gles2, 45 widget, gfx::Size(1, 1), nullptr /* share_context */, attribs_for_gles2,
46 gfx::PreferDiscreteGpu, gpu::GLInProcessContextSharedMemoryLimits(), 46 gfx::PreferDiscreteGpu, gpu::GLInProcessContextSharedMemoryLimits(),
47 gpu_memory_buffer_manager, nullptr /* memory_limits */)); 47 gpu_memory_buffer_manager, nullptr /* memory_limits */));
48 context_->GetImplementation()->SetLostContextCallback( 48 context_->SetContextLostCallback(
49 base::Bind(&BlimpContextProvider::OnLostContext, base::Unretained(this))); 49 base::Bind(&BlimpContextProvider::OnLostContext, base::Unretained(this)));
50 } 50 }
51 51
52 BlimpContextProvider::~BlimpContextProvider() { 52 BlimpContextProvider::~BlimpContextProvider() {
53 DCHECK(main_thread_checker_.CalledOnValidThread() || 53 DCHECK(main_thread_checker_.CalledOnValidThread() ||
54 context_thread_checker_.CalledOnValidThread()); 54 context_thread_checker_.CalledOnValidThread());
55 if (gr_context_) 55 if (gr_context_)
56 gr_context_->releaseResourcesAndAbandonContext(); 56 gr_context_->releaseResourcesAndAbandonContext();
57 } 57 }
58 58
(...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after
121 121
122 void BlimpContextProvider::SetLostContextCallback( 122 void BlimpContextProvider::SetLostContextCallback(
123 const LostContextCallback& lost_context_callback) { 123 const LostContextCallback& lost_context_callback) {
124 DCHECK(context_thread_checker_.CalledOnValidThread()); 124 DCHECK(context_thread_checker_.CalledOnValidThread());
125 lost_context_callback_ = lost_context_callback; 125 lost_context_callback_ = lost_context_callback;
126 } 126 }
127 127
128 void BlimpContextProvider::OnLostContext() { 128 void BlimpContextProvider::OnLostContext() {
129 DCHECK(context_thread_checker_.CalledOnValidThread()); 129 DCHECK(context_thread_checker_.CalledOnValidThread());
130 if (!lost_context_callback_.is_null()) 130 if (!lost_context_callback_.is_null())
131 lost_context_callback_.Run(); 131 base::ResetAndReturn(&lost_context_callback_).Run();
132 if (gr_context_) 132 if (gr_context_)
133 gr_context_->abandonContext(); 133 gr_context_->abandonContext();
134 } 134 }
135 135
136 } // namespace client 136 } // namespace client
137 } // namespace blimp 137 } // namespace blimp
OLDNEW
« no previous file with comments | « blimp/client/BUILD.gn ('k') | cc/test/test_context_provider.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698