Diff
Modified: trunk/Source/WebCore/ChangeLog (231096 => 231097)
--- trunk/Source/WebCore/ChangeLog 2018-04-27 15:40:16 UTC (rev 231096)
+++ trunk/Source/WebCore/ChangeLog 2018-04-27 16:07:19 UTC (rev 231097)
@@ -1,3 +1,28 @@
+2018-04-27 Wenson Hsieh <[email protected]>
+
+ Rename minimumLayoutSize to viewLayoutSize
+ https://bugs.webkit.org/show_bug.cgi?id=185050
+ <rdar://problem/39624038>
+
+ Reviewed by Tim Horton.
+
+ See WebKit/ChangeLog for more information. No change in behavior.
+
+ * page/ViewportConfiguration.cpp:
+ (WebCore::ViewportConfiguration::ViewportConfiguration):
+ (WebCore::ViewportConfiguration::setViewLayoutSize):
+
+ Remove a FIXME comment that is addressed by this refactoring.
+
+ (WebCore::ViewportConfiguration::shouldOverrideDeviceWidthWithMinDeviceWidth const):
+ (WebCore::ViewportConfiguration::initialScaleFromSize const):
+ (WebCore::ViewportConfiguration::minimumScale const):
+ (WebCore::ViewportConfiguration::updateMinimumLayoutSize):
+ (WebCore::ViewportConfiguration::setMinimumLayoutSize): Deleted.
+ * page/ViewportConfiguration.h:
+ (WebCore::ViewportConfiguration::viewLayoutSize const):
+ (WebCore::ViewportConfiguration::viewSize const): Deleted.
+
2018-04-27 Zalan Bujtas <[email protected]>
[LFC] Formatting contexts should create floating states.
Modified: trunk/Source/WebCore/page/ViewportConfiguration.cpp (231096 => 231097)
--- trunk/Source/WebCore/page/ViewportConfiguration.cpp 2018-04-27 15:40:16 UTC (rev 231096)
+++ trunk/Source/WebCore/page/ViewportConfiguration.cpp 2018-04-27 16:07:19 UTC (rev 231097)
@@ -59,7 +59,7 @@
ViewportConfiguration::ViewportConfiguration()
: m_minimumLayoutSize(1024, 768)
- , m_viewSize(1024, 768)
+ , m_viewLayoutSize(1024, 768)
, m_canIgnoreScalingConstraints(false)
, m_forceAlwaysUserScalable(false)
{
@@ -95,14 +95,12 @@
return true;
}
-// FIXME: ViewportConfiguration::setMinimumLayoutSize is no longer an accurate name, since the minimum layout size
-// is not necessarily the size of the view.
-bool ViewportConfiguration::setMinimumLayoutSize(const FloatSize& minimumLayoutSize)
+bool ViewportConfiguration::setViewLayoutSize(const FloatSize& viewLayoutSize)
{
- if (m_viewSize == minimumLayoutSize)
+ if (m_viewLayoutSize == viewLayoutSize)
return false;
- m_viewSize = minimumLayoutSize;
+ m_viewLayoutSize = viewLayoutSize;
updateMinimumLayoutSize();
updateConfiguration();
@@ -139,7 +137,7 @@
bool ViewportConfiguration::shouldOverrideDeviceWidthWithMinDeviceWidth() const
{
- return m_viewSize.width() < computedMinDeviceWidth(m_viewportArguments.minDeviceWidth);
+ return m_viewLayoutSize.width() < computedMinDeviceWidth(m_viewportArguments.minDeviceWidth);
}
bool ViewportConfiguration::shouldIgnoreHorizontalScalingConstraints() const
@@ -201,11 +199,11 @@
// We want a scale small enough to fit the document width-wise.
double initialScale = 0;
if (width > 0 && !shouldIgnoreVerticalScalingConstraints())
- initialScale = m_viewSize.width() / width;
+ initialScale = m_viewLayoutSize.width() / width;
// Prevent the initial scale from shrinking to a height smaller than our view's minimum height.
- if (height > 0 && height * initialScale < m_viewSize.height() && !shouldIgnoreHorizontalScalingConstraints())
- initialScale = m_viewSize.height() / height;
+ if (height > 0 && height * initialScale < m_viewLayoutSize.height() && !shouldIgnoreHorizontalScalingConstraints())
+ initialScale = m_viewLayoutSize.height() / height;
return std::min(std::max(initialScale, shouldIgnoreScalingConstraints ? m_defaultConfiguration.minimumScale : m_configuration.minimumScale), m_configuration.maximumScale);
}
@@ -233,12 +231,12 @@
minimumScale = std::min(minimumScale, forceAlwaysUserScalableMinimumScale);
double contentWidth = m_contentSize.width();
- if (contentWidth > 0 && contentWidth * minimumScale < m_viewSize.width() && !shouldIgnoreVerticalScalingConstraints())
- minimumScale = m_viewSize.width() / contentWidth;
+ if (contentWidth > 0 && contentWidth * minimumScale < m_viewLayoutSize.width() && !shouldIgnoreVerticalScalingConstraints())
+ minimumScale = m_viewLayoutSize.width() / contentWidth;
double contentHeight = m_contentSize.height();
- if (contentHeight > 0 && contentHeight * minimumScale < m_viewSize.height() && !shouldIgnoreHorizontalScalingConstraints())
- minimumScale = m_viewSize.height() / contentHeight;
+ if (contentHeight > 0 && contentHeight * minimumScale < m_viewLayoutSize.height() && !shouldIgnoreHorizontalScalingConstraints())
+ minimumScale = m_viewLayoutSize.height() / contentHeight;
minimumScale = std::min(std::max(minimumScale, m_configuration.minimumScale), m_configuration.maximumScale);
@@ -382,13 +380,13 @@
void ViewportConfiguration::updateMinimumLayoutSize()
{
- if (!m_viewSize.width() || !shouldOverrideDeviceWidthWithMinDeviceWidth()) {
- m_minimumLayoutSize = m_viewSize;
+ if (!m_viewLayoutSize.width() || !shouldOverrideDeviceWidthWithMinDeviceWidth()) {
+ m_minimumLayoutSize = m_viewLayoutSize;
return;
}
auto minDeviceWidth = computedMinDeviceWidth(m_viewportArguments.minDeviceWidth);
- m_minimumLayoutSize = FloatSize(minDeviceWidth, std::roundf(m_viewSize.height() * (minDeviceWidth / m_viewSize.width())));
+ m_minimumLayoutSize = FloatSize(minDeviceWidth, std::roundf(m_viewLayoutSize.height() * (minDeviceWidth / m_viewLayoutSize.width())));
}
double ViewportConfiguration::viewportArgumentsLength(double length) const
Modified: trunk/Source/WebCore/page/ViewportConfiguration.h (231096 => 231097)
--- trunk/Source/WebCore/page/ViewportConfiguration.h 2018-04-27 15:40:16 UTC (rev 231096)
+++ trunk/Source/WebCore/page/ViewportConfiguration.h 2018-04-27 16:07:19 UTC (rev 231097)
@@ -74,10 +74,10 @@
const IntSize& contentsSize() const { return m_contentSize; }
WEBCORE_EXPORT bool setContentsSize(const IntSize&);
- FloatSize viewSize() const { return m_viewSize; }
+ FloatSize viewLayoutSize() const { return m_viewLayoutSize; }
const FloatSize& minimumLayoutSize() const { return m_minimumLayoutSize; }
- WEBCORE_EXPORT bool setMinimumLayoutSize(const FloatSize&);
+ WEBCORE_EXPORT bool setViewLayoutSize(const FloatSize&);
const ViewportArguments& viewportArguments() const { return m_viewportArguments; }
WEBCORE_EXPORT bool setViewportArguments(const ViewportArguments&);
@@ -127,7 +127,7 @@
Parameters m_defaultConfiguration;
IntSize m_contentSize;
FloatSize m_minimumLayoutSize;
- FloatSize m_viewSize;
+ FloatSize m_viewLayoutSize;
ViewportArguments m_viewportArguments;
bool m_canIgnoreScalingConstraints;
Modified: trunk/Source/WebKit/ChangeLog (231096 => 231097)
--- trunk/Source/WebKit/ChangeLog 2018-04-27 15:40:16 UTC (rev 231096)
+++ trunk/Source/WebKit/ChangeLog 2018-04-27 16:07:19 UTC (rev 231097)
@@ -1,5 +1,88 @@
2018-04-27 Wenson Hsieh <[email protected]>
+ Rename minimumLayoutSize to viewLayoutSize
+ https://bugs.webkit.org/show_bug.cgi?id=185050
+ <rdar://problem/39624038>
+
+ Reviewed by Tim Horton.
+
+ Renames minimumLayoutSize to viewLayoutSize, since the minimum layout size in ViewportConfiguration is now
+ different from the minimum layout size that is currently pushed down from the UI process (e.g. WKWebView SPI) in
+ the case where `min-device-width` is used to override the minimum layout size.
+
+ * Shared/WebPageCreationParameters.cpp:
+ (WebKit::WebPageCreationParameters::encode const):
+ (WebKit::WebPageCreationParameters::decode):
+ * Shared/WebPageCreationParameters.h:
+ * UIProcess/API/Cocoa/WKWebView.mm:
+ (-[WKWebView _processDidExit]):
+ (-[WKWebView activeViewLayoutSize:]):
+ (-[WKWebView _dispatchSetViewLayoutSize:]):
+ (-[WKWebView _frameOrBoundsChanged]):
+ (-[WKWebView _minimumLayoutSizeOverride]):
+ (-[WKWebView _setViewLayoutSizeOverride:]):
+ (-[WKWebView _beginAnimatedResizeWithUpdates:]):
+ (-[WKWebView _endAnimatedResize]):
+ (-[WKWebView _overrideLayoutParametersWithMinimumLayoutSize:maximumUnobscuredSizeOverride:]):
+ (-[WKWebView _clearOverrideLayoutParameters]):
+ (-[WKWebView _minimumLayoutWidth]):
+ (-[WKWebView _setMinimumLayoutWidth:]):
+ (-[WKWebView activeMinimumLayoutSize:]): Deleted.
+ (-[WKWebView _dispatchSetMinimumLayoutSize:]): Deleted.
+ (-[WKWebView _setMinimumLayoutSizeOverride:]): Deleted.
+ (-[WKWebView _overrideLayoutParametersWithMinimumLayoutSize:minimumLayoutSizeForMinimalUI:maximumUnobscuredSizeOverride:]): Deleted.
+
+ Remove unused SPI that has been deprecated since iOS 9, has a simple drop-in replacement, and no longer has any
+ internal clients.
+
+ * UIProcess/API/Cocoa/WKWebViewPrivate.h:
+ * UIProcess/Cocoa/WebViewImpl.mm:
+ (WebKit::WebViewImpl::setMinimumSizeForAutoLayout):
+ (WebKit::WebViewImpl::minimumSizeForAutoLayout const):
+ (WebKit::WebViewImpl::setIntrinsicContentSize):
+ * UIProcess/DrawingAreaProxy.h:
+ (WebKit::DrawingAreaProxy::viewLayoutSizeDidChange):
+ (WebKit::DrawingAreaProxy::minimumLayoutSizeDidChange): Deleted.
+ * UIProcess/WebPageProxy.cpp:
+ (WebKit::WebPageProxy::creationParameters):
+ (WebKit::WebPageProxy::setViewLayoutSize):
+ (WebKit::WebPageProxy::setMinimumLayoutSize): Deleted.
+ * UIProcess/WebPageProxy.h:
+ (WebKit::WebPageProxy::viewLayoutSize const):
+ (WebKit::WebPageProxy::minimumLayoutSize const): Deleted.
+ * UIProcess/ios/WebPageProxyIOS.mm:
+ (WebKit::WebPageProxy::dynamicViewportSizeUpdate):
+ (WebKit::WebPageProxy::setViewportConfigurationViewLayoutSize):
+ (WebKit::WebPageProxy::setViewportConfigurationMinimumLayoutSize): Deleted.
+ * UIProcess/mac/TiledCoreAnimationDrawingAreaProxy.h:
+ * UIProcess/mac/TiledCoreAnimationDrawingAreaProxy.mm:
+ (WebKit::TiledCoreAnimationDrawingAreaProxy::viewLayoutSizeDidChange):
+ (WebKit::TiledCoreAnimationDrawingAreaProxy::didUpdateGeometry):
+ (WebKit::TiledCoreAnimationDrawingAreaProxy::intrinsicContentSizeDidChange):
+ (WebKit::TiledCoreAnimationDrawingAreaProxy::willSendUpdateGeometry):
+ (WebKit::TiledCoreAnimationDrawingAreaProxy::minimumLayoutSizeDidChange): Deleted.
+ * WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp:
+ (WebKit::WebFrameLoaderClient::transitionToCommittedForNewPage):
+ * WebProcess/WebPage/ViewGestureGeometryCollector.cpp:
+ (WebKit::ViewGestureGeometryCollector::collectGeometryForSmartMagnificationGesture):
+ * WebProcess/WebPage/WebPage.cpp:
+ (WebKit::m_credentialsMessenger):
+ (WebKit::WebPage::setViewLayoutSize):
+ (WebKit::WebPage::setMinimumLayoutSize): Deleted.
+ * WebProcess/WebPage/WebPage.h:
+ (WebKit::WebPage::viewLayoutSize const):
+ (WebKit::WebPage::minimumLayoutSize const): Deleted.
+ * WebProcess/WebPage/WebPage.messages.in:
+ * WebProcess/WebPage/ios/WebPageIOS.mm:
+ (WebKit::WebPage::setViewportConfigurationViewLayoutSize):
+ (WebKit::WebPage::dynamicViewportSizeUpdate):
+ (WebKit::WebPage::setViewportConfigurationMinimumLayoutSize): Deleted.
+ * WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.mm:
+ (WebKit::TiledCoreAnimationDrawingArea::updateIntrinsicContentSizeIfNeeded):
+ (WebKit::TiledCoreAnimationDrawingArea::updateGeometry):
+
+2018-04-27 Wenson Hsieh <[email protected]>
+
[Extra zoom mode] Add a mechanism to override default viewport behaviors in extra zoom mode
https://bugs.webkit.org/show_bug.cgi?id=185050
<rdar://problem/39624038>
Modified: trunk/Source/WebKit/Shared/WebPageCreationParameters.cpp (231096 => 231097)
--- trunk/Source/WebKit/Shared/WebPageCreationParameters.cpp 2018-04-27 15:40:16 UTC (rev 231096)
+++ trunk/Source/WebKit/Shared/WebPageCreationParameters.cpp 2018-04-27 16:07:19 UTC (rev 231097)
@@ -64,7 +64,7 @@
encoder << mediaVolume;
encoder << muted;
encoder << mayStartMediaWhenInWindow;
- encoder << minimumLayoutSize;
+ encoder << viewLayoutSize;
encoder << autoSizingShouldExpandToViewHeight;
encoder << viewportSizeForCSSViewportUnits;
encoder.encodeEnum(scrollPinningBehavior);
@@ -89,7 +89,7 @@
encoder << overrideScreenSize;
encoder << textAutosizingWidth;
encoder << ignoresViewportScaleLimits;
- encoder << viewportConfigurationMinimumLayoutSize;
+ encoder << viewportConfigurationViewLayoutSize;
encoder << viewportConfigurationViewSize;
encoder << maximumUnobscuredSize;
#endif
@@ -203,7 +203,7 @@
return std::nullopt;
if (!decoder.decode(parameters.mayStartMediaWhenInWindow))
return std::nullopt;
- if (!decoder.decode(parameters.minimumLayoutSize))
+ if (!decoder.decode(parameters.viewLayoutSize))
return std::nullopt;
if (!decoder.decode(parameters.autoSizingShouldExpandToViewHeight))
return std::nullopt;
@@ -254,7 +254,7 @@
return std::nullopt;
if (!decoder.decode(parameters.ignoresViewportScaleLimits))
return std::nullopt;
- if (!decoder.decode(parameters.viewportConfigurationMinimumLayoutSize))
+ if (!decoder.decode(parameters.viewportConfigurationViewLayoutSize))
return std::nullopt;
if (!decoder.decode(parameters.viewportConfigurationViewSize))
return std::nullopt;
Modified: trunk/Source/WebKit/Shared/WebPageCreationParameters.h (231096 => 231097)
--- trunk/Source/WebKit/Shared/WebPageCreationParameters.h 2018-04-27 15:40:16 UTC (rev 231096)
+++ trunk/Source/WebKit/Shared/WebPageCreationParameters.h 2018-04-27 16:07:19 UTC (rev 231097)
@@ -112,7 +112,7 @@
WebCore::MediaProducer::MutedStateFlags muted;
bool mayStartMediaWhenInWindow;
- WebCore::IntSize minimumLayoutSize;
+ WebCore::IntSize viewLayoutSize;
bool autoSizingShouldExpandToViewHeight;
std::optional<WebCore::IntSize> viewportSizeForCSSViewportUnits;
@@ -146,7 +146,7 @@
WebCore::FloatSize overrideScreenSize;
float textAutosizingWidth;
bool ignoresViewportScaleLimits;
- WebCore::FloatSize viewportConfigurationMinimumLayoutSize;
+ WebCore::FloatSize viewportConfigurationViewLayoutSize;
WebCore::FloatSize viewportConfigurationViewSize;
WebCore::FloatSize maximumUnobscuredSize;
#endif
Modified: trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebView.mm (231096 => 231097)
--- trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebView.mm 2018-04-27 15:40:16 UTC (rev 231096)
+++ trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebView.mm 2018-04-27 16:07:19 UTC (rev 231097)
@@ -277,9 +277,9 @@
RetainPtr<WKFullScreenWindowController> _fullScreenWindowController;
#endif
- BOOL _overridesMinimumLayoutSize;
- CGSize _minimumLayoutSizeOverride;
- std::optional<WebCore::FloatSize> _lastSentMinimumLayoutSize;
+ BOOL _overridesViewLayoutSize;
+ CGSize _viewLayoutSizeOverride;
+ std::optional<WebCore::FloatSize> _lastSentViewLayoutSize;
BOOL _overridesMaximumUnobscuredSize;
CGSize _maximumUnobscuredSizeOverride;
std::optional<WebCore::FloatSize> _lastSentMaximumUnobscuredSize;
@@ -1683,7 +1683,7 @@
_scrollViewBackgroundColor = WebCore::Color();
_delayUpdateVisibleContentRects = NO;
_hadDelayedUpdateVisibleContentRects = NO;
- _lastSentMinimumLayoutSize = std::nullopt;
+ _lastSentViewLayoutSize = std::nullopt;
_lastSentMaximumUnobscuredSize = std::nullopt;
_lastSentDeviceOrientation = std::nullopt;
@@ -2564,10 +2564,10 @@
return UIEdgeInsetsAdd([_scrollView _contentScrollInset], self.safeAreaInsets, [_scrollView _edgesApplyingSafeAreaInsetsToContentInset]);
}
-- (WebCore::FloatSize)activeMinimumLayoutSize:(const CGRect&)bounds
+- (WebCore::FloatSize)activeViewLayoutSize:(const CGRect&)bounds
{
- if (_overridesMinimumLayoutSize)
- return WebCore::FloatSize(_minimumLayoutSizeOverride);
+ if (_overridesViewLayoutSize)
+ return WebCore::FloatSize(_viewLayoutSizeOverride);
#if __IPHONE_OS_VERSION_MIN_REQUIRED >= 110000
return WebCore::FloatSize(UIEdgeInsetsInsetRect(CGRectMake(0, 0, bounds.size.width, bounds.size.height), self._scrollViewSystemContentInset).size);
@@ -2576,14 +2576,14 @@
#endif
}
-- (void)_dispatchSetMinimumLayoutSize:(WebCore::FloatSize)minimumLayoutSize
+- (void)_dispatchSetViewLayoutSize:(WebCore::FloatSize)viewLayoutSize
{
- if (_lastSentMinimumLayoutSize && CGSizeEqualToSize(_lastSentMinimumLayoutSize.value(), minimumLayoutSize))
+ if (_lastSentViewLayoutSize && CGSizeEqualToSize(_lastSentViewLayoutSize.value(), viewLayoutSize))
return;
- LOG_WITH_STREAM(VisibleRects, stream << "-[WKWebView " << _page->pageID() << " _dispatchSetMinimumLayoutSize:] " << minimumLayoutSize << " contentZoomScale " << contentZoomScale(self));
- _page->setViewportConfigurationMinimumLayoutSize(minimumLayoutSize);
- _lastSentMinimumLayoutSize = minimumLayoutSize;
+ LOG_WITH_STREAM(VisibleRects, stream << "-[WKWebView " << _page->pageID() << " _dispatchSetViewLayoutSize:] " << viewLayoutSize << " contentZoomScale " << contentZoomScale(self));
+ _page->setViewportConfigurationViewLayoutSize(viewLayoutSize);
+ _lastSentViewLayoutSize = viewLayoutSize;
}
- (void)_dispatchSetMaximumUnobscuredSize:(WebCore::FloatSize)maximumUnobscuredSize
@@ -2610,8 +2610,8 @@
[_scrollView setFrame:bounds];
if (_dynamicViewportUpdateMode == DynamicViewportUpdateMode::NotResizing) {
- if (!_overridesMinimumLayoutSize)
- [self _dispatchSetMinimumLayoutSize:[self activeMinimumLayoutSize:self.bounds]];
+ if (!_overridesViewLayoutSize)
+ [self _dispatchSetViewLayoutSize:[self activeViewLayoutSize:self.bounds]];
if (!_overridesMaximumUnobscuredSize)
[self _dispatchSetMaximumUnobscuredSize:WebCore::FloatSize(bounds.size)];
@@ -4987,17 +4987,17 @@
- (CGSize)_minimumLayoutSizeOverride
{
- ASSERT(_overridesMinimumLayoutSize);
- return _minimumLayoutSizeOverride;
+ ASSERT(_overridesViewLayoutSize);
+ return _viewLayoutSizeOverride;
}
-- (void)_setMinimumLayoutSizeOverride:(CGSize)minimumLayoutSizeOverride
+- (void)_setViewLayoutSizeOverride:(CGSize)viewLayoutSizeOverride
{
- _overridesMinimumLayoutSize = YES;
- _minimumLayoutSizeOverride = minimumLayoutSizeOverride;
+ _overridesViewLayoutSize = YES;
+ _viewLayoutSizeOverride = viewLayoutSizeOverride;
if (_dynamicViewportUpdateMode == DynamicViewportUpdateMode::NotResizing)
- [self _dispatchSetMinimumLayoutSize:WebCore::FloatSize(minimumLayoutSizeOverride)];
+ [self _dispatchSetViewLayoutSize:WebCore::FloatSize(viewLayoutSizeOverride)];
}
@@ -5145,7 +5145,7 @@
_dynamicViewportUpdateMode = DynamicViewportUpdateMode::ResizingWithAnimation;
- auto oldMinimumLayoutSize = [self activeMinimumLayoutSize:self.bounds];
+ auto oldViewLayoutSize = [self activeViewLayoutSize:self.bounds];
auto oldMaximumUnobscuredSize = activeMaximumUnobscuredSize(self, oldBounds);
int32_t oldOrientation = activeOrientation(self);
UIEdgeInsets oldObscuredInsets = _obscuredInsets;
@@ -5153,7 +5153,7 @@
updateBlock();
CGRect newBounds = self.bounds;
- auto newMinimumLayoutSize = [self activeMinimumLayoutSize:newBounds];
+ auto newViewLayoutSize = [self activeViewLayoutSize:newBounds];
auto newMaximumUnobscuredSize = activeMaximumUnobscuredSize(self, newBounds);
int32_t newOrientation = activeOrientation(self);
UIEdgeInsets newObscuredInsets = _obscuredInsets;
@@ -5160,12 +5160,12 @@
CGRect futureUnobscuredRectInSelfCoordinates = UIEdgeInsetsInsetRect(newBounds, _obscuredInsets);
CGRect contentViewBounds = [_contentView bounds];
- ASSERT_WITH_MESSAGE(!(_overridesMinimumLayoutSize && newMinimumLayoutSize.isEmpty()), "Clients controlling the layout size should maintain a valid layout size to minimize layouts.");
- if (CGRectIsEmpty(newBounds) || newMinimumLayoutSize.isEmpty() || CGRectIsEmpty(futureUnobscuredRectInSelfCoordinates) || CGRectIsEmpty(contentViewBounds)) {
+ ASSERT_WITH_MESSAGE(!(_overridesViewLayoutSize && newViewLayoutSize.isEmpty()), "Clients controlling the layout size should maintain a valid layout size to minimize layouts.");
+ if (CGRectIsEmpty(newBounds) || newViewLayoutSize.isEmpty() || CGRectIsEmpty(futureUnobscuredRectInSelfCoordinates) || CGRectIsEmpty(contentViewBounds)) {
_dynamicViewportUpdateMode = DynamicViewportUpdateMode::NotResizing;
[self _frameOrBoundsChanged];
- if (_overridesMinimumLayoutSize)
- [self _dispatchSetMinimumLayoutSize:newMinimumLayoutSize];
+ if (_overridesViewLayoutSize)
+ [self _dispatchSetViewLayoutSize:newViewLayoutSize];
if (_overridesMaximumUnobscuredSize)
[self _dispatchSetMaximumUnobscuredSize:WebCore::FloatSize(newMaximumUnobscuredSize)];
if (_overridesInterfaceOrientation)
@@ -5176,7 +5176,7 @@
}
if (CGRectEqualToRect(oldBounds, newBounds)
- && oldMinimumLayoutSize == newMinimumLayoutSize
+ && oldViewLayoutSize == newViewLayoutSize
&& oldMaximumUnobscuredSize == newMaximumUnobscuredSize
&& oldOrientation == newOrientation
&& UIEdgeInsetsEqualToEdgeInsets(oldObscuredInsets, newObscuredInsets)) {
@@ -5196,13 +5196,13 @@
[_resizeAnimationView addSubview:[_contentView unscaledView]];
CGSize contentSizeInContentViewCoordinates = contentViewBounds.size;
- [_scrollView setMinimumZoomScale:std::min(newMinimumLayoutSize.width() / contentSizeInContentViewCoordinates.width, [_scrollView minimumZoomScale])];
- [_scrollView setMaximumZoomScale:std::max(newMinimumLayoutSize.width() / contentSizeInContentViewCoordinates.width, [_scrollView maximumZoomScale])];
+ [_scrollView setMinimumZoomScale:std::min(newViewLayoutSize.width() / contentSizeInContentViewCoordinates.width, [_scrollView minimumZoomScale])];
+ [_scrollView setMaximumZoomScale:std::max(newViewLayoutSize.width() / contentSizeInContentViewCoordinates.width, [_scrollView maximumZoomScale])];
// Compute the new scale to keep the current content width in the scrollview.
CGFloat oldWebViewWidthInContentViewCoordinates = oldUnobscuredContentRect.width();
CGFloat visibleContentViewWidthInContentCoordinates = std::min(contentSizeInContentViewCoordinates.width, oldWebViewWidthInContentViewCoordinates);
- CGFloat targetScale = newMinimumLayoutSize.width() / visibleContentViewWidthInContentCoordinates;
+ CGFloat targetScale = newViewLayoutSize.width() / visibleContentViewWidthInContentCoordinates;
CGFloat resizeAnimationViewAnimationScale = targetScale / contentZoomScale(self);
[_resizeAnimationView setTransform:CGAffineTransformMakeScale(resizeAnimationViewAnimationScale, resizeAnimationViewAnimationScale)];
@@ -5242,11 +5242,11 @@
UIEdgeInsets unobscuredSafeAreaInsets = [self _computedUnobscuredSafeAreaInset];
WebCore::FloatBoxExtent unobscuredSafeAreaInsetsExtent(unobscuredSafeAreaInsets.top, unobscuredSafeAreaInsets.right, unobscuredSafeAreaInsets.bottom, unobscuredSafeAreaInsets.left);
- _lastSentMinimumLayoutSize = newMinimumLayoutSize;
+ _lastSentViewLayoutSize = newViewLayoutSize;
_lastSentMaximumUnobscuredSize = newMaximumUnobscuredSize;
_lastSentDeviceOrientation = newOrientation;
- _page->dynamicViewportSizeUpdate(newMinimumLayoutSize, newMaximumUnobscuredSize, visibleRectInContentCoordinates, unobscuredRectInContentCoordinates, futureUnobscuredRectInSelfCoordinates, unobscuredSafeAreaInsetsExtent, targetScale, newOrientation);
+ _page->dynamicViewportSizeUpdate(newViewLayoutSize, newMaximumUnobscuredSize, visibleRectInContentCoordinates, unobscuredRectInContentCoordinates, futureUnobscuredRectInSelfCoordinates, unobscuredSafeAreaInsetsExtent, targetScale, newOrientation);
if (WebKit::DrawingAreaProxy* drawingArea = _page->drawingArea())
drawingArea->setSize(WebCore::IntSize(newBounds.size));
}
@@ -5311,12 +5311,12 @@
[self _scheduleVisibleContentRectUpdate];
CGRect newBounds = self.bounds;
- auto newMinimumLayoutSize = [self activeMinimumLayoutSize:newBounds];
+ auto newViewLayoutSize = [self activeViewLayoutSize:newBounds];
auto newMaximumUnobscuredSize = activeMaximumUnobscuredSize(self, newBounds);
int32_t newOrientation = activeOrientation(self);
- if (!_lastSentMinimumLayoutSize || newMinimumLayoutSize != _lastSentMinimumLayoutSize.value())
- [self _dispatchSetMinimumLayoutSize:newMinimumLayoutSize];
+ if (!_lastSentViewLayoutSize || newViewLayoutSize != _lastSentViewLayoutSize.value())
+ [self _dispatchSetViewLayoutSize:newViewLayoutSize];
if (!_lastSentMaximumUnobscuredSize || newMaximumUnobscuredSize != _lastSentMaximumUnobscuredSize.value())
[self _dispatchSetMaximumUnobscuredSize:WebCore::FloatSize(newMaximumUnobscuredSize)];
if (!_lastSentDeviceOrientation || newOrientation != _lastSentDeviceOrientation.value())
@@ -5417,22 +5417,16 @@
});
}
-- (void)_overrideLayoutParametersWithMinimumLayoutSize:(CGSize)minimumLayoutSize minimumLayoutSizeForMinimalUI:(CGSize)minimumLayoutSizeForMinimalUI maximumUnobscuredSizeOverride:(CGSize)maximumUnobscuredSizeOverride
-{
- UNUSED_PARAM(minimumLayoutSizeForMinimalUI);
- [self _overrideLayoutParametersWithMinimumLayoutSize:minimumLayoutSize maximumUnobscuredSizeOverride:maximumUnobscuredSizeOverride];
-}
-
- (void)_overrideLayoutParametersWithMinimumLayoutSize:(CGSize)minimumLayoutSize maximumUnobscuredSizeOverride:(CGSize)maximumUnobscuredSizeOverride
{
- [self _setMinimumLayoutSizeOverride:minimumLayoutSize];
+ [self _setViewLayoutSizeOverride:minimumLayoutSize];
[self _setMaximumUnobscuredSizeOverride:maximumUnobscuredSizeOverride];
}
- (void)_clearOverrideLayoutParameters
{
- _overridesMinimumLayoutSize = NO;
- _minimumLayoutSizeOverride = CGSizeZero;
+ _overridesViewLayoutSize = NO;
+ _viewLayoutSizeOverride = CGSizeZero;
_overridesMaximumUnobscuredSize = NO;
_maximumUnobscuredSizeOverride = CGSizeZero;
@@ -5622,7 +5616,7 @@
- (CGFloat)_minimumLayoutWidth
{
- return _page->minimumLayoutSize().width();
+ return _page->viewLayoutSize().width();
}
- (void)_setMinimumLayoutWidth:(CGFloat)width
@@ -5629,7 +5623,7 @@
{
BOOL expandsToFit = width > 0;
- _page->setMinimumLayoutSize(WebCore::IntSize(width, 0));
+ _page->setViewLayoutSize(WebCore::IntSize(width, 0));
_page->setMainFrameIsScrollable(!expandsToFit);
_impl->setClipsToVisibleRect(expandsToFit);
Modified: trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebViewPrivate.h (231096 => 231097)
--- trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebViewPrivate.h 2018-04-27 15:40:16 UTC (rev 231096)
+++ trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebViewPrivate.h 2018-04-27 16:07:19 UTC (rev 231097)
@@ -225,10 +225,6 @@
- (void)_snapshotRect:(CGRect)rectInViewCoordinates intoImageOfWidth:(CGFloat)imageWidth completionHandler:(void(^)(CGImageRef))completionHandler;
-// Deprecated: Use [_overrideLayoutParametersWithMinimumLayoutSize:maximumUnobscuredSizeOverride:] instead.
-// This function is kept for binary compatibility with iOS 8.0, it can be removed after the bincompat window.
-- (void)_overrideLayoutParametersWithMinimumLayoutSize:(CGSize)minimumLayoutSize minimumLayoutSizeForMinimalUI:(CGSize)minimumLayoutSizeForMinimalUI maximumUnobscuredSizeOverride:(CGSize)maximumUnobscuredSizeOverride WK_API_DEPRECATED_WITH_REPLACEMENT("-_overrideLayoutParametersWithMinimumLayoutSize:maximumUnobscuredSizeOverride:", ios(8.0, 9.0));
-
- (void)_overrideLayoutParametersWithMinimumLayoutSize:(CGSize)minimumLayoutSize maximumUnobscuredSizeOverride:(CGSize)maximumUnobscuredSizeOverride WK_API_AVAILABLE(ios(9_0));
- (void)_clearOverrideLayoutParameters WK_API_AVAILABLE(ios(11.0));
Modified: trunk/Source/WebKit/UIProcess/Cocoa/WebViewImpl.mm (231096 => 231097)
--- trunk/Source/WebKit/UIProcess/Cocoa/WebViewImpl.mm 2018-04-27 15:40:16 UTC (rev 231096)
+++ trunk/Source/WebKit/UIProcess/Cocoa/WebViewImpl.mm 2018-04-27 16:07:19 UTC (rev 231097)
@@ -1745,7 +1745,7 @@
{
bool expandsToFit = minimumSizeForAutoLayout.width > 0;
- m_page->setMinimumLayoutSize(WebCore::IntSize(minimumSizeForAutoLayout));
+ m_page->setViewLayoutSize(WebCore::IntSize(minimumSizeForAutoLayout));
m_page->setMainFrameIsScrollable(!expandsToFit);
setClipsToVisibleRect(expandsToFit);
@@ -1753,7 +1753,7 @@
CGSize WebViewImpl::minimumSizeForAutoLayout() const
{
- return m_page->minimumLayoutSize();
+ return m_page->viewLayoutSize();
}
void WebViewImpl::setShouldExpandToViewHeightForAutoLayout(bool shouldExpandToViewHeightForAutoLayout)
@@ -1773,7 +1773,7 @@
// so that autolayout will know to provide space for us.
CGSize intrinsicContentSizeAcknowledgingFlexibleWidth = intrinsicContentSize;
- if (intrinsicContentSize.width < m_page->minimumLayoutSize().width())
+ if (intrinsicContentSize.width < m_page->viewLayoutSize().width())
intrinsicContentSizeAcknowledgingFlexibleWidth.width = NSViewNoIntrinsicMetric;
m_intrinsicContentSize = intrinsicContentSizeAcknowledgingFlexibleWidth;
Modified: trunk/Source/WebKit/UIProcess/DrawingAreaProxy.h (231096 => 231097)
--- trunk/Source/WebKit/UIProcess/DrawingAreaProxy.h 2018-04-27 15:40:16 UTC (rev 231096)
+++ trunk/Source/WebKit/UIProcess/DrawingAreaProxy.h 2018-04-27 16:07:19 UTC (rev 231097)
@@ -71,7 +71,7 @@
static constexpr Seconds didUpdateBackingStoreStateTimeout() { return Seconds::fromMilliseconds(500); }
virtual void colorSpaceDidChange() { }
- virtual void minimumLayoutSizeDidChange() { }
+ virtual void viewLayoutSizeDidChange() { }
virtual void adjustTransientZoom(double, WebCore::FloatPoint) { }
virtual void commitTransientZoom(double, WebCore::FloatPoint) { }
Modified: trunk/Source/WebKit/UIProcess/WebPageProxy.cpp (231096 => 231097)
--- trunk/Source/WebKit/UIProcess/WebPageProxy.cpp 2018-04-27 15:40:16 UTC (rev 231096)
+++ trunk/Source/WebKit/UIProcess/WebPageProxy.cpp 2018-04-27 16:07:19 UTC (rev 231097)
@@ -6032,7 +6032,7 @@
parameters.mediaVolume = m_mediaVolume;
parameters.muted = m_mutedState;
parameters.mayStartMediaWhenInWindow = m_mayStartMediaWhenInWindow;
- parameters.minimumLayoutSize = m_minimumLayoutSize;
+ parameters.viewLayoutSize = m_viewLayoutSize;
parameters.autoSizingShouldExpandToViewHeight = m_autoSizingShouldExpandToViewHeight;
parameters.viewportSizeForCSSViewportUnits = m_viewportSizeForCSSViewportUnits;
parameters.scrollPinningBehavior = m_scrollPinningBehavior;
@@ -6059,7 +6059,7 @@
parameters.textAutosizingWidth = textAutosizingWidth();
parameters.mimeTypesWithCustomContentProviders = m_pageClient.mimeTypesWithCustomContentProviders();
parameters.ignoresViewportScaleLimits = m_forceAlwaysUserScalable;
- parameters.viewportConfigurationMinimumLayoutSize = m_viewportConfigurationMinimumLayoutSize;
+ parameters.viewportConfigurationViewLayoutSize = m_viewportConfigurationViewLayoutSize;
parameters.maximumUnobscuredSize = m_maximumUnobscuredSize;
#endif
@@ -6549,21 +6549,21 @@
API::Data::create(dataReference.data(), dataReference.size()).get());
}
-void WebPageProxy::setMinimumLayoutSize(const IntSize& minimumLayoutSize)
+void WebPageProxy::setViewLayoutSize(const IntSize& viewLayoutSize)
{
- if (m_minimumLayoutSize == minimumLayoutSize)
+ if (m_viewLayoutSize == viewLayoutSize)
return;
- m_minimumLayoutSize = minimumLayoutSize;
+ m_viewLayoutSize = viewLayoutSize;
if (!isValid())
return;
- m_process->send(Messages::WebPage::SetMinimumLayoutSize(minimumLayoutSize), m_pageID);
- m_drawingArea->minimumLayoutSizeDidChange();
+ m_process->send(Messages::WebPage::SetViewLayoutSize(viewLayoutSize), m_pageID);
+ m_drawingArea->viewLayoutSizeDidChange();
#if USE(APPKIT)
- if (m_minimumLayoutSize.width() <= 0)
+ if (m_viewLayoutSize.width() <= 0)
intrinsicContentSizeDidChange(IntSize(-1, -1));
#endif
}
Modified: trunk/Source/WebKit/UIProcess/WebPageProxy.h (231096 => 231097)
--- trunk/Source/WebKit/UIProcess/WebPageProxy.h 2018-04-27 15:40:16 UTC (rev 231096)
+++ trunk/Source/WebKit/UIProcess/WebPageProxy.h 2018-04-27 16:07:19 UTC (rev 231097)
@@ -545,10 +545,10 @@
void overflowScrollWillStartScroll();
void overflowScrollDidEndScroll();
- void dynamicViewportSizeUpdate(const WebCore::FloatSize& minimumLayoutSize, const WebCore::FloatSize& maximumUnobscuredSize, const WebCore::FloatRect& targetExposedContentRect, const WebCore::FloatRect& targetUnobscuredRect, const WebCore::FloatRect& targetUnobscuredRectInScrollViewCoordinates, const WebCore::FloatBoxExtent& unobscuredSafeAreaInsets, double targetScale, int32_t deviceOrientation);
+ void dynamicViewportSizeUpdate(const WebCore::FloatSize& viewLayoutSize, const WebCore::FloatSize& maximumUnobscuredSize, const WebCore::FloatRect& targetExposedContentRect, const WebCore::FloatRect& targetUnobscuredRect, const WebCore::FloatRect& targetUnobscuredRectInScrollViewCoordinates, const WebCore::FloatBoxExtent& unobscuredSafeAreaInsets, double targetScale, int32_t deviceOrientation);
void synchronizeDynamicViewportUpdate();
- void setViewportConfigurationMinimumLayoutSize(const WebCore::FloatSize&);
+ void setViewportConfigurationViewLayoutSize(const WebCore::FloatSize&);
void setMaximumUnobscuredSize(const WebCore::FloatSize&);
void setDeviceOrientation(int32_t);
int32_t deviceOrientation() const { return m_deviceOrientation; }
@@ -1076,8 +1076,8 @@
void endColorPicker();
#endif
- WebCore::IntSize minimumLayoutSize() const { return m_minimumLayoutSize; }
- void setMinimumLayoutSize(const WebCore::IntSize&);
+ WebCore::IntSize viewLayoutSize() const { return m_viewLayoutSize; }
+ void setViewLayoutSize(const WebCore::IntSize&);
bool autoSizingShouldExpandToViewHeight() const { return m_autoSizingShouldExpandToViewHeight; }
void setAutoSizingShouldExpandToViewHeight(bool);
@@ -2075,7 +2075,7 @@
bool m_suppressVisibilityUpdates { false };
bool m_autoSizingShouldExpandToViewHeight { false };
- WebCore::IntSize m_minimumLayoutSize;
+ WebCore::IntSize m_viewLayoutSize;
std::optional<WebCore::IntSize> m_viewportSizeForCSSViewportUnits;
// Visual viewports
@@ -2134,7 +2134,7 @@
#if PLATFORM(IOS)
std::unique_ptr<NodeAssistanceArguments> m_deferredNodeAssistanceArguments;
bool m_forceAlwaysUserScalable { false };
- WebCore::FloatSize m_viewportConfigurationMinimumLayoutSize;
+ WebCore::FloatSize m_viewportConfigurationViewLayoutSize;
WebCore::FloatSize m_maximumUnobscuredSize;
#endif
Modified: trunk/Source/WebKit/UIProcess/ios/WebPageProxyIOS.mm (231096 => 231097)
--- trunk/Source/WebKit/UIProcess/ios/WebPageProxyIOS.mm 2018-04-27 15:40:16 UTC (rev 231096)
+++ trunk/Source/WebKit/UIProcess/ios/WebPageProxyIOS.mm 2018-04-27 16:07:19 UTC (rev 231097)
@@ -305,7 +305,7 @@
m_pageClient.overflowScrollDidEndScroll();
}
-void WebPageProxy::dynamicViewportSizeUpdate(const FloatSize& minimumLayoutSize, const WebCore::FloatSize& maximumUnobscuredSize, const FloatRect& targetExposedContentRect, const FloatRect& targetUnobscuredRect, const FloatRect& targetUnobscuredRectInScrollViewCoordinates, const WebCore::FloatBoxExtent& unobscuredSafeAreaInsets, double targetScale, int32_t deviceOrientation)
+void WebPageProxy::dynamicViewportSizeUpdate(const FloatSize& viewLayoutSize, const WebCore::FloatSize& maximumUnobscuredSize, const FloatRect& targetExposedContentRect, const FloatRect& targetUnobscuredRect, const FloatRect& targetUnobscuredRectInScrollViewCoordinates, const WebCore::FloatBoxExtent& unobscuredSafeAreaInsets, double targetScale, int32_t deviceOrientation)
{
if (!isValid())
return;
@@ -314,7 +314,7 @@
m_dynamicViewportSizeUpdateWaitingForTarget = true;
m_dynamicViewportSizeUpdateWaitingForLayerTreeCommit = true;
- m_process->send(Messages::WebPage::DynamicViewportSizeUpdate(minimumLayoutSize, maximumUnobscuredSize, targetExposedContentRect, targetUnobscuredRect, targetUnobscuredRectInScrollViewCoordinates, unobscuredSafeAreaInsets, targetScale, deviceOrientation, ++m_currentDynamicViewportSizeUpdateID), m_pageID);
+ m_process->send(Messages::WebPage::DynamicViewportSizeUpdate(viewLayoutSize, maximumUnobscuredSize, targetExposedContentRect, targetUnobscuredRect, targetUnobscuredRectInScrollViewCoordinates, unobscuredSafeAreaInsets, targetScale, deviceOrientation, ++m_currentDynamicViewportSizeUpdateID), m_pageID);
}
void WebPageProxy::synchronizeDynamicViewportUpdate()
@@ -354,12 +354,12 @@
m_dynamicViewportSizeUpdateWaitingForLayerTreeCommit = false;
}
-void WebPageProxy::setViewportConfigurationMinimumLayoutSize(const WebCore::FloatSize& size)
+void WebPageProxy::setViewportConfigurationViewLayoutSize(const WebCore::FloatSize& size)
{
- m_viewportConfigurationMinimumLayoutSize = size;
+ m_viewportConfigurationViewLayoutSize = size;
if (isValid())
- m_process->send(Messages::WebPage::SetViewportConfigurationMinimumLayoutSize(size), m_pageID);
+ m_process->send(Messages::WebPage::SetViewportConfigurationViewLayoutSize(size), m_pageID);
}
void WebPageProxy::setForceAlwaysUserScalable(bool userScalable)
Modified: trunk/Source/WebKit/UIProcess/mac/TiledCoreAnimationDrawingAreaProxy.h (231096 => 231097)
--- trunk/Source/WebKit/UIProcess/mac/TiledCoreAnimationDrawingAreaProxy.h 2018-04-27 15:40:16 UTC (rev 231096)
+++ trunk/Source/WebKit/UIProcess/mac/TiledCoreAnimationDrawingAreaProxy.h 2018-04-27 16:07:19 UTC (rev 231097)
@@ -41,7 +41,7 @@
void deviceScaleFactorDidChange() override;
void sizeDidChange() override;
void colorSpaceDidChange() override;
- void minimumLayoutSizeDidChange() override;
+ void viewLayoutSizeDidChange() override;
void enterAcceleratedCompositingMode(uint64_t backingStoreStateID, const LayerTreeContext&) override;
void exitAcceleratedCompositingMode(uint64_t backingStoreStateID, const UpdateInfo&) override;
@@ -71,7 +71,7 @@
WebCore::IntSize m_lastSentSize;
// The last minimum layout size we sent to the web process.
- WebCore::IntSize m_lastSentMinimumLayoutSize;
+ WebCore::IntSize m_lastSentViewLayoutSize;
CallbackMap m_callbacks;
};
Modified: trunk/Source/WebKit/UIProcess/mac/TiledCoreAnimationDrawingAreaProxy.mm (231096 => 231097)
--- trunk/Source/WebKit/UIProcess/mac/TiledCoreAnimationDrawingAreaProxy.mm 2018-04-27 15:40:16 UTC (rev 231096)
+++ trunk/Source/WebKit/UIProcess/mac/TiledCoreAnimationDrawingAreaProxy.mm 2018-04-27 16:07:19 UTC (rev 231097)
@@ -77,7 +77,7 @@
m_webPageProxy.process().send(Messages::DrawingArea::SetColorSpace(m_webPageProxy.colorSpace()), m_webPageProxy.pageID());
}
-void TiledCoreAnimationDrawingAreaProxy::minimumLayoutSizeDidChange()
+void TiledCoreAnimationDrawingAreaProxy::viewLayoutSizeDidChange()
{
if (!m_webPageProxy.isValid())
return;
@@ -112,11 +112,11 @@
m_isWaitingForDidUpdateGeometry = false;
- IntSize minimumLayoutSize = m_webPageProxy.minimumLayoutSize();
+ IntSize viewLayoutSize = m_webPageProxy.viewLayoutSize();
// If the WKView was resized while we were waiting for a DidUpdateGeometry reply from the web process,
// we need to resend the new size here.
- if (m_lastSentSize != m_size || m_lastSentMinimumLayoutSize != minimumLayoutSize)
+ if (m_lastSentSize != m_size || m_lastSentViewLayoutSize != viewLayoutSize)
sendUpdateGeometry();
}
@@ -128,13 +128,13 @@
void TiledCoreAnimationDrawingAreaProxy::intrinsicContentSizeDidChange(const IntSize& newIntrinsicContentSize)
{
- if (m_webPageProxy.minimumLayoutSize().width() > 0)
+ if (m_webPageProxy.viewLayoutSize().width() > 0)
m_webPageProxy.intrinsicContentSizeDidChange(newIntrinsicContentSize);
}
void TiledCoreAnimationDrawingAreaProxy::willSendUpdateGeometry()
{
- m_lastSentMinimumLayoutSize = m_webPageProxy.minimumLayoutSize();
+ m_lastSentViewLayoutSize = m_webPageProxy.viewLayoutSize();
m_lastSentSize = m_size;
m_isWaitingForDidUpdateGeometry = true;
}
Modified: trunk/Source/WebKit/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp (231096 => 231097)
--- trunk/Source/WebKit/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp 2018-04-27 15:40:16 UTC (rev 231096)
+++ trunk/Source/WebKit/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp 2018-04-27 16:07:19 UTC (rev 231097)
@@ -1420,10 +1420,10 @@
webPage->fixedLayoutSize(), fixedVisibleContentRect, shouldUseFixedLayout,
horizontalScrollbarMode, horizontalLock, verticalScrollbarMode, verticalLock);
- if (int minimumLayoutWidth = webPage->minimumLayoutSize().width()) {
- int minimumLayoutHeight = std::max(webPage->minimumLayoutSize().height(), 1);
+ if (int viewLayoutWidth = webPage->viewLayoutSize().width()) {
+ int viewLayoutHeight = std::max(webPage->viewLayoutSize().height(), 1);
int maximumSize = std::numeric_limits<int>::max();
- m_frame->coreFrame()->view()->enableAutoSizeMode(true, IntSize(minimumLayoutWidth, minimumLayoutHeight), IntSize(maximumSize, maximumSize));
+ m_frame->coreFrame()->view()->enableAutoSizeMode(true, IntSize(viewLayoutWidth, viewLayoutHeight), IntSize(maximumSize, maximumSize));
if (webPage->autoSizingShouldExpandToViewHeight())
m_frame->coreFrame()->view()->setAutoSizeFixedMinimumHeight(webPage->size().height());
Modified: trunk/Source/WebKit/WebProcess/WebPage/ViewGestureGeometryCollector.cpp (231096 => 231097)
--- trunk/Source/WebKit/WebProcess/WebPage/ViewGestureGeometryCollector.cpp 2018-04-27 15:40:16 UTC (rev 231096)
+++ trunk/Source/WebKit/WebProcess/WebPage/ViewGestureGeometryCollector.cpp 2018-04-27 16:07:19 UTC (rev 231097)
@@ -106,7 +106,7 @@
targetScale = textLegibilityScales->second;
FloatRect targetRectInContentCoordinates { origin, FloatSize() };
- targetRectInContentCoordinates.inflate(m_webPage.viewportConfiguration().viewSize() / (2 * targetScale));
+ targetRectInContentCoordinates.inflate(m_webPage.viewportConfiguration().viewLayoutSize() / (2 * targetScale));
dispatchDidCollectGeometryForSmartMagnificationGesture(origin, targetRectInContentCoordinates, visibleContentRect, true, viewportMinimumScale, viewportMaximumScale);
return;
Modified: trunk/Source/WebKit/WebProcess/WebPage/WebPage.cpp (231096 => 231097)
--- trunk/Source/WebKit/WebProcess/WebPage/WebPage.cpp 2018-04-27 15:40:16 UTC (rev 231096)
+++ trunk/Source/WebKit/WebProcess/WebPage/WebPage.cpp 2018-04-27 16:07:19 UTC (rev 231097)
@@ -510,7 +510,7 @@
updateIsInWindow(true);
- setMinimumLayoutSize(parameters.minimumLayoutSize);
+ setViewLayoutSize(parameters.viewLayoutSize);
setAutoSizingShouldExpandToViewHeight(parameters.autoSizingShouldExpandToViewHeight);
setViewportSizeForCSSViewportUnits(parameters.viewportSizeForCSSViewportUnits);
@@ -612,7 +612,7 @@
#endif
#if PLATFORM(IOS)
- setViewportConfigurationMinimumLayoutSize(parameters.viewportConfigurationMinimumLayoutSize);
+ setViewportConfigurationViewLayoutSize(parameters.viewportConfigurationViewLayoutSize);
setMaximumUnobscuredSize(parameters.maximumUnobscuredSize);
#endif
}
@@ -4997,23 +4997,23 @@
view->setVerticalScrollbarMode(alwaysShowsVerticalScroller ? ScrollbarAlwaysOn : m_mainFrameIsScrollable ? ScrollbarAuto : ScrollbarAlwaysOff, alwaysShowsVerticalScroller || !m_mainFrameIsScrollable);
}
-void WebPage::setMinimumLayoutSize(const IntSize& minimumLayoutSize)
+void WebPage::setViewLayoutSize(const IntSize& viewLayoutSize)
{
- if (m_minimumLayoutSize == minimumLayoutSize)
+ if (m_viewLayoutSize == viewLayoutSize)
return;
- m_minimumLayoutSize = minimumLayoutSize;
- if (minimumLayoutSize.width() <= 0) {
+ m_viewLayoutSize = viewLayoutSize;
+ if (viewLayoutSize.width() <= 0) {
corePage()->mainFrame().view()->enableAutoSizeMode(false, IntSize(), IntSize());
return;
}
- int minimumLayoutWidth = minimumLayoutSize.width();
- int minimumLayoutHeight = std::max(minimumLayoutSize.height(), 1);
+ int viewLayoutWidth = viewLayoutSize.width();
+ int viewLayoutHeight = std::max(viewLayoutSize.height(), 1);
int maximumSize = std::numeric_limits<int>::max();
- corePage()->mainFrame().view()->enableAutoSizeMode(true, IntSize(minimumLayoutWidth, minimumLayoutHeight), IntSize(maximumSize, maximumSize));
+ corePage()->mainFrame().view()->enableAutoSizeMode(true, IntSize(viewLayoutWidth, viewLayoutHeight), IntSize(maximumSize, maximumSize));
}
void WebPage::setAutoSizingShouldExpandToViewHeight(bool shouldExpand)
Modified: trunk/Source/WebKit/WebProcess/WebPage/WebPage.h (231096 => 231097)
--- trunk/Source/WebKit/WebProcess/WebPage/WebPage.h 2018-04-27 15:40:16 UTC (rev 231096)
+++ trunk/Source/WebKit/WebProcess/WebPage/WebPage.h 2018-04-27 16:07:19 UTC (rev 231097)
@@ -875,10 +875,10 @@
void updateVisibilityState(bool isInitialState = false);
#if PLATFORM(IOS)
- void setViewportConfigurationMinimumLayoutSize(const WebCore::FloatSize&);
+ void setViewportConfigurationViewLayoutSize(const WebCore::FloatSize&);
void setMaximumUnobscuredSize(const WebCore::FloatSize&);
void setDeviceOrientation(int32_t);
- void dynamicViewportSizeUpdate(const WebCore::FloatSize& minimumLayoutSize, const WebCore::FloatSize& maximumUnobscuredSize, const WebCore::FloatRect& targetExposedContentRect, const WebCore::FloatRect& targetUnobscuredRect, const WebCore::FloatRect& targetUnobscuredRectInScrollViewCoordinates, const WebCore::FloatBoxExtent& targetUnobscuredSafeAreaInsets, double scale, int32_t deviceOrientation, uint64_t dynamicViewportSizeUpdateID);
+ void dynamicViewportSizeUpdate(const WebCore::FloatSize& viewLayoutSize, const WebCore::FloatSize& maximumUnobscuredSize, const WebCore::FloatRect& targetExposedContentRect, const WebCore::FloatRect& targetUnobscuredRect, const WebCore::FloatRect& targetUnobscuredRectInScrollViewCoordinates, const WebCore::FloatBoxExtent& targetUnobscuredSafeAreaInsets, double scale, int32_t deviceOrientation, uint64_t dynamicViewportSizeUpdateID);
void synchronizeDynamicViewportUpdate(double& newTargetScale, WebCore::FloatPoint& newScrollPosition, uint64_t& nextValidLayerTreeTransactionID);
std::optional<float> scaleFromUIProcess(const VisibleContentRectUpdateInfo&) const;
void updateVisibleContentRects(const VisibleContentRectUpdateInfo&, MonotonicTime oldestTimestamp);
@@ -939,8 +939,8 @@
bool alwaysShowsHorizontalScroller() const { return m_alwaysShowsHorizontalScroller; };
bool alwaysShowsVerticalScroller() const { return m_alwaysShowsVerticalScroller; };
- void setMinimumLayoutSize(const WebCore::IntSize&);
- WebCore::IntSize minimumLayoutSize() const { return m_minimumLayoutSize; }
+ void setViewLayoutSize(const WebCore::IntSize&);
+ WebCore::IntSize viewLayoutSize() const { return m_viewLayoutSize; }
void setAutoSizingShouldExpandToViewHeight(bool shouldExpand);
bool autoSizingShouldExpandToViewHeight() { return m_autoSizingShouldExpandToViewHeight; }
@@ -1592,7 +1592,7 @@
HashSet<unsigned long> m_trackedNetworkResourceRequestIdentifiers;
- WebCore::IntSize m_minimumLayoutSize;
+ WebCore::IntSize m_viewLayoutSize;
bool m_autoSizingShouldExpandToViewHeight { false };
std::optional<WebCore::IntSize> m_viewportSizeForCSSViewportUnits;
Modified: trunk/Source/WebKit/WebProcess/WebPage/WebPage.messages.in (231096 => 231097)
--- trunk/Source/WebKit/WebProcess/WebPage/WebPage.messages.in 2018-04-27 15:40:16 UTC (rev 231096)
+++ trunk/Source/WebKit/WebProcess/WebPage/WebPage.messages.in 2018-04-27 16:07:19 UTC (rev 231097)
@@ -41,10 +41,10 @@
KeyEvent(WebKit::WebKeyboardEvent event)
MouseEvent(WebKit::WebMouseEvent event)
#if PLATFORM(IOS)
- SetViewportConfigurationMinimumLayoutSize(WebCore::FloatSize size)
+ SetViewportConfigurationViewLayoutSize(WebCore::FloatSize size)
SetMaximumUnobscuredSize(WebCore::FloatSize size)
SetDeviceOrientation(int32_t deviceOrientation)
- DynamicViewportSizeUpdate(WebCore::FloatSize minimumLayoutSize, WebCore::FloatSize maximumUnobscuredSize, WebCore::FloatRect targetExposedContentRect, WebCore::FloatRect targetUnobscuredRect, WebCore::FloatRect targetUnobscuredRectInScrollViewCoordinates, WebCore::RectEdges<float> targetUnobscuredSafeAreaInsets, double scale, int32_t deviceOrientation, uint64_t dynamicViewportSizeUpdateID)
+ DynamicViewportSizeUpdate(WebCore::FloatSize viewLayoutSize, WebCore::FloatSize maximumUnobscuredSize, WebCore::FloatRect targetExposedContentRect, WebCore::FloatRect targetUnobscuredRect, WebCore::FloatRect targetUnobscuredRectInScrollViewCoordinates, WebCore::RectEdges<float> targetUnobscuredSafeAreaInsets, double scale, int32_t deviceOrientation, uint64_t dynamicViewportSizeUpdateID)
SynchronizeDynamicViewportUpdate() -> (double newTargetScale, WebCore::FloatPoint newScrollPosition, uint64_t nextValidLayerTreeTransactionID)
HandleTap(WebCore::IntPoint point, uint64_t lastLayerTreeTransactionId)
@@ -408,7 +408,7 @@
SetAlwaysShowsHorizontalScroller(bool alwaysShowsHorizontalScroller)
SetAlwaysShowsVerticalScroller(bool alwaysShowsVerticalScroller)
- SetMinimumLayoutSize(WebCore::IntSize minimumLayoutSize)
+ SetViewLayoutSize(WebCore::IntSize viewLayoutSize)
SetAutoSizingShouldExpandToViewHeight(bool shouldExpand)
SetViewportSizeForCSSViewportUnits(std::optional<WebCore::IntSize> viewportSize)
Modified: trunk/Source/WebKit/WebProcess/WebPage/ios/WebPageIOS.mm (231096 => 231097)
--- trunk/Source/WebKit/WebProcess/WebPage/ios/WebPageIOS.mm 2018-04-27 15:40:16 UTC (rev 231096)
+++ trunk/Source/WebKit/WebProcess/WebPage/ios/WebPageIOS.mm 2018-04-27 16:07:19 UTC (rev 231097)
@@ -2454,10 +2454,10 @@
}
}
-void WebPage::setViewportConfigurationMinimumLayoutSize(const FloatSize& size)
+void WebPage::setViewportConfigurationViewLayoutSize(const FloatSize& size)
{
- LOG_WITH_STREAM(VisibleRects, stream << "WebPage " << m_pageID << " setViewportConfigurationMinimumLayoutSize " << size);
- if (m_viewportConfiguration.setMinimumLayoutSize(size))
+ LOG_WITH_STREAM(VisibleRects, stream << "WebPage " << m_pageID << " setViewportConfigurationViewLayoutSize " << size);
+ if (m_viewportConfiguration.setViewLayoutSize(size))
viewportConfigurationChanged();
}
@@ -2492,12 +2492,12 @@
}
}
-void WebPage::dynamicViewportSizeUpdate(const FloatSize& minimumLayoutSize, const WebCore::FloatSize& maximumUnobscuredSize, const FloatRect& targetExposedContentRect, const FloatRect& targetUnobscuredRect, const WebCore::FloatRect& targetUnobscuredRectInScrollViewCoordinates, const WebCore::FloatBoxExtent& targetUnobscuredSafeAreaInsets, double targetScale, int32_t deviceOrientation, uint64_t dynamicViewportSizeUpdateID)
+void WebPage::dynamicViewportSizeUpdate(const FloatSize& viewLayoutSize, const WebCore::FloatSize& maximumUnobscuredSize, const FloatRect& targetExposedContentRect, const FloatRect& targetUnobscuredRect, const WebCore::FloatRect& targetUnobscuredRectInScrollViewCoordinates, const WebCore::FloatBoxExtent& targetUnobscuredSafeAreaInsets, double targetScale, int32_t deviceOrientation, uint64_t dynamicViewportSizeUpdateID)
{
SetForScope<bool> dynamicSizeUpdateGuard(m_inDynamicSizeUpdate, true);
// FIXME: this does not handle the cases where the content would change the content size or scroll position from _javascript_.
// To handle those cases, we would need to redo this computation on every change until the next visible content rect update.
- LOG_WITH_STREAM(VisibleRects, stream << "\nWebPage::dynamicViewportSizeUpdate - minimumLayoutSize " << minimumLayoutSize << " targetUnobscuredRect " << targetUnobscuredRect << " targetExposedContentRect " << targetExposedContentRect << " targetScale " << targetScale);
+ LOG_WITH_STREAM(VisibleRects, stream << "\nWebPage::dynamicViewportSizeUpdate - viewLayoutSize " << viewLayoutSize << " targetUnobscuredRect " << targetUnobscuredRect << " targetExposedContentRect " << targetExposedContentRect << " targetScale " << targetScale);
FrameView& frameView = *m_page->mainFrame().view();
IntSize oldContentSize = frameView.contentsSize();
@@ -2529,8 +2529,8 @@
}
}
- LOG_WITH_STREAM(VisibleRects, stream << "WebPage::dynamicViewportSizeUpdate setting minimum layout size to " << minimumLayoutSize);
- m_viewportConfiguration.setMinimumLayoutSize(minimumLayoutSize);
+ LOG_WITH_STREAM(VisibleRects, stream << "WebPage::dynamicViewportSizeUpdate setting view layout size to " << viewLayoutSize);
+ m_viewportConfiguration.setViewLayoutSize(viewLayoutSize);
IntSize newLayoutSize = m_viewportConfiguration.layoutSize();
if (setFixedLayoutSize(newLayoutSize))
@@ -2612,7 +2612,7 @@
newExposedContentRect.setY(0);
}
- bool likelyResponsiveDesignViewport = newLayoutSize.width() == minimumLayoutSize.width() && areEssentiallyEqualAsFloat(scale, 1);
+ bool likelyResponsiveDesignViewport = newLayoutSize.width() == viewLayoutSize.width() && areEssentiallyEqualAsFloat(scale, 1);
bool contentBleedsOutsideLayoutWidth = newContentSize.width() > newLayoutSize.width();
bool originalScrollPositionWasOnTheLeftEdge = targetUnobscuredRect.x() <= 0;
if (likelyResponsiveDesignViewport && contentBleedsOutsideLayoutWidth && originalScrollPositionWasOnTheLeftEdge) {
Modified: trunk/Source/WebKit/WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.mm (231096 => 231097)
--- trunk/Source/WebKit/WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.mm 2018-04-27 15:40:16 UTC (rev 231096)
+++ trunk/Source/WebKit/WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.mm 2018-04-27 16:07:19 UTC (rev 231097)
@@ -249,7 +249,7 @@
void TiledCoreAnimationDrawingArea::updateIntrinsicContentSizeIfNeeded()
{
- if (!m_webPage.minimumLayoutSize().width())
+ if (!m_webPage.viewLayoutSize().width())
return;
FrameView* frameView = m_webPage.mainFrameView();
@@ -552,7 +552,7 @@
IntSize size = viewSize;
IntSize contentSize = IntSize(-1, -1);
- if (!m_webPage.minimumLayoutSize().width() || m_webPage.autoSizingShouldExpandToViewHeight())
+ if (!m_webPage.viewLayoutSize().width() || m_webPage.autoSizingShouldExpandToViewHeight())
m_webPage.setSize(size);
FrameView* frameView = m_webPage.mainFrameView();
@@ -562,7 +562,7 @@
m_webPage.layoutIfNeeded();
- if (m_webPage.minimumLayoutSize().width() && frameView) {
+ if (m_webPage.viewLayoutSize().width() && frameView) {
contentSize = frameView->autoSizingIntrinsicContentSize();
size = contentSize;
}
