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

Side by Side Diff: services/native_viewport/onscreen_context_provider.cc

Issue 1123623003: Automatically redraw the display on resume. (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: Response to review Created 5 years, 7 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
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 "services/native_viewport/onscreen_context_provider.h" 5 #include "services/native_viewport/onscreen_context_provider.h"
6 6
7 #include "services/gles2/command_buffer_driver.h" 7 #include "services/gles2/command_buffer_driver.h"
8 #include "services/gles2/command_buffer_impl.h"
9 #include "services/gles2/gpu_state.h" 8 #include "services/gles2/gpu_state.h"
10 9
11 namespace native_viewport { 10 namespace native_viewport {
12 11
13 OnscreenContextProvider::OnscreenContextProvider( 12 OnscreenContextProvider::OnscreenContextProvider(
14 const scoped_refptr<gles2::GpuState>& state) 13 const scoped_refptr<gles2::GpuState>& state)
15 : state_(state), widget_(gfx::kNullAcceleratedWidget), binding_(this) { 14 : command_buffer_impl_(nullptr),
15 state_(state),
16 widget_(gfx::kNullAcceleratedWidget),
17 binding_(this) {
16 } 18 }
17 19
18 OnscreenContextProvider::~OnscreenContextProvider() { 20 OnscreenContextProvider::~OnscreenContextProvider() {
21 if (command_buffer_impl_)
22 command_buffer_impl_->set_observer(nullptr);
19 } 23 }
20 24
21 void OnscreenContextProvider::Bind( 25 void OnscreenContextProvider::Bind(
22 mojo::InterfaceRequest<mojo::ContextProvider> request) { 26 mojo::InterfaceRequest<mojo::ContextProvider> request) {
23 binding_.Bind(request.Pass()); 27 binding_.Bind(request.Pass());
24 } 28 }
25 29
26 void OnscreenContextProvider::SetAcceleratedWidget( 30 void OnscreenContextProvider::SetAcceleratedWidget(
27 gfx::AcceleratedWidget widget) { 31 gfx::AcceleratedWidget widget) {
28 widget_ = widget; 32 widget_ = widget;
29 if (widget_ != gfx::kNullAcceleratedWidget && 33
30 !pending_create_callback_.is_null()) 34 if (widget_ == gfx::kNullAcceleratedWidget) {
31 CreateAndReturnCommandBuffer(); 35 if (command_buffer_impl_)
36 command_buffer_impl_->DidLoseContext();
37 return;
38 }
39
40 if (pending_create_callback_.is_null())
41 return;
42
43 CreateAndReturnCommandBuffer();
32 } 44 }
33 45
34 void OnscreenContextProvider::Create( 46 void OnscreenContextProvider::Create(
35 mojo::ViewportParameterListenerPtr viewport_parameter_listener, 47 mojo::ViewportParameterListenerPtr viewport_parameter_listener,
36 const CreateCallback& callback) { 48 const CreateCallback& callback) {
37 if (!pending_create_callback_.is_null()) 49 if (!pending_create_callback_.is_null()) {
50 DCHECK(!command_buffer_impl_);
38 pending_create_callback_.Run(nullptr); 51 pending_create_callback_.Run(nullptr);
52 }
39 pending_listener_ = viewport_parameter_listener.Pass(); 53 pending_listener_ = viewport_parameter_listener.Pass();
40 pending_create_callback_ = callback; 54 pending_create_callback_ = callback;
41 55
42 if (widget_ != gfx::kNullAcceleratedWidget) 56 if (widget_ != gfx::kNullAcceleratedWidget)
43 CreateAndReturnCommandBuffer(); 57 CreateAndReturnCommandBuffer();
44 } 58 }
45 59
60 void OnscreenContextProvider::OnCommandBufferImplDestroyed() {
61 DCHECK(command_buffer_impl_);
62 command_buffer_impl_ = nullptr;
63 }
64
46 void OnscreenContextProvider::CreateAndReturnCommandBuffer() { 65 void OnscreenContextProvider::CreateAndReturnCommandBuffer() {
47 mojo::CommandBufferPtr cb; 66 mojo::CommandBufferPtr cb;
48 new gles2::CommandBufferImpl( 67 command_buffer_impl_ = new gles2::CommandBufferImpl(
49 GetProxy(&cb), pending_listener_.Pass(), state_->control_task_runner(), 68 GetProxy(&cb), pending_listener_.Pass(), state_->control_task_runner(),
50 state_->sync_point_manager(), 69 state_->sync_point_manager(),
51 make_scoped_ptr(new gles2::CommandBufferDriver( 70 make_scoped_ptr(new gles2::CommandBufferDriver(
52 widget_, state_->share_group(), state_->mailbox_manager(), 71 widget_, state_->share_group(), state_->mailbox_manager(),
53 state_->sync_point_manager()))); 72 state_->sync_point_manager())));
73 command_buffer_impl_->set_observer(this);
54 pending_create_callback_.Run(cb.Pass()); 74 pending_create_callback_.Run(cb.Pass());
55 pending_create_callback_.reset(); 75 pending_create_callback_.reset();
56 } 76 }
57 77
58 } // namespace mojo 78 } // namespace mojo
OLDNEW
« no previous file with comments | « services/native_viewport/onscreen_context_provider.h ('k') | services/surfaces/surfaces_scheduler.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698