Chromium Code Reviews| Index: remoting/client/gl_desktop.h |
| diff --git a/remoting/client/gl_desktop.h b/remoting/client/gl_desktop.h |
| index afdf0ebcdd62ce51737a2c1fbafa3be89b26e54a..1eed2cfc964abeb220f8294dc7bdd41ae1133c6f 100644 |
| --- a/remoting/client/gl_desktop.h |
| +++ b/remoting/client/gl_desktop.h |
| @@ -8,10 +8,10 @@ |
| #include <memory> |
| #include "base/macros.h" |
| +#include "third_party/webrtc/modules/desktop_capture/desktop_geometry.h" |
| namespace webrtc { |
| class DesktopFrame; |
| -class DesktopRegion; |
| } // namespace webrtc |
| namespace remoting { |
| @@ -25,10 +25,11 @@ class GlDesktop { |
| GlDesktop(); |
| virtual ~GlDesktop(); |
| + // frame can be either a full frame or updated regions only frame. |
|
Sergey Ulanov
2016/07/22 18:04:19
s/frame can/|frame| can/
Yuwei
2016/07/22 18:35:15
Done.
|
| void SetVideoFrame(std::unique_ptr<webrtc::DesktopFrame> frame); |
| - // Sets the canvas on which the desktop will be drawn. Resumes the current |
| - // state of the desktop to the context of the new canvas. |
| + // Sets the canvas on which the desktop will be drawn. Caller must feed a |
| + // full desktop frame after calling this function. |
| // If |canvas| is nullptr, nothing will happen when calling Draw(). |
| void SetCanvas(GlCanvas* canvas); |
| @@ -37,7 +38,7 @@ class GlDesktop { |
| private: |
| std::unique_ptr<GlRenderLayer> layer_; |
| - std::unique_ptr<webrtc::DesktopFrame> last_frame_; |
| + webrtc::DesktopSize last_desktop_size_; |
| DISALLOW_COPY_AND_ASSIGN(GlDesktop); |
| }; |