[Remoting iOS] Fix screen tearing and screen dimensions

remoting/client/ios/display/gl_display_handler.mm

 // Copyright 2017 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.
 
 #if !defined(__has_feature) || !__has_feature(objc_arc)
 #error "This file requires ARC support."
 #endif
 
 #include <array>
 
@@ skipping 30 matching lines @@
   void SetCursorShape(const protocol::CursorShapeInfo& cursor_shape) override;
 
   // GlRendererDelegate interface.
   bool CanRenderFrame() override;
   void OnFrameRendered() override;
   void OnSizeChanged(int width, int height) override;
 
   void OnFrameReceived(std::unique_ptr<webrtc::DesktopFrame> frame,
                        const base::Closure& done);
   void Stop();
+  void SurfaceCreated(GLKView* view);
   void SurfaceChanged(int width, int height);
   std::unique_ptr<protocol::FrameConsumer> GrabFrameConsumer();
   EAGLContext* GetEAGLContext();
   base::WeakPtr<Core> GetWeakPtr();
 
  private:
   remoting::ChromotingClientRuntime* runtime_;
 
   // Will be std::move'd when GrabFrameConsumer() is called.
   std::unique_ptr<DualBufferFrameConsumer> owned_frame_consumer_;
   base::WeakPtr<DualBufferFrameConsumer> frame_consumer_;
 
+  GLKView* gl_view_;

[nicholss, 2017/05/01 16:20:14]

Note, gl_view_ here is correct because this is Obj-C++. It is just the Obj-C
style that you need to worry about.

[Yuwei, 2017/05/01 20:58:08]

Acknowledged.

I've also noticed that ARC will still work here even though it looks like a raw
pointer :P

   EAGLContext* eagl_context_;
   std::unique_ptr<GlRenderer> renderer_;
   //  GlDemoScreen *demo_screen_;
 
   // Used on display thread.
   base::WeakPtr<Core> weak_ptr_;
   base::WeakPtrFactory<Core> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(Core);
 };
@@ skipping 28 matching lines @@
     // fall back to ES2 if needed.
     eagl_context_ =
         [[EAGLContext alloc] initWithAPI:kEAGLRenderingAPIOpenGLES3];
     [EAGLContext setCurrentContext:eagl_context_];
   }
 
   renderer_ = remoting::GlRenderer::CreateGlRendererWithDesktop();
 
   //  renderer_.RequestCanvasSize();
 
-  renderer_->OnSurfaceCreated(
-      base::MakeUnique<GlCanvas>(static_cast<int>([eagl_context_ API])));
-
-  SurfaceChanged(1024, 640);  // TODO(nicholss): Where does this data comefrom?
-
-  // TODO(nicholss): This are wrong values but it lets us get something on the
-  // screen.
-  std::array<float, 9> matrix = {{1, 0, 0,
-                                  0, 1, 0,
-                                  0, 0, 1}};
-
-  renderer_->OnPixelTransformationChanged(matrix);
-
   // demo_screen_ = new GlDemoScreen();
   // renderer_->AddDrawable(demo_screen_->GetWeakPtr());
   renderer_->SetDelegate(weak_ptr_);
 }
 
 void Core::SetCursorShape(const protocol::CursorShapeInfo& cursor_shape) {
   DCHECK(runtime_->display_task_runner()->BelongsToCurrentThread());
   renderer_->OnCursorShapeChanged(cursor_shape);
 }
 
 bool Core::CanRenderFrame() {
   DCHECK(runtime_->display_task_runner()->BelongsToCurrentThread());
-  return eagl_context_ != NULL;
+  return gl_view_ != NULL && eagl_context_ != NULL;
 }
 
 std::unique_ptr<protocol::FrameConsumer> Core::GrabFrameConsumer() {
   DCHECK(owned_frame_consumer_) << "The frame consumer is already grabbed.";
   return std::move(owned_frame_consumer_);
 }
 
 void Core::OnFrameReceived(std::unique_ptr<webrtc::DesktopFrame> frame,
                            const base::Closure& done) {
   DCHECK(runtime_->display_task_runner()->BelongsToCurrentThread());
   renderer_->OnFrameReceived(std::move(frame), done);
 }
 
 void Core::OnFrameRendered() {
-  // Nothing to do.
+  [gl_view_ setNeedsDisplay];
 }
 
 void Core::OnSizeChanged(int width, int height) {
   // Nothing to do.
 }
 
 void Core::Stop() {
   DCHECK(runtime_->display_task_runner()->BelongsToCurrentThread());
 
   eagl_context_ = nil;
   // demo_screen_ = nil;
 }
 
+void Core::SurfaceCreated(GLKView* view) {
+  DCHECK(runtime_->display_task_runner()->BelongsToCurrentThread());
+  gl_view_ = view;
+
+  renderer_->OnSurfaceCreated(
+      base::MakeUnique<GlCanvas>(static_cast<int>([eagl_context_ API])));
+
+  runtime_->network_task_runner()->PostTask(
+      FROM_HERE, base::Bind(&DualBufferFrameConsumer::RequestFullDesktopFrame,
+                            frame_consumer_));
+}
+
 void Core::SurfaceChanged(int width, int height) {
   DCHECK(runtime_->display_task_runner()->BelongsToCurrentThread());
   renderer_->OnSurfaceChanged(width, height);
+
+  // TODO(nicholss): This are wrong values but it lets us get something on the
+  // screen.
+  std::array<float, 9> matrix = {{1, 0, 0,  // Row 1

[Yuwei, 2017/04/30 01:18:06]

BTW this is a trick to stop git cl format by adding comments after the line :P

[nicholss, 2017/05/01 16:20:14]

nice!

+                                  0, 1, 0,  // Row 2
+                                  0, 0, 1}};
+
+  renderer_->OnPixelTransformationChanged(matrix);
 }
 
 EAGLContext* Core::GetEAGLContext() {
   return eagl_context_;
 }
 
 base::WeakPtr<remoting::GlDisplayHandler::Core> Core::GetWeakPtr() {
   return weak_ptr_;
 }
 
@@ skipping 32 matching lines @@
 
 - (std::unique_ptr<remoting::protocol::CursorShapeStub>)CreateCursorShapeStub {
   return base::MakeUnique<remoting::CursorShapeStubProxy>(
       _core->GetWeakPtr(), _runtime->display_task_runner());
 }
 
 - (EAGLContext*)GetEAGLContext {
   return _core->GetEAGLContext();
 }
 
+- (void)onSurfaceCreated:(GLKView*)view {
+  _runtime->display_task_runner()->PostTask(
+      FROM_HERE, base::Bind(&remoting::GlDisplayHandler::Core::SurfaceCreated,
+                            _core->GetWeakPtr(), view));
+}
+
+- (void)onSurfaceChanged:(const CGRect&)frame {
+  _runtime->display_task_runner()->PostTask(
+      FROM_HERE,
+      base::Bind(&remoting::GlDisplayHandler::Core::SurfaceChanged,
+                 _core->GetWeakPtr(), frame.size.width, frame.size.height));
+}
+
 // TODO(nicholss): Remove this function, it is not used in the final impl,
 // or it should call RequestRender.
 - (void)glkView:(GLKView*)view drawInRect:(CGRect)rect {
   if (_core) {
     _runtime->display_task_runner()->PostTask(
         FROM_HERE,
         base::Bind(&remoting::GlDisplayHandler::Core::SurfaceChanged,
                    _core->GetWeakPtr(), rect.size.width, rect.size.height));
   }
 }
 
 @end