Adding drawable to CRD andorid and iOS gl rendering pipeline.

remoting/client/display/gl_canvas.cc

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "remoting/client/display/gl_canvas.h"
 
 #include "base/logging.h"
 #include "remoting/client/display/gl_helpers.h"
 #include "remoting/client/display/gl_math.h"
 
@@ skipping 47 matching lines @@
     "uniform float u_alpha_multiplier;\n"
     "void main() {\n"
     "  gl_FragColor = texture2D(u_texture, v_texCoord);\n"
     "  gl_FragColor.a *= u_alpha_multiplier;\n"
     "}";
 
 }  // namespace
 
 namespace remoting {
 
-GlCanvas::GlCanvas(int gl_version) : gl_version_(gl_version) {
+GlCanvas::GlCanvas(int gl_version)
+    : gl_version_(gl_version), weak_factory_(this) {
   glGetIntegerv(GL_MAX_TEXTURE_SIZE, &max_texture_size_);
 
   vertex_shader_ = CompileShader(GL_VERTEX_SHADER, kTexCoordToViewVert);
   fragment_shader_ = CompileShader(GL_FRAGMENT_SHADER, kDrawTexFrag);
   program_ = CreateProgram(vertex_shader_, fragment_shader_);
   glUseProgram(program_);
 
   transform_location_ = glGetUniformLocation(program_, "u_transform");
   view_size_location_ = glGetUniformLocation(program_, "u_viewSize");
   texture_location_ = glGetUniformLocation(program_, "u_texture");
@@ skipping 10 matching lines @@
 GlCanvas::~GlCanvas() {
   DCHECK(thread_checker_.CalledOnValidThread());
   glDisable(GL_BLEND);
   glDisableVertexAttribArray(tex_cord_location_);
   glDisableVertexAttribArray(position_location_);
   glDeleteProgram(program_);
   glDeleteShader(vertex_shader_);
   glDeleteShader(fragment_shader_);
 }
 
+void GlCanvas::Clear() {
+#ifndef NDEBUG
+  // Set the background clear color to bright green for debugging purposes.
+  glClearColor(0.0f, 1.0f, 0.0f, 1.0f);
+#else
+  // Set the background clear color to black.
+  glClearColor(0.0f, 0.0f, 0.0f, 1.0f);
+#endif
+  glClear(GL_COLOR_BUFFER_BIT);
+}
+
 void GlCanvas::SetTransformationMatrix(const std::array<float, 9>& matrix) {
   DCHECK(thread_checker_.CalledOnValidThread());
   std::array<float, 9> transposed_matrix = matrix;
   TransposeTransformationMatrix(&transposed_matrix);
   glUniformMatrix3fv(transform_location_, 1, GL_FALSE,
                      transposed_matrix.data());
   transformation_set_ = true;
 }
 
 void GlCanvas::SetViewSize(int width, int height) {
   DCHECK(width > 0 && height > 0);
   glViewport(0, 0, width, height);
   float view_size[2]{width, height};
   glUniform2fv(view_size_location_, 1, view_size);
   view_size_set_ = true;
 }
 
 void GlCanvas::DrawTexture(int texture_id,
-                           GLuint texture_handle,
-                           GLuint vertex_buffer,
+                           int texture_handle,
+                           int vertex_buffer,
                            float alpha_multiplier) {
   DCHECK(thread_checker_.CalledOnValidThread());
   if (!view_size_set_ || !transformation_set_) {
     return;
   }
   glActiveTexture(GL_TEXTURE0 + texture_id);
   glBindTexture(GL_TEXTURE_2D, texture_handle);
   glUniform1i(texture_location_, texture_id);
   glUniform1f(alpha_multiplier_location_, alpha_multiplier);
   glBindBuffer(GL_ARRAY_BUFFER, vertex_buffer);
 
   glVertexAttribPointer(position_location_, kVertexSize, GL_FLOAT, GL_FALSE, 0,
                         0);
   glVertexAttribPointer(tex_cord_location_, kVertexSize, GL_FLOAT, GL_FALSE, 0,
                         static_cast<float*>(0) + kVertexSize * kVertexCount);
 
   glDrawArrays(GL_TRIANGLE_STRIP, 0, kVertexCount);
   glBindBuffer(GL_ARRAY_BUFFER, 0);
   glBindTexture(GL_TEXTURE_2D, 0);
 }
 
-int GlCanvas::GetGlVersion() const {
+int GlCanvas::GetVersion() const {
   return gl_version_;
 }
 
 int GlCanvas::GetMaxTextureSize() const {
   return max_texture_size_;
 }
 
+base::WeakPtr<Canvas> GlCanvas::GetWeakPtr() {
+  DCHECK(thread_checker_.CalledOnValidThread());
+  return weak_factory_.GetWeakPtr();
+}
+
 }  // namespace remoting