Chromium Code Reviews| OLD | NEW |
|---|---|
| (Empty) | |
| 1 // Copyright 2017 The Chromium Authors. All rights reserved. | |
| 2 // Use of this source code is governed by a BSD-style license that can be | |
| 3 // found in the LICENSE file. | |
| 4 | |
| 5 #ifndef REMOTING_CLIENT_IOS_DISPLAY_GL_DEMO_SCREEN_H_ | |
| 6 #define REMOTING_CLIENT_IOS_DISPLAY_GL_DEMO_SCREEN_H_ | |
| 7 | |
| 8 #include <memory> | |
|
joedow
2017/01/25 23:16:28
I don't think this header is used so you can remov
nicholss
2017/01/26 18:00:16
Done.
| |
| 9 #include <vector> | |
|
joedow
2017/01/25 23:16:28
AFAICT vector isn't used so you can remove it.
nicholss
2017/01/26 18:00:16
Done.
| |
| 10 | |
| 11 #include "base/macros.h" | |
| 12 #include "base/threading/thread_checker.h" | |
| 13 #include "remoting/client/display/drawable.h" | |
| 14 #include "remoting/client/display/sys_opengl.h" | |
| 15 #include "third_party/webrtc/modules/desktop_capture/desktop_geometry.h" | |
|
joedow
2017/01/25 23:16:28
Remove the webrtc header? I don't think it is use
nicholss
2017/01/26 18:00:16
Done.
| |
| 16 | |
| 17 namespace remoting { | |
| 18 | |
| 19 // This class draws the desktop on the canvas. | |
| 20 class GlDemoScreen : public Drawable { | |
| 21 public: | |
| 22 GlDemoScreen(); | |
| 23 ~GlDemoScreen() override; | |
| 24 | |
| 25 // Drawable implementation. | |
| 26 void SetCanvas(base::WeakPtr<Canvas> canvas) override; | |
| 27 bool Draw() override; | |
| 28 base::WeakPtr<Drawable> GetWeakPtr() override; | |
| 29 int GetZIndex() override; | |
| 30 | |
| 31 private: | |
| 32 base::WeakPtr<Canvas> canvas_ = nullptr; | |
|
joedow
2017/01/25 23:16:28
You shouldn't need to assign nullptr here, WeakPtr
nicholss
2017/01/26 18:00:16
Done.
| |
| 33 int square_size_; | |
|
joedow
2017/01/25 23:16:28
Init this to a default value here?
nicholss
2017/01/26 18:00:16
Done.
| |
| 34 GLuint program_; | |
| 35 | |
| 36 base::ThreadChecker thread_checker_; | |
| 37 base::WeakPtrFactory<Drawable> weak_factory_; | |
| 38 | |
| 39 DISALLOW_COPY_AND_ASSIGN(GlDemoScreen); | |
| 40 }; | |
| 41 | |
| 42 } // namespace remoting | |
| 43 | |
| 44 #endif // REMOTING_CLIENT_IOS_DISPLAY_GL_DEMO_SCREEN_H_ | |
| OLD | NEW |