Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(6)

Side by Side Diff: remoting/client/display/gl_cursor_feedback.cc

Issue 2623413004: [Remoting Android] Fix thread issue with OpenGL drawable (Closed)
Patch Set: PTAL Point Created 3 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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/display/gl_cursor_feedback.h" 5 #include "remoting/client/display/gl_cursor_feedback.h"
6 6
7 #include <math.h> 7 #include <math.h>
8 8
9 #include <array> 9 #include <array>
10 10
(...skipping 25 matching lines...) Expand all
36 return 1.f - pow(kExpansionBase, -progress); 36 return 1.f - pow(kExpansionBase, -progress);
37 }; 37 };
38 static const float kExpansionNormalization = get_unnormalized_coeff(1); 38 static const float kExpansionNormalization = get_unnormalized_coeff(1);
39 return get_unnormalized_coeff(progress) / kExpansionNormalization; 39 return get_unnormalized_coeff(progress) / kExpansionNormalization;
40 } 40 }
41 41
42 } // namespace 42 } // namespace
43 43
44 namespace remoting { 44 namespace remoting {
45 45
46 GlCursorFeedback::GlCursorFeedback() : weak_factory_(this) {} 46 GlCursorFeedback::GlCursorFeedback() : weak_factory_(this) {
47 weak_ptr_ = weak_factory_.GetWeakPtr();
48 }
47 49
48 GlCursorFeedback::~GlCursorFeedback() {} 50 GlCursorFeedback::~GlCursorFeedback() {}
49 51
50 void GlCursorFeedback::SetCanvas(base::WeakPtr<Canvas> canvas) { 52 void GlCursorFeedback::SetCanvas(base::WeakPtr<Canvas> canvas) {
51 if (!canvas) { 53 if (!canvas) {
52 layer_.reset(); 54 layer_.reset();
53 return; 55 return;
54 } 56 }
55 layer_.reset(new GlRenderLayer(kGlCursorFeedbackTextureId, canvas)); 57 layer_.reset(new GlRenderLayer(kGlCursorFeedbackTextureId, canvas));
56 GlCursorFeedbackTexture* texture = GlCursorFeedbackTexture::GetInstance(); 58 GlCursorFeedbackTexture* texture = GlCursorFeedbackTexture::GetInstance();
57 layer_->SetTexture(texture->GetTexture().data(), 59 layer_->SetTexture(texture->GetTexture().data(),
58 GlCursorFeedbackTexture::kTextureWidth, 60 GlCursorFeedbackTexture::kTextureWidth,
59 GlCursorFeedbackTexture::kTextureWidth, 0); 61 GlCursorFeedbackTexture::kTextureWidth, 0);
60 } 62 }
61 63
62 void GlCursorFeedback::StartAnimation(float x, float y, float diameter) { 64 void GlCursorFeedback::StartAnimation(float x, float y, float diameter) {
63 cursor_x_ = x; 65 cursor_x_ = x;
64 cursor_y_ = y; 66 cursor_y_ = y;
65 max_diameter_ = diameter; 67 max_diameter_ = diameter;
66 animation_start_time_ = base::TimeTicks::Now(); 68 animation_start_time_ = base::TimeTicks::Now();
67 } 69 }
68 70
69 bool GlCursorFeedback::Draw() { 71 bool GlCursorFeedback::Draw() {
70 DCHECK(thread_checker_.CalledOnValidThread());
71 if (!layer_ || animation_start_time_.is_null()) { 72 if (!layer_ || animation_start_time_.is_null()) {
72 return false; 73 return false;
73 } 74 }
74 float progress = 75 float progress =
75 (base::TimeTicks::Now() - animation_start_time_).InMilliseconds() / 76 (base::TimeTicks::Now() - animation_start_time_).InMilliseconds() /
76 kAnimationDurationMs; 77 kAnimationDurationMs;
77 if (progress > 1) { 78 if (progress > 1) {
78 animation_start_time_ = base::TimeTicks(); 79 animation_start_time_ = base::TimeTicks();
79 return false; 80 return false;
80 } 81 }
81 float diameter = GetExpansionCoefficient(progress) * max_diameter_; 82 float diameter = GetExpansionCoefficient(progress) * max_diameter_;
82 std::array<float, 8> positions; 83 std::array<float, 8> positions;
83 FillRectangleVertexPositions(cursor_x_ - diameter / 2, 84 FillRectangleVertexPositions(cursor_x_ - diameter / 2,
84 cursor_y_ - diameter / 2, diameter, diameter, 85 cursor_y_ - diameter / 2, diameter, diameter,
85 &positions); 86 &positions);
86 layer_->SetVertexPositions(positions); 87 layer_->SetVertexPositions(positions);
87 88
88 // Linear fade-out. 89 // Linear fade-out.
89 layer_->Draw(1.f - progress); 90 layer_->Draw(1.f - progress);
90 return true; 91 return true;
91 } 92 }
92 93
93 int GlCursorFeedback::GetZIndex() { 94 int GlCursorFeedback::GetZIndex() {
94 return Drawable::ZIndex::CURSOR_FEEDBACK; 95 return Drawable::ZIndex::CURSOR_FEEDBACK;
95 } 96 }
96 97
97 base::WeakPtr<Drawable> GlCursorFeedback::GetWeakPtr() { 98 base::WeakPtr<Drawable> GlCursorFeedback::GetWeakPtr() {
98 DCHECK(thread_checker_.CalledOnValidThread()); 99 return weak_ptr_;
99 return weak_factory_.GetWeakPtr();
100 } 100 }
101 101
102 } // namespace remoting 102 } // namespace remoting
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698