| 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 #ifndef REMOTING_CLIENT_DISPLAY_GL_DESKTOP_H_ | 5 #ifndef REMOTING_CLIENT_DISPLAY_GL_DESKTOP_H_ |
| 6 #define REMOTING_CLIENT_DISPLAY_GL_DESKTOP_H_ | 6 #define REMOTING_CLIENT_DISPLAY_GL_DESKTOP_H_ |
| 7 | 7 |
| 8 #include <memory> | 8 #include <memory> |
| 9 #include <vector> | 9 #include <vector> |
| 10 | 10 |
| 11 #include "base/macros.h" | 11 #include "base/macros.h" |
| 12 #include "base/memory/weak_ptr.h" |
| 13 #include "remoting/client/display/drawable.h" |
| 12 #include "third_party/webrtc/modules/desktop_capture/desktop_geometry.h" | 14 #include "third_party/webrtc/modules/desktop_capture/desktop_geometry.h" |
| 13 | 15 |
| 14 namespace webrtc { | 16 namespace webrtc { |
| 15 class DesktopFrame; | 17 class DesktopFrame; |
| 16 } // namespace webrtc | 18 } // namespace webrtc |
| 17 | 19 |
| 18 namespace remoting { | 20 namespace remoting { |
| 19 | 21 |
| 20 class GlCanvas; | 22 class Canvas; |
| 21 | 23 |
| 22 // This class draws the desktop on the canvas. | 24 // This class draws the desktop on the canvas. |
| 23 class GlDesktop { | 25 class GlDesktop : public Drawable { |
| 24 public: | 26 public: |
| 25 GlDesktop(); | 27 GlDesktop(); |
| 26 virtual ~GlDesktop(); | 28 ~GlDesktop() override; |
| 27 | 29 |
| 28 // |frame| can be either a full frame or updated regions only frame. | 30 // |frame| can be either a full frame or updated regions only frame. |
| 29 void SetVideoFrame(const webrtc::DesktopFrame& frame); | 31 void SetVideoFrame(const webrtc::DesktopFrame& frame); |
| 30 | 32 |
| 31 // Sets the canvas on which the desktop will be drawn. Caller must feed a | 33 // Sets the canvas on which the desktop will be drawn. Caller must feed a |
| 32 // full desktop frame after calling this function. | 34 // full desktop frame after calling this function. |
| 33 // If |canvas| is nullptr, nothing will happen when calling Draw(). | 35 // If |canvas| is nullptr, nothing will happen when calling Draw(). |
| 34 void SetCanvas(GlCanvas* canvas); | 36 void SetCanvas(Canvas* canvas) override; |
| 35 | 37 |
| 36 // Draws the desktop on the canvas. | 38 // Draws the desktop on the canvas. |
| 37 void Draw(); | 39 bool Draw() override; |
| 40 base::WeakPtr<Drawable> GetWeakPtr() override; |
| 38 | 41 |
| 39 private: | 42 private: |
| 40 struct GlDesktopTextureContainer; | 43 struct GlDesktopTextureContainer; |
| 41 | 44 |
| 42 void ReallocateTextures(const webrtc::DesktopSize& size); | 45 void ReallocateTextures(const webrtc::DesktopSize& size); |
| 43 | 46 |
| 44 std::vector<std::unique_ptr<GlDesktopTextureContainer>> textures_; | 47 std::vector<std::unique_ptr<GlDesktopTextureContainer>> textures_; |
| 45 | 48 |
| 46 webrtc::DesktopSize last_desktop_size_; | 49 webrtc::DesktopSize last_desktop_size_; |
| 47 int max_texture_size_ = 0; | 50 int max_texture_size_ = 0; |
| 48 GlCanvas* canvas_ = nullptr; | 51 Canvas* canvas_ = nullptr; |
| 52 base::WeakPtrFactory<Drawable> weak_factory_; |
| 49 | 53 |
| 50 DISALLOW_COPY_AND_ASSIGN(GlDesktop); | 54 DISALLOW_COPY_AND_ASSIGN(GlDesktop); |
| 51 }; | 55 }; |
| 52 | 56 |
| 53 } // namespace remoting | 57 } // namespace remoting |
| 54 | 58 |
| 55 #endif // REMOTING_CLIENT_DISPLAY_GL_DESKTOP_H_ | 59 #endif // REMOTING_CLIENT_DISPLAY_GL_DESKTOP_H_ |
| OLD | NEW |