Adding drawable to CRD andorid and iOS gl rendering pipeline.

remoting/client/display/gl_render_layer.h

 // 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.
 
 #ifndef REMOTING_CLIENT_DISPLAY_GL_RENDER_LAYER_H_
 #define REMOTING_CLIENT_DISPLAY_GL_RENDER_LAYER_H_
 
 #include <array>
 #include <memory>
 
 #include "base/macros.h"
+#include "base/memory/weak_ptr.h"
 #include "base/threading/thread_checker.h"
 #include "remoting/client/display/sys_opengl.h"
 
 namespace remoting {
-class GlCanvas;
+
+class Canvas;
 
 // This class is for drawing a texture on the canvas. Must be deleted before the
 // canvas is deleted.
 class GlRenderLayer {
  public:
   static const int kBytesPerPixel = 4;
 
   // texture_id: An integer in range [0, GL_MAX_TEXTURE_IMAGE_UNITS], defining
   //             which slot to store the texture.
-  GlRenderLayer(int texture_id, GlCanvas* canvas);
+  GlRenderLayer(int texture_id, base::WeakPtr<Canvas> canvas);
   ~GlRenderLayer();
 
   // Sets the texture (RGBA 8888) to be drawn. Please use UpdateTexture() if the
   // texture size isn't changed.
   // stride: byte distance between two rows in |subtexture|.
   // If |stride| is 0 or |stride| == |width|*kBytesPerPixel, |subtexture| will
   // be treated as tightly packed.
   void SetTexture(const uint8_t* texture, int width, int height, int stride);
 
   // Updates a subregion (RGBA 8888) of the texture. Can only be called after
@@ skipping 34 matching lines @@
   //                          function. If this is true, the user need to call
   //                          glPixelStorei(GL_UNPACK_ROW_LENGTH, 0) after
   //                          updating the texture to reset the stride.
   const uint8_t* PrepareTextureBuffer(const uint8_t* data,
                                       int width,
                                       int height,
                                       int stride,
                                       bool* should_reset_row_length);
 
   int texture_id_;
-  GlCanvas* canvas_;
+  base::WeakPtr<Canvas> canvas_;
 
   GLuint texture_handle_;
   GLuint buffer_handle_;
 
   bool texture_set_ = false;
 
   bool vertex_position_set_ = false;
 
   // Used in OpenGL ES 2 context which doesn't support GL_UNPACK_ROW_LENGTH to
   // tightly pack dirty regions before sending them to GPU.
   std::unique_ptr<uint8_t[]> update_buffer_;
   int update_buffer_size_ = 0;
 
   base::ThreadChecker thread_checker_;
   DISALLOW_COPY_AND_ASSIGN(GlRenderLayer);
 };
 
 }  // namespace remoting
 #endif  // REMOTING_CLIENT_DISPLAY_GL_RENDER_LAYER_H_