| OLD | NEW | 
|---|
| 1 /* | 1 /* | 
| 2  *  Copyright 2014 The WebRTC Project Authors. All rights reserved. | 2  *  Copyright 2014 The WebRTC Project Authors. All rights reserved. | 
| 3  * | 3  * | 
| 4  *  Use of this source code is governed by a BSD-style license | 4  *  Use of this source code is governed by a BSD-style license | 
| 5  *  that can be found in the LICENSE file in the root of the source | 5  *  that can be found in the LICENSE file in the root of the source | 
| 6  *  tree. An additional intellectual property rights grant can be found | 6  *  tree. An additional intellectual property rights grant can be found | 
| 7  *  in the file PATENTS.  All contributing project authors may | 7  *  in the file PATENTS.  All contributing project authors may | 
| 8  *  be found in the AUTHORS file in the root of the source tree. | 8  *  be found in the AUTHORS file in the root of the source tree. | 
| 9  */ | 9  */ | 
| 10 | 10 | 
| (...skipping 198 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 209   [_logView setEditable:NO]; | 209   [_logView setEditable:NO]; | 
| 210 | 210 | 
| 211   [self setupActionItemsView]; | 211   [self setupActionItemsView]; | 
| 212 | 212 | 
| 213   _scrollView = [[NSScrollView alloc] initWithFrame:NSZeroRect]; | 213   _scrollView = [[NSScrollView alloc] initWithFrame:NSZeroRect]; | 
| 214   [_scrollView setTranslatesAutoresizingMaskIntoConstraints:NO]; | 214   [_scrollView setTranslatesAutoresizingMaskIntoConstraints:NO]; | 
| 215   [_scrollView setHasVerticalScroller:YES]; | 215   [_scrollView setHasVerticalScroller:YES]; | 
| 216   [_scrollView setDocumentView:_logView]; | 216   [_scrollView setDocumentView:_logView]; | 
| 217   [self addSubview:_scrollView]; | 217   [self addSubview:_scrollView]; | 
| 218 | 218 | 
| 219 |  | 
| 220 // NOTE (daniela): Ignoring Clang diagonstic here. | 219 // NOTE (daniela): Ignoring Clang diagonstic here. | 
| 221 // We're performing run time check to make sure class is available on runtime. | 220 // We're performing run time check to make sure class is available on runtime. | 
| 222 // If not we're providing sensible default. | 221 // If not we're providing sensible default. | 
| 223 #pragma clang diagnostic push | 222 #pragma clang diagnostic push | 
| 224 #pragma clang diagnostic ignored "-Wpartial-availability" | 223 #pragma clang diagnostic ignored "-Wpartial-availability" | 
| 225   if ([RTCMTLNSVideoView class]) { | 224   if ([RTCMTLNSVideoView class]) { | 
| 226     _remoteVideoView = [[RTCMTLNSVideoView alloc] initWithFrame:NSZeroRect]; | 225     _remoteVideoView = [[RTCMTLNSVideoView alloc] initWithFrame:NSZeroRect]; | 
| 227     _localVideoView = [[RTCMTLNSVideoView alloc] initWithFrame:NSZeroRect]; | 226     _localVideoView = [[RTCMTLNSVideoView alloc] initWithFrame:NSZeroRect]; | 
| 228   } else { | 227   } else { | 
| 229     NSOpenGLPixelFormatAttribute attributes[] = { | 228     NSOpenGLPixelFormatAttribute attributes[] = { | 
| (...skipping 199 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 429 } | 428 } | 
| 430 | 429 | 
| 431 - (void)disconnect { | 430 - (void)disconnect { | 
| 432   [self resetUI]; | 431   [self resetUI]; | 
| 433   [_captureController stopCapture]; | 432   [_captureController stopCapture]; | 
| 434   _captureController = nil; | 433   _captureController = nil; | 
| 435   [_client disconnect]; | 434   [_client disconnect]; | 
| 436 } | 435 } | 
| 437 | 436 | 
| 438 @end | 437 @end | 
| OLD | NEW | 
|---|