| OLD | NEW |
| 1 // Copyright 2017 The Chromium Authors. All rights reserved. | 1 // Copyright 2017 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 #if !defined(__has_feature) || !__has_feature(objc_arc) | 5 #if !defined(__has_feature) || !__has_feature(objc_arc) |
| 6 #error "This file requires ARC support." | 6 #error "This file requires ARC support." |
| 7 #endif | 7 #endif |
| 8 | 8 |
| 9 #import "remoting/ios/session/remoting_client.h" | 9 #import "remoting/ios/session/remoting_client.h" |
| 10 | 10 |
| 11 #include <memory> | 11 #include <memory> |
| 12 | 12 |
| 13 #import "base/mac/bind_objc_block.h" | 13 #import "base/mac/bind_objc_block.h" |
| 14 #import "ios/third_party/material_components_ios/src/components/Dialogs/src/Mate
rialDialogs.h" | 14 #import "ios/third_party/material_components_ios/src/components/Dialogs/src/Mate
rialDialogs.h" |
| 15 #import "remoting/ios/display/gl_display_handler.h" | 15 #import "remoting/ios/display/gl_display_handler.h" |
| 16 #import "remoting/ios/domain/client_session_details.h" | 16 #import "remoting/ios/domain/client_session_details.h" |
| 17 #import "remoting/ios/domain/host_info.h" | 17 #import "remoting/ios/domain/host_info.h" |
| 18 | 18 |
| 19 #include "base/strings/sys_string_conversions.h" | 19 #include "base/strings/sys_string_conversions.h" |
| 20 #include "remoting/client/chromoting_client_runtime.h" | 20 #include "remoting/client/chromoting_client_runtime.h" |
| 21 #include "remoting/client/chromoting_session.h" | 21 #include "remoting/client/chromoting_session.h" |
| 22 #include "remoting/client/connect_to_host_info.h" | 22 #include "remoting/client/connect_to_host_info.h" |
| 23 #include "remoting/client/gesture_interpreter.h" | 23 #include "remoting/client/gesture_interpreter.h" |
| 24 #include "remoting/client/render_stub.h" |
| 24 #include "remoting/ios/session/remoting_client_session_delegate.h" | 25 #include "remoting/ios/session/remoting_client_session_delegate.h" |
| 25 #include "remoting/protocol/session.h" | 26 #include "remoting/protocol/session.h" |
| 26 #include "remoting/protocol/video_renderer.h" | 27 #include "remoting/protocol/video_renderer.h" |
| 27 | 28 |
| 28 NSString* const kHostSessionStatusChanged = @"kHostSessionStatusChanged"; | 29 NSString* const kHostSessionStatusChanged = @"kHostSessionStatusChanged"; |
| 29 NSString* const kHostSessionPinProvided = @"kHostSessionPinProvided"; | 30 NSString* const kHostSessionPinProvided = @"kHostSessionPinProvided"; |
| 30 | 31 |
| 31 NSString* const kSessionDetails = @"kSessionDetails"; | 32 NSString* const kSessionDetails = @"kSessionDetails"; |
| 32 NSString* const kSessonStateErrorCode = @"kSessonStateErrorCode"; | 33 NSString* const kSessonStateErrorCode = @"kSessonStateErrorCode"; |
| 33 NSString* const kHostSessionPin = @"kHostSessionPin"; | 34 NSString* const kHostSessionPin = @"kHostSessionPin"; |
| 34 | 35 |
| 35 @interface RemotingClient () { | 36 @interface RemotingClient () { |
| 36 remoting::ChromotingClientRuntime* _runtime; | 37 remoting::ChromotingClientRuntime* _runtime; |
| 37 std::unique_ptr<remoting::ChromotingSession> _session; | 38 std::unique_ptr<remoting::ChromotingSession> _session; |
| 38 remoting::RemotingClientSessonDelegate* _sessonDelegate; | 39 remoting::RemotingClientSessonDelegate* _sessonDelegate; |
| 39 ClientSessionDetails* _sessionDetails; | 40 ClientSessionDetails* _sessionDetails; |
| 40 // Call _secretFetchedCallback on the network thread. | 41 // Call _secretFetchedCallback on the network thread. |
| 41 remoting::protocol::SecretFetchedCallback _secretFetchedCallback; | 42 remoting::protocol::SecretFetchedCallback _secretFetchedCallback; |
| 43 std::unique_ptr<remoting::RenderStub> _renderStub; |
| 42 std::unique_ptr<remoting::GestureInterpreter> _gestureInterpreter; | 44 std::unique_ptr<remoting::GestureInterpreter> _gestureInterpreter; |
| 43 } | 45 } |
| 44 @end | 46 @end |
| 45 | 47 |
| 46 @implementation RemotingClient | 48 @implementation RemotingClient |
| 47 | 49 |
| 48 @synthesize displayHandler = _displayHandler; | 50 @synthesize displayHandler = _displayHandler; |
| 49 | 51 |
| 50 - (instancetype)init { | 52 - (instancetype)init { |
| 51 self = [super init]; | 53 self = [super init]; |
| (...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 113 base::WeakPtr<remoting::protocol::AudioStub> audioPlayer = nullptr; | 115 base::WeakPtr<remoting::protocol::AudioStub> audioPlayer = nullptr; |
| 114 | 116 |
| 115 _displayHandler = [[GlDisplayHandler alloc] init]; | 117 _displayHandler = [[GlDisplayHandler alloc] init]; |
| 116 _displayHandler.delegate = self; | 118 _displayHandler.delegate = self; |
| 117 | 119 |
| 118 _session.reset(new remoting::ChromotingSession( | 120 _session.reset(new remoting::ChromotingSession( |
| 119 _sessonDelegate->GetWeakPtr(), [_displayHandler CreateCursorShapeStub], | 121 _sessonDelegate->GetWeakPtr(), [_displayHandler CreateCursorShapeStub], |
| 120 [_displayHandler CreateVideoRenderer], audioPlayer, info, | 122 [_displayHandler CreateVideoRenderer], audioPlayer, info, |
| 121 client_auth_config)); | 123 client_auth_config)); |
| 122 | 124 |
| 123 __weak GlDisplayHandler* weakDisplayHandler = _displayHandler; | 125 _renderStub = [_displayHandler CreateRenderStub]; |
| 124 _gestureInterpreter.reset(new remoting::GestureInterpreter( | 126 |
| 125 base::BindBlockArc(^(const remoting::ViewMatrix& matrix) { | 127 _gestureInterpreter.reset( |
| 126 [weakDisplayHandler onPixelTransformationChanged:matrix]; | 128 new remoting::GestureInterpreter(_renderStub.get(), _session.get())); |
| 127 }), | |
| 128 _session.get())); | |
| 129 | 129 |
| 130 _session->Connect(); | 130 _session->Connect(); |
| 131 } | 131 } |
| 132 | 132 |
| 133 - (void)disconnectFromHost { | 133 - (void)disconnectFromHost { |
| 134 if (_session) { | 134 if (_session) { |
| 135 _session->Disconnect(); | 135 _session->Disconnect(); |
| 136 } | 136 } |
| 137 _displayHandler = nil; | 137 _displayHandler = nil; |
| 138 // TODO(nicholss): Do we need to cleanup more? | 138 // TODO(nicholss): Do we need to cleanup more? |
| (...skipping 96 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 235 | 235 |
| 236 - (void)canvasSizeChanged:(CGSize)size { | 236 - (void)canvasSizeChanged:(CGSize)size { |
| 237 _gestureInterpreter->OnDesktopSizeChanged(size.width, size.height); | 237 _gestureInterpreter->OnDesktopSizeChanged(size.width, size.height); |
| 238 } | 238 } |
| 239 | 239 |
| 240 - (void)rendererTicked { | 240 - (void)rendererTicked { |
| 241 _gestureInterpreter->ProcessAnimations(); | 241 _gestureInterpreter->ProcessAnimations(); |
| 242 } | 242 } |
| 243 | 243 |
| 244 @end | 244 @end |
| OLD | NEW |