Adding drawable to CRD andorid and iOS gl rendering pipeline.

remoting/client/display/gl_render_layer.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_render_layer.h"
 
 #include "base/logging.h"
 #include "remoting/client/display/gl_canvas.h"
 #include "remoting/client/display/gl_helpers.h"
 
@@ skipping 21 matching lines @@
                      int stride) {
   for (int i = 0; i < height; i++) {
     memcpy(dest, source, width * GlRenderLayer::kBytesPerPixel);
     source += stride;
     dest += GlRenderLayer::kBytesPerPixel * width;
   }
 }
 
 }  // namespace
 
-GlRenderLayer::GlRenderLayer(int texture_id, GlCanvas* canvas)
+GlRenderLayer::GlRenderLayer(int texture_id, Canvas* canvas)
     : texture_id_(texture_id), canvas_(canvas) {
   texture_handle_ = CreateTexture();
   buffer_handle_ = CreateBuffer(kVertices, sizeof(kVertices));
 }
 
 GlRenderLayer::~GlRenderLayer() {
   DCHECK(thread_checker_.CalledOnValidThread());
   glDeleteBuffers(1, &buffer_handle_);
   glDeleteTextures(1, &texture_handle_);
 }
@@ skipping 86 matching lines @@
   *should_reset_row_length = false;
 
   bool stride_multiple_of_bytes_per_pixel = stride % kBytesPerPixel == 0;
   bool loosely_packed = !stride_multiple_of_bytes_per_pixel ||
                         (stride > 0 && stride != kBytesPerPixel * width);
 
   if (!loosely_packed) {
     return data;
   }
 
-  if (stride_multiple_of_bytes_per_pixel && canvas_->GetGlVersion() >= 3) {
+  if (stride_multiple_of_bytes_per_pixel && canvas_->GetVersion() >= 3) {
     glPixelStorei(GL_UNPACK_ROW_LENGTH, stride / kBytesPerPixel);
     *should_reset_row_length = true;
     return data;
   }
 
   // Doesn't support GL_UNPACK_ROW_LENGTH or stride not multiple of
   // kBytesPerPixel. Manually pack the data.
   int required_size = width * height * kBytesPerPixel;
   if (update_buffer_size_ < required_size) {
     if (required_size < kDefaultUpdateBufferCapacity) {
       update_buffer_size_ = kDefaultUpdateBufferCapacity;
     } else {
       update_buffer_size_ = required_size;
     }
     update_buffer_.reset(new uint8_t[update_buffer_size_]);
   }
   PackDirtyRegion(update_buffer_.get(), data, width, height, stride);
   return update_buffer_.get();
 }
 
 }  // namespace remoting