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

Side by Side Diff: remoting/client/gl_renderer.cc

Issue 2196493002: [Chromoting] Unit Tests for GlRenderer (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Don't draw when canvas is not 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 unified diff | Download patch
« no previous file with comments | « remoting/client/gl_renderer.h ('k') | remoting/client/gl_renderer_unittest.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 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 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 "remoting/client/gl_renderer.h" 5 #include "remoting/client/gl_renderer.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/logging.h" 8 #include "base/logging.h"
9 #include "base/threading/thread_task_runner_handle.h" 9 #include "base/threading/thread_task_runner_handle.h"
10 #include "remoting/client/gl_canvas.h" 10 #include "remoting/client/gl_canvas.h"
(...skipping 112 matching lines...) Expand 10 before | Expand all | Expand 10 after
123 render_scheduled_ = true; 123 render_scheduled_ = true;
124 } 124 }
125 125
126 void GlRenderer::OnRender() { 126 void GlRenderer::OnRender() {
127 DCHECK(thread_checker_.CalledOnValidThread()); 127 DCHECK(thread_checker_.CalledOnValidThread());
128 render_scheduled_ = false; 128 render_scheduled_ = false;
129 if (!delegate_ || !delegate_->CanRenderFrame()) { 129 if (!delegate_ || !delegate_->CanRenderFrame()) {
130 return; 130 return;
131 } 131 }
132 132
133 glClear(GL_COLOR_BUFFER_BIT); 133 if (canvas_) {
134 desktop_.Draw(); 134 glClear(GL_COLOR_BUFFER_BIT);
135 cursor_.Draw(); 135 desktop_.Draw();
136 if (cursor_feedback_.Draw()) { 136 cursor_.Draw();
137 RequestRender(); 137 if (cursor_feedback_.Draw()) {
138 RequestRender();
139 }
138 } 140 }
139 141
140 delegate_->OnFrameRendered(); 142 delegate_->OnFrameRendered();
141 143
142 while (!pending_done_callbacks_.empty()) { 144 while (!pending_done_callbacks_.empty()) {
143 pending_done_callbacks_.front().Run(); 145 pending_done_callbacks_.front().Run();
144 pending_done_callbacks_.pop(); 146 pending_done_callbacks_.pop();
145 } 147 }
146 } 148 }
147 149
148 } // namespace remoting 150 } // namespace remoting
OLDNEW
« no previous file with comments | « remoting/client/gl_renderer.h ('k') | remoting/client/gl_renderer_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698