Index: remoting/client/display/gl_cursor_feedback.h |
diff --git a/remoting/client/display/gl_cursor_feedback.h b/remoting/client/display/gl_cursor_feedback.h |
index 230b5239e3568e027b3851237e8cab2a78e845eb..430b450f3461bdb83d375eb440737f7a97ad710d 100644 |
--- a/remoting/client/display/gl_cursor_feedback.h |
+++ b/remoting/client/display/gl_cursor_feedback.h |
@@ -10,29 +10,33 @@ |
#include <memory> |
#include "base/macros.h" |
+#include "base/memory/weak_ptr.h" |
#include "base/time/time.h" |
+#include "remoting/client/display/drawable.h" |
namespace remoting { |
-class GlCanvas; |
+class Canvas; |
class GlRenderLayer; |
// This class draws the cursor feedback on the canvas. |
-class GlCursorFeedback { |
+class GlCursorFeedback : public Drawable { |
public: |
GlCursorFeedback(); |
- ~GlCursorFeedback(); |
+ ~GlCursorFeedback() override; |
// Sets the canvas on which the cursor feedback will be drawn. Resumes the |
// feedback texture to the context of the new canvas. |
// If |canvas| is nullptr, nothing will happen when calling Draw(). |
- void SetCanvas(GlCanvas* canvas); |
+ void SetCanvas(Canvas* canvas) override; |
void StartAnimation(float x, float y, float diameter); |
- // Returns true if animation is not finished, false otherwise. Does nothing |
- // if the animation has stopped. |
- bool Draw(); |
+ // Returns true if there is more animation pending, otherwise false. |
+ // Does nothing if the animation has completed or canvas is null. |
+ bool Draw() override; |
+ |
+ base::WeakPtr<Drawable> GetWeakPtr() override; |
private: |
std::unique_ptr<GlRenderLayer> layer_; |
@@ -41,6 +45,7 @@ class GlCursorFeedback { |
float cursor_y_ = 0; |
base::TimeTicks animation_start_time_; |
+ base::WeakPtrFactory<Drawable> weak_factory_; |
DISALLOW_COPY_AND_ASSIGN(GlCursorFeedback); |
}; |