Adding drawable to CRD andorid and iOS gl rendering pipeline.

remoting/client/display/gl_renderer.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_RENDERER_H_
 #define REMOTING_CLIENT_DISPLAY_GL_RENDERER_H_
 
 #include <queue>
+#include <vector>
 
 #include "base/callback.h"
 #include "base/macros.h"
 #include "base/memory/weak_ptr.h"
 #include "base/threading/thread_checker.h"
 #include "remoting/client/display/gl_cursor.h"
 #include "remoting/client/display/gl_cursor_feedback.h"
 #include "remoting/client/display/gl_desktop.h"
 #include "remoting/proto/control.pb.h"
 
 namespace webrtc {
 class DesktopFrame;
 }  // namespace webrtc
 
 namespace remoting {
 
 namespace protocol {
 class CursorShapeInfo;
 }  // namespace protocol
 
-class GlCanvas;
+class Canvas;
 class GlRendererDelegate;
 class GlRendererTest;
 
 // Renders desktop and cursor on the OpenGL surface. Can be created on any
 // thread but thereafter must be used and deleted on the same thread (usually
 // the display thread. Or any Chromium thread with a task runner attached to
 // it) unless otherwise noted.
 // The unit of all length arguments is pixel.
 class GlRenderer {
  public:
@@ skipping 35 matching lines @@
   void OnFrameReceived(std::unique_ptr<webrtc::DesktopFrame> frame,
                        const base::Closure& done);
 
   void OnCursorShapeChanged(const protocol::CursorShapeInfo& shape);
 
   // Called after the EGL/EAGL context is established and the surface is created
   // (or recreated). Previous desktop frame and canvas transformation will be
   // 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.
   void OnSurfaceChanged(int view_width, int view_height);
 
   // 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;
 
   // Post a rendering task to the task runner of current thread.
   // Do nothing if render_callback_ is not set yet or an existing rendering task
   // in the queue will cover changes before this function is called.
   void RequestRender();
 
   // Draws out everything on current OpenGL buffer and runs closures in
   // |pending_done_callbacks_|.
   // Nothing will be drawn nor the done callbacks will be run if |delegate_| is
   // invalid or !delegate_.CanRenderFrame().
   void OnRender();
 
   base::WeakPtr<GlRendererDelegate> delegate_;
 
   // Done callbacks from OnFrameReceived. Will all be called once rendering
   // takes place.
   std::queue<base::Closure> pending_done_callbacks_;
 
   bool render_scheduled_ = false;
 
   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_;
 
   DISALLOW_COPY_AND_ASSIGN(GlRenderer);
 };
 
 }  // namespace remoting
 
 #endif  // REMOTING_CLIENT_DISPLAY_GL_RENDERER_H_