| OLD | NEW |
| 1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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 #import "ios/web/public/web_state/ui/crw_generic_content_view.h" | 5 #import "ios/web/public/web_state/ui/crw_generic_content_view.h" |
| 6 | 6 |
| 7 #include "base/logging.h" | 7 #include "base/logging.h" |
| 8 #include "base/mac/scoped_nsobject.h" | 8 #import "base/mac/scoped_nsobject.h" |
| 9 | 9 |
| 10 #if !defined(__has_feature) || !__has_feature(objc_arc) | 10 #if !defined(__has_feature) || !__has_feature(objc_arc) |
| 11 #error "This file requires ARC support." | 11 #error "This file requires ARC support." |
| 12 #endif | 12 #endif |
| 13 | 13 |
| 14 @interface CRWGenericContentView () { | 14 @interface CRWGenericContentView () { |
| 15 // The size of the view's bounds at the last call to |-layoutSubviews|. | 15 // The size of the view's bounds at the last call to |-layoutSubviews|. |
| 16 CGSize _lastLayoutSize; | 16 CGSize _lastLayoutSize; |
| 17 // Backing objectect for |self.scrollView|. | 17 // Backing objectect for |self.scrollView|. |
| 18 base::scoped_nsobject<UIScrollView> _scrollView; | 18 base::scoped_nsobject<UIScrollView> _scrollView; |
| (...skipping 78 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 97 viewSize.height = CGRectGetHeight(contentRect) + singlePixel; | 97 viewSize.height = CGRectGetHeight(contentRect) + singlePixel; |
| 98 } | 98 } |
| 99 self.scrollView.contentSize = viewSize; | 99 self.scrollView.contentSize = viewSize; |
| 100 } | 100 } |
| 101 | 101 |
| 102 - (BOOL)isViewAlive { | 102 - (BOOL)isViewAlive { |
| 103 return YES; | 103 return YES; |
| 104 } | 104 } |
| 105 | 105 |
| 106 @end | 106 @end |
| OLD | NEW |