Title: [182781] trunk/Source/WebKit2
- Revision
- 182781
- Author
- [email protected]
- Date
- 2015-04-13 22:10:09 -0700 (Mon, 13 Apr 2015)
Log Message
Build fixes after r182772.
* UIProcess/API/mac/WKView.mm:
(-[WKView _updateAutomaticallyComputedFixedLayoutSize]): Make a CGSize, not an NSSize.
(-[WKView _setAutomaticallyComputesFixedLayoutSizeFromViewScale:]): Moved implementation
to the correct place.
(-[WKView _automaticallyComputesFixedLayoutSizeFromViewScale]): Ditto.
(-[WKView _layoutMode]): Use a memeber from _data directly, not via a method.
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (182780 => 182781)
--- trunk/Source/WebKit2/ChangeLog 2015-04-14 04:59:09 UTC (rev 182780)
+++ trunk/Source/WebKit2/ChangeLog 2015-04-14 05:10:09 UTC (rev 182781)
@@ -1,5 +1,16 @@
2015-04-13 Alexey Proskuryakov <[email protected]>
+ Build fixes after r182772.
+
+ * UIProcess/API/mac/WKView.mm:
+ (-[WKView _updateAutomaticallyComputedFixedLayoutSize]): Make a CGSize, not an NSSize.
+ (-[WKView _setAutomaticallyComputesFixedLayoutSizeFromViewScale:]): Moved implementation
+ to the correct place.
+ (-[WKView _automaticallyComputesFixedLayoutSizeFromViewScale]): Ditto.
+ (-[WKView _layoutMode]): Use a memeber from _data directly, not via a method.
+
+2015-04-13 Alexey Proskuryakov <[email protected]>
+
More build fix.
* UIProcess/mac/PageClientImpl.mm:
Modified: trunk/Source/WebKit2/UIProcess/API/mac/WKView.mm (182780 => 182781)
--- trunk/Source/WebKit2/UIProcess/API/mac/WKView.mm 2015-04-14 04:59:09 UTC (rev 182780)
+++ trunk/Source/WebKit2/UIProcess/API/mac/WKView.mm 2015-04-14 05:10:09 UTC (rev 182781)
@@ -567,7 +567,7 @@
{
ASSERT(_data->_automaticallyComputesFixedLayoutSizeFromViewScale);
CGFloat inverseScale = 1 / _data->_page->viewScaleFactor();
- [self _setFixedLayoutSize:NSMakeSize(self.frame.size.width * inverseScale, self.frame.size.height * inverseScale)];
+ [self _setFixedLayoutSize:CGSizeMake(self.frame.size.width * inverseScale, self.frame.size.height * inverseScale)];
}
- (void)_updateWindowAndViewFrames
@@ -3981,6 +3981,24 @@
#endif // __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000
+- (void)_setAutomaticallyComputesFixedLayoutSizeFromViewScale:(BOOL)automaticallyComputesFixedLayoutSizeFromViewScale
+{
+ if (_data->_automaticallyComputesFixedLayoutSizeFromViewScale == automaticallyComputesFixedLayoutSizeFromViewScale)
+ return;
+
+ _data->_automaticallyComputesFixedLayoutSizeFromViewScale = automaticallyComputesFixedLayoutSizeFromViewScale;
+
+ if (!_data->_automaticallyComputesFixedLayoutSizeFromViewScale)
+ return;
+
+ [self _updateAutomaticallyComputedFixedLayoutSize];
+}
+
+- (BOOL)_automaticallyComputesFixedLayoutSizeFromViewScale
+{
+ return _data->_automaticallyComputesFixedLayoutSizeFromViewScale;
+}
+
@end
@implementation WKView (Private)
@@ -4365,7 +4383,7 @@
{
if (_data->_page->useFixedLayout()) {
#if PLATFORM(MAC)
- if (self._automaticallyComputesFixedLayoutSizeFromViewScale)
+ if (_data->_automaticallyComputesFixedLayoutSizeFromViewScale)
return kWKLayoutModeDynamicSizeComputedFromViewScale;
#endif
return kWKLayoutModeFixedSize;
@@ -4678,24 +4696,6 @@
#endif
-- (void)_setAutomaticallyComputesFixedLayoutSizeFromViewScale:(BOOL)automaticallyComputesFixedLayoutSizeFromViewScale
-{
- if (_data->_automaticallyComputesFixedLayoutSizeFromViewScale == automaticallyComputesFixedLayoutSizeFromViewScale)
- return;
-
- _data->_automaticallyComputesFixedLayoutSizeFromViewScale = automaticallyComputesFixedLayoutSizeFromViewScale;
-
- if (!_data->_automaticallyComputesFixedLayoutSizeFromViewScale)
- return;
-
- [self _updateAutomaticallyComputedFixedLayoutSize];
-}
-
-- (BOOL)_automaticallyComputesFixedLayoutSizeFromViewScale
-{
- return _data->_automaticallyComputesFixedLayoutSizeFromViewScale;
-}
-
@end
@implementation WKResponderChainSink
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
