Chromium Code Reviews| Index: remoting/client/gl_renderer.cc |
| diff --git a/remoting/client/gl_renderer.cc b/remoting/client/gl_renderer.cc |
| index 64ce7d31d537b0db9870ebe1a8a77bcb631153f5..76a9de5dc9763f32b739dffae976722c64effb0e 100644 |
| --- a/remoting/client/gl_renderer.cc |
| +++ b/remoting/client/gl_renderer.cc |
| @@ -103,6 +103,11 @@ void GlRenderer::OnSurfaceCreated(int gl_version) { |
| desktop_.SetCanvas(canvas_.get()); |
| cursor_.SetCanvas(canvas_.get()); |
| cursor_feedback_.SetCanvas(canvas_.get()); |
| + |
| + for (std::vector<GlDrawable*>::const_iterator dii = drawables.begin(); |
|
Sergey Ulanov
2016/12/19 23:50:21
use range loop with auto:
for (auto& drawable :
|
| + dii != drawables.end(); dii++) { |
| + (*dii)->SetCanvas(canvas_.get()); |
| + } |
| } |
| void GlRenderer::OnSurfaceChanged(int view_width, int view_height) { |
| @@ -120,6 +125,10 @@ void GlRenderer::OnSurfaceDestroyed() { |
| cursor_feedback_.SetCanvas(nullptr); |
| cursor_.SetCanvas(nullptr); |
| desktop_.SetCanvas(nullptr); |
| + for (std::vector<GlDrawable*>::const_iterator dii = drawables.begin(); |
|
Sergey Ulanov
2016/12/19 23:50:21
for (auto& drawable : drawables)
|
| + dii != drawables.end(); dii++) { |
| + (*dii)->SetCanvas(nullptr); |
| + } |
| canvas_.reset(); |
| } |
| @@ -137,6 +146,11 @@ void GlRenderer::RequestRender() { |
| render_scheduled_ = true; |
| } |
| +void GlRenderer::AddDrawable(GlDrawable* d) { |
|
Sergey Ulanov
2016/12/19 23:50:21
s/d/drawable
|
| + d->SetCanvas(canvas_.get()); |
| + drawables.push_back(d); |
| +} |
| + |
| void GlRenderer::OnRender() { |
| DCHECK(thread_checker_.CalledOnValidThread()); |
| render_scheduled_ = false; |
| @@ -157,6 +171,11 @@ void GlRenderer::OnRender() { |
| } |
| cursor_.Draw(); |
| + |
| + for (std::vector<GlDrawable*>::const_iterator dii = drawables.begin(); |
|
Sergey Ulanov
2016/12/19 23:50:21
for (auto& drawable : drawables)
|
| + dii != drawables.end(); dii++) { |
| + (*dii)->Draw(); |
| + } |
| } |
| delegate_->OnFrameRendered(); |