[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>
 
 #include "base/android/scoped_java_ref.h"
 #include "base/macros.h"
 #include "base/memory/weak_ptr.h"
 #include "remoting/client/gl_renderer.h"
 #include "remoting/client/gl_renderer_delegate.h"
-#include "remoting/client/jni/display_updater_factory.h"
 #include "remoting/protocol/cursor_shape_stub.h"
 
 namespace remoting {
 
+namespace protocol {
+class VideoRenderer;
+} // namespace protocol
+
 class ChromotingJniRuntime;
 class DualBufferFrameConsumer;
 class EglThreadContext;
 class QueuedTaskPoster;
 
 // 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.
+// JNI functions should all be called on the UI thread. user must call
+// Initialize() after the handler is constructed and Invalidate() before the
+// handler is destructed. The destructor must be called on the display thread.
 // Please see GlDisplay.java for documentations.
-class JniGlDisplayHandler : public DisplayUpdaterFactory,
-                            public protocol::CursorShapeStub,
+class JniGlDisplayHandler : public protocol::CursorShapeStub,
                             public GlRendererDelegate {
  public:
   JniGlDisplayHandler(ChromotingJniRuntime* runtime);
+
+  // Destructor must be called on the display thread.
   ~JniGlDisplayHandler() override;
 
-  // Sets the DesktopViewFactory for the Java client.
-  void InitializeClient(
-      const base::android::JavaRef<jobject>& java_client);
+  // Must be called exactly once on the UI thread before using the handler.
+  void Initialize(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 before calling the destructor.
+  void Invalidate();
+
+  std::unique_ptr<protocol::CursorShapeStub> CreateCursorShapeStub();
+  std::unique_ptr<protocol::VideoRenderer> CreateVideoRenderer();
 
   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,
@@ skipping 22 matching lines @@
       bool visible);
 
   void OnCursorInputFeedback(
       JNIEnv* env,
       const base::android::JavaParamRef<jobject>& caller,
       float x,
       float y,
       float diameter);
 
  private:
+  // Queues a task. All queued tasks will be posted to the display thread after
+  // the current task is finished.
+  // Do nothing if |ui_task_poster_| has already been released.
+  void QueueTaskOnDisplayThread(const base::Closure& task);
+
   // 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_