Adding drawable to CRD andorid and iOS gl rendering pipeline.

remoting/client/display/gl_renderer.h

Index: remoting/client/display/gl_renderer.h
diff --git a/remoting/client/display/gl_renderer.h b/remoting/client/display/gl_renderer.h
index 3cecb13d74e92c6c52e2b514ba345c46e825916e..72f04e4881474bccb7d6f06ee42c278e5d0882ed 100644
--- a/remoting/client/display/gl_renderer.h
+++ b/remoting/client/display/gl_renderer.h
@@ -6,6 +6,7 @@
 #define REMOTING_CLIENT_DISPLAY_GL_RENDERER_H_
 
 #include <queue>
+#include <vector>
 
 #include "base/callback.h"
 #include "base/macros.h"
@@ -26,7 +27,7 @@ namespace protocol {
 class CursorShapeInfo;
 }  // namespace protocol
 
-class GlCanvas;
+class Canvas;
 class GlRendererDelegate;
 class GlRendererTest;
 
@@ -82,7 +83,7 @@ class GlRenderer {
   // lost after calling this function.
   // Caller must call OnSurfaceDestroyed() before calling this function if the
   // surface is recreated.
-  void OnSurfaceCreated(int gl_version);
+  void OnSurfaceCreated(std::unique_ptr<Canvas> canvas);
 
   // Sets the size of the view. Called right after OnSurfaceCreated() or
   // whenever the view size is changed.
@@ -91,9 +92,14 @@ class GlRenderer {
   // Called when the surface is destroyed.
   void OnSurfaceDestroyed();
 
+  void AddDrawable(base::WeakPtr<Drawable> drawable);
+
   // Returns the weak pointer to be used on the display thread.
   base::WeakPtr<GlRenderer> GetWeakPtr();
 
+  // Convenience method to create a Renderer with standard desktop components.
+  static std::unique_ptr<GlRenderer> CreateGlRendererWithDesktop();
+
  private:
   friend class GlRendererTest;
 
@@ -119,12 +125,14 @@ class GlRenderer {
   int canvas_width_ = 0;
   int canvas_height_ = 0;
 
-  std::unique_ptr<GlCanvas> canvas_;
+  std::unique_ptr<Canvas> canvas_;
 
   GlCursor cursor_;
   GlCursorFeedback cursor_feedback_;
   GlDesktop desktop_;
 
+  std::vector<base::WeakPtr<Drawable>> drawables_;
+
   base::ThreadChecker thread_checker_;
   base::WeakPtr<GlRenderer> weak_ptr_;
   base::WeakPtrFactory<GlRenderer> weak_factory_;