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

Side by Side Diff: remoting/client/jni/jni_gl_display_handler.h

Issue 2745583008: Refactoring out the chromoting jni runtime class in favor of chromoting client runtime. (Closed)
Patch Set: Missed out on a () Created 3 years, 9 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 #ifndef REMOTING_CLIENT_JNI_JNI_GL_DISPLAY_HANDLER_H_ 5 #ifndef REMOTING_CLIENT_JNI_JNI_GL_DISPLAY_HANDLER_H_
6 #define REMOTING_CLIENT_JNI_JNI_GL_DISPLAY_HANDLER_H_ 6 #define REMOTING_CLIENT_JNI_JNI_GL_DISPLAY_HANDLER_H_
7 7
8 #include <EGL/egl.h> 8 #include <EGL/egl.h>
9 #include <jni.h> 9 #include <jni.h>
10 10
11 #include "base/android/scoped_java_ref.h" 11 #include "base/android/scoped_java_ref.h"
12 #include "base/macros.h" 12 #include "base/macros.h"
13 #include "base/memory/weak_ptr.h" 13 #include "base/memory/weak_ptr.h"
14 #include "remoting/client/display/gl_renderer.h" 14 #include "remoting/client/display/gl_renderer.h"
15 #include "remoting/client/display/gl_renderer_delegate.h" 15 #include "remoting/client/display/gl_renderer_delegate.h"
16 #include "remoting/client/queued_task_poster.h" 16 #include "remoting/client/queued_task_poster.h"
17 #include "remoting/protocol/cursor_shape_stub.h" 17 #include "remoting/protocol/cursor_shape_stub.h"
18 18
19 namespace remoting { 19 namespace remoting {
20 20
21 namespace protocol { 21 namespace protocol {
22 class VideoRenderer; 22 class VideoRenderer;
23 } // namespace protocol 23 } // namespace protocol
24 24
25 class ChromotingJniRuntime; 25 class ChromotingClientRuntime;
26 26
27 // Handles OpenGL display operations. Draws desktop and cursor on the OpenGL 27 // Handles OpenGL display operations. Draws desktop and cursor on the OpenGL
28 // surface. The handler should be used and destroyed on the UI thread. It also 28 // surface. The handler should be used and destroyed on the UI thread. It also
29 // has a core that works on the display thread. 29 // has a core that works on the display thread.
30 class JniGlDisplayHandler { 30 class JniGlDisplayHandler {
31 public: 31 public:
32 JniGlDisplayHandler(ChromotingJniRuntime* runtime, 32 JniGlDisplayHandler(const base::android::JavaRef<jobject>& java_client);
33 const base::android::JavaRef<jobject>& java_client);
34 ~JniGlDisplayHandler(); 33 ~JniGlDisplayHandler();
35 34
36 std::unique_ptr<protocol::CursorShapeStub> CreateCursorShapeStub(); 35 std::unique_ptr<protocol::CursorShapeStub> CreateCursorShapeStub();
37 std::unique_ptr<protocol::VideoRenderer> CreateVideoRenderer(); 36 std::unique_ptr<protocol::VideoRenderer> CreateVideoRenderer();
38 37
39 static bool RegisterJni(JNIEnv* env); 38 static bool RegisterJni(JNIEnv* env);
40 39
41 void OnSurfaceCreated( 40 void OnSurfaceCreated(
42 JNIEnv* env, 41 JNIEnv* env,
43 const base::android::JavaParamRef<jobject>& caller, 42 const base::android::JavaParamRef<jobject>& caller,
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
76 float y, 75 float y,
77 float diameter); 76 float diameter);
78 77
79 private: 78 private:
80 class Core; 79 class Core;
81 80
82 // Callbacks from the core. 81 // Callbacks from the core.
83 void OnRenderDone(); 82 void OnRenderDone();
84 void OnCanvasSizeChanged(int width, int height); 83 void OnCanvasSizeChanged(int width, int height);
85 84
86 ChromotingJniRuntime* runtime_; 85 ChromotingClientRuntime* runtime_;
87 86
88 QueuedTaskPoster ui_task_poster_; 87 QueuedTaskPoster ui_task_poster_;
89 88
90 std::unique_ptr<Core> core_; 89 std::unique_ptr<Core> core_;
91 90
92 base::android::ScopedJavaGlobalRef<jobject> java_display_; 91 base::android::ScopedJavaGlobalRef<jobject> java_display_;
93 92
94 // Used on UI thread. 93 // Used on UI thread.
95 base::WeakPtrFactory<JniGlDisplayHandler> weak_factory_; 94 base::WeakPtrFactory<JniGlDisplayHandler> weak_factory_;
96 DISALLOW_COPY_AND_ASSIGN(JniGlDisplayHandler); 95 DISALLOW_COPY_AND_ASSIGN(JniGlDisplayHandler);
97 }; 96 };
98 97
99 } // namespace remoting 98 } // namespace remoting
100 99
101 #endif // REMOTING_CLIENT_JNI_JNI_GL_DISPLAY_HANDLER_H_ 100 #endif // REMOTING_CLIENT_JNI_JNI_GL_DISPLAY_HANDLER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698