Adding drawable to CRD andorid and iOS gl rendering pipeline.

remoting/client/display/gl_cursor.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_cursor.h"
 
 #include "remoting/base/util.h"
 #include "remoting/client/display/gl_canvas.h"
 #include "remoting/client/display/gl_math.h"
 #include "remoting/client/display/gl_render_layer.h"
 #include "remoting/client/display/gl_texture_ids.h"
 #include "remoting/proto/control.pb.h"
 #include "third_party/libyuv/include/libyuv/convert_argb.h"
 
 namespace remoting {
 
 namespace {
 const int kDefaultCursorDataSize = 32 * 32 * GlRenderLayer::kBytesPerPixel;
 }  // namespace
 
-GlCursor::GlCursor() {}
+GlCursor::GlCursor() : weak_factory_(this) {
+  SetZIndex(DrawableZIndex::CURSOR);
+}
 
 GlCursor::~GlCursor() {}
 
 void GlCursor::SetCursorShape(const protocol::CursorShapeInfo& cursor_shape) {
   int data_size = cursor_shape.width() * cursor_shape.height() *
                   GlRenderLayer::kBytesPerPixel;
   if (current_cursor_data_size_ < data_size) {
     current_cursor_data_size_ =
         kDefaultCursorDataSize > data_size ? kDefaultCursorDataSize : data_size;
     current_cursor_data_.reset(new uint8_t[current_cursor_data_size_]);
@@ skipping 29 matching lines @@
       current_cursor_width_, current_cursor_height_, &positions);
   if (layer_) {
     layer_->SetVertexPositions(positions);
   }
 }
 
 void GlCursor::SetCursorVisible(bool visible) {
   visible_ = visible;
 }
 
-void GlCursor::SetCanvas(GlCanvas* canvas) {
+void GlCursor::SetCanvas(Canvas* canvas) {
   if (!canvas) {
     layer_.reset();
     return;
   }
   layer_.reset(new GlRenderLayer(kGlCursorTextureId, canvas));
   if (current_cursor_data_) {
     SetCurrentCursorShape(true);
   }
   SetCursorPosition(cursor_x_, cursor_y_);
 }
 
-void GlCursor::Draw() {
+bool GlCursor::Draw() {
   if (layer_ && current_cursor_data_ && visible_) {
     layer_->Draw(1.f);
   }
+  return false;
 }
 
 void GlCursor::SetCurrentCursorShape(bool size_changed) {
   if (layer_) {
     if (size_changed) {
       layer_->SetTexture(current_cursor_data_.get(), current_cursor_width_,
                          current_cursor_height_, 0);
     } else {
       layer_->UpdateTexture(current_cursor_data_.get(), 0, 0,
                             current_cursor_width_, current_cursor_width_, 0);
     }
   }
 }
 
+base::WeakPtr<Drawable> GlCursor::GetWeakPtr() {
+  return weak_factory_.GetWeakPtr();

[joedow, 2017/01/10 00:19:44]

Maybe I missed the conclusion of this discussion from the CL that was superseded
by this one, but I had thought this was dangerous as the affinity of the WeakPtr
would be bound to the first thread which called this method and that it was
safer to store a WeakPtr member which was initialized on the correct thread and
had references passed out.

[nicholss, 2017/01/10 16:58:34]

That was not for this class.

[joedow, 2017/01/10 18:49:27]

I thought it was for all classes which expose a WeakPtr.  The problem as I
understand it that the first time you call GetWeakPtr() the underlying thread
affinity for the factory and weakptr are set.  If someone doesn't call this
method as expected (i.e. on a different thread) then you will have a problem.

One approach would be to use a thread checker and DCHECK that each access to
this method occurs on the thread which created the factory.  Then you should be
ok.

[Yuwei, 2017/01/10 19:36:10]

As discussed offline, these Drawables are supposed to be only used on the
display thread so I just didn't bother introducing the thread checker. I think
it's good to introduce a thread checker just to be safer, since none of these
functions will work on a non-display thread.

[nicholss, 2017/01/10 21:43:10]

Acknowledged.

+}
+
 }  // namespace remoting