[Remoting Android] JniGlDisplayHandler calls invalidate() on UI thread

remoting/client/jni/jni_gl_display_handler.h

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef REMOTING_CLIENT_JNI_JNI_GL_DISPLAY_HANDLER_H_
 #define REMOTING_CLIENT_JNI_JNI_GL_DISPLAY_HANDLER_H_
 
 #include <EGL/egl.h>
 #include <jni.h>
 
@@ skipping 15 matching lines @@
 // Handles OpenGL display operations. Draws desktop and cursor on the OpenGL
 // surface.
 // JNI functions should all be called on the UI thread. The display handler
 // itself should be deleted on the display thread.
 // Please see GlDisplay.java for documentations.
 class JniGlDisplayHandler : public DisplayUpdaterFactory,
                             public protocol::CursorShapeStub,
                             public GlRendererDelegate {
  public:
   JniGlDisplayHandler(ChromotingJniRuntime* runtime);
-  ~JniGlDisplayHandler() override;
 
   // Sets the DesktopViewFactory for the Java client.
   void InitializeClient(
       const base::android::JavaRef<jobject>& java_client);
 
   // DisplayUpdaterFactory interface.
   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(
       JNIEnv* env,
       const base::android::JavaParamRef<jobject>& caller,
       const base::android::JavaParamRef<jobject>& surface);
 
   void OnSurfaceChanged(JNIEnv* env,
                         const base::android::JavaParamRef<jobject>& caller,
                         int width,
@@ skipping 21 matching lines @@
       bool visible);
 
   void OnCursorInputFeedback(
       JNIEnv* env,
       const base::android::JavaParamRef<jobject>& caller,
       float x,
       float y,
       float diameter);
 
  private:
+  ~JniGlDisplayHandler() override;
+
+  // This avoids listing DeleteHelper as friend.
+  void DeleteOnDisplayThread();
+
   // GlRendererDelegate interface.
   bool CanRenderFrame() override;
   void OnFrameRendered() override;
   void OnSizeChanged(int width, int height) override;
 
   // CursorShapeStub interface.
   void SetCursorShape(const protocol::CursorShapeInfo& cursor_shape) override;
 
   static void NotifyRenderDoneOnUiThread(
       base::android::ScopedJavaGlobalRef<jobject> java_display);
@@ skipping 23 matching lines @@
 
   // Used on display thread.
   base::WeakPtr<JniGlDisplayHandler> weak_ptr_;
   base::WeakPtrFactory<JniGlDisplayHandler> weak_factory_;
   DISALLOW_COPY_AND_ASSIGN(JniGlDisplayHandler);
 };
 
 }  // namespace remoting
 
 #endif  // REMOTING_CLIENT_JNI_JNI_GL_DISPLAY_HANDLER_H_