Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(386)

Side by Side Diff: remoting/ios/session/remoting_client.mm

Issue 2879743002: [CRD iOS] Hook the touch input feedback (Closed)
Patch Set: Fix dependency and race condition Created 3 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « remoting/ios/display/gl_display_handler.mm ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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/ui/gesture_interpreter.h" 23 #include "remoting/client/ui/gesture_interpreter.h"
24 #include "remoting/client/ui/renderer_proxy.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::RendererProxy> _renderer;
42 std::unique_ptr<remoting::GestureInterpreter> _gestureInterpreter; 44 std::unique_ptr<remoting::GestureInterpreter> _gestureInterpreter;
43 // std::unique_ptr<remoting::KeyboardInterpreter> _keyboardInterpreter; 45 // std::unique_ptr<remoting::KeyboardInterpreter> _keyboardInterpreter;
44 } 46 }
45 @end 47 @end
46 48
47 @implementation RemotingClient 49 @implementation RemotingClient
48 50
49 @synthesize displayHandler = _displayHandler; 51 @synthesize displayHandler = _displayHandler;
50 52
51 - (instancetype)init { 53 - (instancetype)init {
(...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after
114 base::WeakPtr<remoting::protocol::AudioStub> audioPlayer = nullptr; 116 base::WeakPtr<remoting::protocol::AudioStub> audioPlayer = nullptr;
115 117
116 _displayHandler = [[GlDisplayHandler alloc] init]; 118 _displayHandler = [[GlDisplayHandler alloc] init];
117 _displayHandler.delegate = self; 119 _displayHandler.delegate = self;
118 120
119 _session.reset(new remoting::ChromotingSession( 121 _session.reset(new remoting::ChromotingSession(
120 _sessonDelegate->GetWeakPtr(), [_displayHandler CreateCursorShapeStub], 122 _sessonDelegate->GetWeakPtr(), [_displayHandler CreateCursorShapeStub],
121 [_displayHandler CreateVideoRenderer], audioPlayer, info, 123 [_displayHandler CreateVideoRenderer], audioPlayer, info,
122 client_auth_config)); 124 client_auth_config));
123 125
124 __weak GlDisplayHandler* weakDisplayHandler = _displayHandler; 126 _renderer = [_displayHandler CreateRendererProxy];
125 _gestureInterpreter.reset(new remoting::GestureInterpreter( 127
126 base::BindBlockArc(^(const remoting::ViewMatrix& matrix) { 128 _gestureInterpreter.reset(
127 [weakDisplayHandler onPixelTransformationChanged:matrix]; 129 new remoting::GestureInterpreter(_renderer.get(), _session.get()));
128 }),
129 _session.get()));
130 130
131 _session->Connect(); 131 _session->Connect();
132 } 132 }
133 133
134 - (void)disconnectFromHost { 134 - (void)disconnectFromHost {
135 if (_session) { 135 if (_session) {
136 _session->Disconnect(); 136 _session->Disconnect();
137 } 137 }
138 _displayHandler = nil; 138 _displayHandler = nil;
139 // TODO(nicholss): Do we need to cleanup more? 139 // TODO(nicholss): Do we need to cleanup more?
(...skipping 96 matching lines...) Expand 10 before | Expand all | Expand 10 after
236 236
237 - (void)canvasSizeChanged:(CGSize)size { 237 - (void)canvasSizeChanged:(CGSize)size {
238 _gestureInterpreter->OnDesktopSizeChanged(size.width, size.height); 238 _gestureInterpreter->OnDesktopSizeChanged(size.width, size.height);
239 } 239 }
240 240
241 - (void)rendererTicked { 241 - (void)rendererTicked {
242 _gestureInterpreter->ProcessAnimations(); 242 _gestureInterpreter->ProcessAnimations();
243 } 243 }
244 244
245 @end 245 @end
OLDNEW
« no previous file with comments | « remoting/ios/display/gl_display_handler.mm ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698