Changeset 179752 in webkit
- Timestamp:
- Feb 6, 2015 12:46:19 PM (9 years ago)
- Location:
- trunk/Source/WebKit2
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebKit2/ChangeLog
r179745 r179752 1 2015-02-05 Timothy Hatcher <timothy@apple.com> 2 3 Support overriding the deviceScaleFactor per WKWebView/WKView 4 https://bugs.webkit.org/show_bug.cgi?id=141311 5 6 Reviewed by Tim Horton. 7 8 * UIProcess/API/Cocoa/WKViewPrivate.h: 9 * UIProcess/API/Cocoa/WKWebView.mm: 10 (-[WKWebView _setOverrideDeviceScaleFactor:]): 11 (-[WKWebView _overrideDeviceScaleFactor]): 12 * UIProcess/API/Cocoa/WKWebViewPrivate.h: 13 * UIProcess/API/mac/WKView.mm: 14 (-[WKView _intrinsicDeviceScaleFactor]): 15 (-[WKView _setOverrideDeviceScaleFactor:]): 16 (-[WKView _overrideDeviceScaleFactor]): 17 1 18 2015-02-06 Carlos Garcia Campos <cgarcia@igalia.com> 2 19 -
trunk/Source/WebKit2/UIProcess/API/Cocoa/WKViewPrivate.h
r178870 r179752 91 91 @property (nonatomic, setter=_setTotalHeightOfBanners:) CGFloat _totalHeightOfBanners; 92 92 93 @property (nonatomic, setter=_setOverrideDeviceScaleFactor:) CGFloat _overrideDeviceScaleFactor WK_AVAILABLE(WK_MAC_TBA, NA); 94 93 95 #if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000 94 96 @property (nonatomic, setter=_setAutomaticallyAdjustsContentInsets:) BOOL _automaticallyAdjustsContentInsets; -
trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm
r179668 r179752 2531 2531 } 2532 2532 2533 - (void)_setOverrideDeviceScaleFactor:(CGFloat)deviceScaleFactor 2534 { 2535 [_wkView _setOverrideDeviceScaleFactor:deviceScaleFactor]; 2536 } 2537 2538 - (CGFloat)_overrideDeviceScaleFactor 2539 { 2540 return [_wkView _overrideDeviceScaleFactor]; 2541 } 2542 2533 2543 - (void)_setTopContentInset:(CGFloat)contentInset 2534 2544 { -
trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewPrivate.h
r178723 r179752 156 156 @property (nonatomic, setter=_setDrawsTransparentBackground:) BOOL _drawsTransparentBackground; 157 157 @property (nonatomic, setter=_setTopContentInset:) CGFloat _topContentInset; 158 158 159 #if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000 159 160 @property (nonatomic, setter=_setAutomaticallyAdjustsContentInsets:) BOOL _automaticallyAdjustsContentInsets; 160 161 #endif 162 163 // Default value is 0. A value of 0 means the window's backing scale factor will be used and automatically update when the window moves screens. 164 @property (nonatomic, setter=_setOverrideDeviceScaleFactor:) CGFloat _overrideDeviceScaleFactor WK_AVAILABLE(WK_MAC_TBA, NA); 161 165 #endif 162 166 -
trunk/Source/WebKit2/UIProcess/API/mac/WKView.mm
r179373 r179752 262 262 CGFloat _topContentInset; 263 263 CGFloat _totalHeightOfBanners; 264 265 CGFloat _overrideDeviceScaleFactor; 264 266 265 267 #if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000 … … 2829 2831 - (float)_intrinsicDeviceScaleFactor 2830 2832 { 2833 if (_data->_overrideDeviceScaleFactor) 2834 return _data->_overrideDeviceScaleFactor; 2831 2835 if (_data->_targetWindowForMovePreparation) 2832 2836 return [_data->_targetWindowForMovePreparation backingScaleFactor]; … … 4128 4132 } 4129 4133 4134 - (void)_setOverrideDeviceScaleFactor:(CGFloat)deviceScaleFactor 4135 { 4136 _data->_overrideDeviceScaleFactor = deviceScaleFactor; 4137 _data->_page->setIntrinsicDeviceScaleFactor([self _intrinsicDeviceScaleFactor]); 4138 } 4139 4140 - (CGFloat)_overrideDeviceScaleFactor 4141 { 4142 return _data->_overrideDeviceScaleFactor; 4143 } 4144 4130 4145 - (void)_dispatchSetTopContentInset 4131 4146 {
Note: See TracChangeset
for help on using the changeset viewer.