| Index: remoting/client/jni/jni_gl_display_handler.h
|
| diff --git a/remoting/client/jni/jni_gl_display_handler.h b/remoting/client/jni/jni_gl_display_handler.h
|
| index 5380a0725025c68fddb2b117290318555f0df036..2346c32b66f02b38786d0ad56ef619f57a2ebf4c 100644
|
| --- a/remoting/client/jni/jni_gl_display_handler.h
|
| +++ b/remoting/client/jni/jni_gl_display_handler.h
|
| @@ -33,7 +33,6 @@ class JniGlDisplayHandler : public DisplayUpdaterFactory,
|
| public GlRendererDelegate {
|
| public:
|
| JniGlDisplayHandler(ChromotingJniRuntime* runtime);
|
| - ~JniGlDisplayHandler() override;
|
|
|
| // Sets the DesktopViewFactory for the Java client.
|
| void InitializeClient(
|
| @@ -43,6 +42,9 @@ class JniGlDisplayHandler : public DisplayUpdaterFactory,
|
| std::unique_ptr<protocol::CursorShapeStub> CreateCursorShapeStub() override;
|
| std::unique_ptr<protocol::VideoRenderer> CreateVideoRenderer() override;
|
|
|
| + // Must be called on the UI thread.
|
| + void Destroy() override;
|
| +
|
| static bool RegisterJni(JNIEnv* env);
|
|
|
| void OnSurfaceCreated(
|
| @@ -84,6 +86,11 @@ class JniGlDisplayHandler : public DisplayUpdaterFactory,
|
| float diameter);
|
|
|
| private:
|
| + ~JniGlDisplayHandler() override;
|
| +
|
| + // This avoids listing DeleteHelper as friend.
|
| + void DeleteOnDisplayThread();
|
| +
|
| // GlRendererDelegate interface.
|
| bool CanRenderFrame() override;
|
| void OnFrameRendered() override;
|
|
|