OLD | NEW |
1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "remoting/client/gl_cursor.h" | 5 #include "remoting/client/gl_cursor.h" |
6 | 6 |
7 #include "remoting/base/util.h" | 7 #include "remoting/base/util.h" |
8 #include "remoting/client/gl_canvas.h" | 8 #include "remoting/client/gl_canvas.h" |
9 #include "remoting/client/gl_math.h" | 9 #include "remoting/client/gl_math.h" |
10 #include "remoting/client/gl_render_layer.h" | 10 #include "remoting/client/gl_render_layer.h" |
11 #include "remoting/client/gl_texture_ids.h" | 11 #include "remoting/client/gl_texture_ids.h" |
12 #include "remoting/proto/control.pb.h" | 12 #include "remoting/proto/control.pb.h" |
13 #include "third_party/libyuv/include/libyuv/convert_argb.h" | 13 #include "third_party/libyuv/include/libyuv/convert_argb.h" |
14 | 14 |
15 namespace remoting { | 15 namespace remoting { |
16 | 16 |
17 namespace { | 17 namespace { |
18 const int kDefaultCursorDataSize = 32 * 32 * GlRenderLayer::kBytesPerPixel; | 18 const int kDefaultCursorDataSize = 32 * 32 * GlRenderLayer::kBytesPerPixel; |
19 } // namespace | 19 } // namespace |
20 | 20 |
21 GlCursor::GlCursor() {} | 21 GlCursor::GlCursor() : weak_factory_(this) { |
| 22 SetZIndex(DrawableZIndex::CURSOR); |
| 23 } |
22 | 24 |
23 GlCursor::~GlCursor() {} | 25 GlCursor::~GlCursor() {} |
24 | 26 |
25 void GlCursor::SetCursorShape(const protocol::CursorShapeInfo& cursor_shape) { | 27 void GlCursor::SetCursorShape(const protocol::CursorShapeInfo& cursor_shape) { |
26 int data_size = cursor_shape.width() * cursor_shape.height() * | 28 int data_size = cursor_shape.width() * cursor_shape.height() * |
27 GlRenderLayer::kBytesPerPixel; | 29 GlRenderLayer::kBytesPerPixel; |
28 if (current_cursor_data_size_ < data_size) { | 30 if (current_cursor_data_size_ < data_size) { |
29 current_cursor_data_size_ = | 31 current_cursor_data_size_ = |
30 kDefaultCursorDataSize > data_size ? kDefaultCursorDataSize : data_size; | 32 kDefaultCursorDataSize > data_size ? kDefaultCursorDataSize : data_size; |
31 current_cursor_data_.reset(new uint8_t[current_cursor_data_size_]); | 33 current_cursor_data_.reset(new uint8_t[current_cursor_data_size_]); |
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
73 layer_.reset(); | 75 layer_.reset(); |
74 return; | 76 return; |
75 } | 77 } |
76 layer_.reset(new GlRenderLayer(kGlCursorTextureId, canvas)); | 78 layer_.reset(new GlRenderLayer(kGlCursorTextureId, canvas)); |
77 if (current_cursor_data_) { | 79 if (current_cursor_data_) { |
78 SetCurrentCursorShape(true); | 80 SetCurrentCursorShape(true); |
79 } | 81 } |
80 SetCursorPosition(cursor_x_, cursor_y_); | 82 SetCursorPosition(cursor_x_, cursor_y_); |
81 } | 83 } |
82 | 84 |
83 void GlCursor::Draw() { | 85 bool GlCursor::Draw() { |
84 if (layer_ && current_cursor_data_ && visible_) { | 86 if (layer_ && current_cursor_data_ && visible_) { |
85 layer_->Draw(1.f); | 87 layer_->Draw(1.f); |
86 } | 88 } |
| 89 return false; |
87 } | 90 } |
88 | 91 |
89 void GlCursor::SetCurrentCursorShape(bool size_changed) { | 92 void GlCursor::SetCurrentCursorShape(bool size_changed) { |
90 if (layer_) { | 93 if (layer_) { |
91 if (size_changed) { | 94 if (size_changed) { |
92 layer_->SetTexture(current_cursor_data_.get(), current_cursor_width_, | 95 layer_->SetTexture(current_cursor_data_.get(), current_cursor_width_, |
93 current_cursor_height_, 0); | 96 current_cursor_height_, 0); |
94 } else { | 97 } else { |
95 layer_->UpdateTexture(current_cursor_data_.get(), 0, 0, | 98 layer_->UpdateTexture(current_cursor_data_.get(), 0, 0, |
96 current_cursor_width_, current_cursor_width_, 0); | 99 current_cursor_width_, current_cursor_width_, 0); |
97 } | 100 } |
98 } | 101 } |
99 } | 102 } |
100 | 103 |
| 104 base::WeakPtr<GlDrawable> GlCursor::GetWeakPtr() { |
| 105 return weak_factory_.GetWeakPtr(); |
| 106 } |
| 107 |
101 } // namespace remoting | 108 } // namespace remoting |
OLD | NEW |