- Revision
- 238946
- Author
- [email protected]
- Date
- 2018-12-06 17:35:25 -0800 (Thu, 06 Dec 2018)
Log Message
We should ignore minimumEffectiveDeviceWidth if the page specifies device-width in viewport meta-tag.
https://bugs.webkit.org/show_bug.cgi?id=192377
<rdar://problem/46364206>
Patch by Yongjun Zhang <[email protected]> on 2018-12-06
Reviewed by Tim Horton.
Source/WebCore:
If the page specifies width=device-width or initial-scale=1 in the viewport meta tag, we should use the
native device width and ignore the minimum effective device width in ViewportConfiguration. The patch
also introduces scalableNativeWebpageParameters() which uses the device width as default and also allows the page
to shrink-to-fit. If a page doesn't have viewport meta tag, or if the width argument isn't device-width
and the initial scale isn't 1, we will use scalableNativeWebpageParameters() as the default configuration.
Tests: fast/viewport/ios/ignore-minimum-device-width-for-page-with-viewport-device-width.html
fast/viewport/ios/use-minimum-device-width-for-page-without-viewport-meta.html
* page/ViewportConfiguration.cpp:
(WebCore::ViewportConfiguration::updateDefaultConfiguration): pick the default configuration based on
the page's viewport arguments. Also, we will always fall back to scalableNativeWebpageParameters() if we
can ignore scaling constraints.
(WebCore::ViewportConfiguration::setViewportArguments): When page sends us new ViewportArguments, pick
up the correponsding default configuration before updating the configuration.
(WebCore::ViewportConfiguration::setCanIgnoreScalingConstraints): When m_canIgnoreScalingConstraints is
changed, try to pick up the correponsding default configuration.
(WebCore::ViewportConfiguration::scalableNativeWebpageParameters): Add a new default set of viewport Parameters
this is very close to nativeWebpageParameters() excpet that it allows shrink to fit and its minimum scale
is 0.25. We will use this Parameters for pages that doesn't have viewport meta tag; or the width is
not device-width and initial scale is not 1.
(WebCore::ViewportConfiguration::updateConfiguration): If the page's viewport argument doesn't override
the default width, use the m_minimumLayoutSize.width().
* page/ViewportConfiguration.h:
(WebCore::ViewportConfiguration::shouldIgnoreMinimumEffectiveDeviceWidth const): A helper method to tell
if we should avoid using minimum effective device width.
(WebCore::ViewportConfiguration::canOverrideConfigurationParameters const): If we are using a default
configuration that is neither nativeWebpageParameters() nor scalableNativeWebpageParameters(), don't override
it.
(WebCore::ViewportConfiguration::minimumEffectiveDeviceWidth const): Add a helper method to return minimum
effective device width based on shouldIgnoreMinimumEffectiveDeviceWidth().
(WebCore::ViewportConfiguration::effectiveLayoutSizeScaleFactor const): Use minimumEffectiveDeviceWidth().
Source/WebKit:
Since we are using page's viewport arguments to decide the default viewport parameters and
whether we can use mininum effective device width, we should always call setViewportArguments()
regardless of shouldIgnoreMetaViewport settings.
* WebProcess/WebPage/WebPage.cpp:
(WebKit::WebPage::viewportPropertiesDidChange): Always call setViewportArguments().
(WebKit::WebPage::didCommitLoad): Ditto.
LayoutTests:
* fast/viewport/ios/ignore-minimum-device-width-for-page-with-viewport-device-width-expected.txt: Added.
* fast/viewport/ios/ignore-minimum-device-width-for-page-with-viewport-device-width.html: Added.
* fast/viewport/ios/use-minimum-device-width-for-page-without-viewport-meta-expected.txt: Added.
* fast/viewport/ios/use-minimum-device-width-for-page-without-viewport-meta.html: Added.
Modified Paths
Added Paths
Diff
Modified: trunk/LayoutTests/ChangeLog (238945 => 238946)
--- trunk/LayoutTests/ChangeLog 2018-12-06 23:48:36 UTC (rev 238945)
+++ trunk/LayoutTests/ChangeLog 2018-12-07 01:35:25 UTC (rev 238946)
@@ -1,3 +1,16 @@
+2018-12-06 Yongjun Zhang <[email protected]>
+
+ We should ignore minimumEffectiveDeviceWidth if the page specifies device-width in viewport meta-tag.
+ https://bugs.webkit.org/show_bug.cgi?id=192377
+ <rdar://problem/46364206>
+
+ Reviewed by Tim Horton.
+
+ * fast/viewport/ios/ignore-minimum-device-width-for-page-with-viewport-device-width-expected.txt: Added.
+ * fast/viewport/ios/ignore-minimum-device-width-for-page-with-viewport-device-width.html: Added.
+ * fast/viewport/ios/use-minimum-device-width-for-page-without-viewport-meta-expected.txt: Added.
+ * fast/viewport/ios/use-minimum-device-width-for-page-without-viewport-meta.html: Added.
+
2018-12-06 Wenson Hsieh <[email protected]>
[iOS] WKWebView should match UITextView behavior when editing text with an RTL keyboard
Added: trunk/LayoutTests/fast/viewport/ios/ignore-minimum-device-width-for-page-with-viewport-device-width-expected.txt (0 => 238946)
--- trunk/LayoutTests/fast/viewport/ios/ignore-minimum-device-width-for-page-with-viewport-device-width-expected.txt (rev 0)
+++ trunk/LayoutTests/fast/viewport/ios/ignore-minimum-device-width-for-page-with-viewport-device-width-expected.txt 2018-12-07 01:35:25 UTC (rev 238946)
@@ -0,0 +1,41 @@
+setMinimumEffectiveWidth(640.00)
+window size: [320, 548]
+square size: [32, 55]
+zoom scale: 1.00
+
+setMinimumEffectiveWidth(768.00)
+window size: [320, 548]
+square size: [32, 55]
+zoom scale: 1.00
+
+setMinimumEffectiveWidth(834.00)
+window size: [320, 548]
+square size: [32, 55]
+zoom scale: 1.00
+
+setMinimumEffectiveWidth(980.00)
+window size: [320, 548]
+square size: [32, 55]
+zoom scale: 1.00
+
+setMinimumEffectiveWidth(1024.00)
+window size: [320, 548]
+square size: [32, 55]
+zoom scale: 1.00
+
+setMinimumEffectiveWidth(1112.00)
+window size: [320, 548]
+square size: [32, 55]
+zoom scale: 1.00
+
+setMinimumEffectiveWidth(1280.00)
+window size: [320, 548]
+square size: [32, 55]
+zoom scale: 1.00
+
+setMinimumEffectiveWidth(1336.00)
+window size: [320, 548]
+square size: [32, 55]
+zoom scale: 1.00
+
+
Added: trunk/LayoutTests/fast/viewport/ios/ignore-minimum-device-width-for-page-with-viewport-device-width.html (0 => 238946)
--- trunk/LayoutTests/fast/viewport/ios/ignore-minimum-device-width-for-page-with-viewport-device-width.html (rev 0)
+++ trunk/LayoutTests/fast/viewport/ios/ignore-minimum-device-width-for-page-with-viewport-device-width.html 2018-12-07 01:35:25 UTC (rev 238946)
@@ -0,0 +1,58 @@
+<!DOCTYPE html> <!-- webkit-test-runner [ shouldIgnoreMetaViewport=true ] -->
+<html>
+<head>
+ <meta name="viewport" content="width=device-width">
+ <style>
+ #square {
+ position: absolute;
+ width: 10vw;
+ height: 10vh;
+ border: 2px solid black;
+ }
+
+ #output {
+ width: 100%;
+ height: 100%;
+ overflow: scroll;
+ }
+
+ body {
+ margin: 0;
+ width: 100%;
+ height: 100%;
+ }
+ </style>
+ <script src=""
+ <script>
+ if (window.testRunner) {
+ testRunner.dumpAsText();
+ testRunner.waitUntilDone();
+ }
+
+ async function runTest() {
+ const appendOutput = message => {
+ output.appendChild(document.createTextNode(message));
+ output.appendChild(document.createElement("br"));
+ };
+
+ for (let targetMinimumEffectiveWidth of [640, 768, 834, 980, 1024, 1112, 1280, 1336]) {
+ appendOutput(`setMinimumEffectiveWidth(${targetMinimumEffectiveWidth.toFixed(2)})`);
+
+ await UIHelper.setMinimumEffectiveWidth(targetMinimumEffectiveWidth);
+ await Promise.all([UIHelper.ensureVisibleContentRectUpdate(), UIHelper.ensurePresentationUpdate()]);
+ appendOutput(`window size: [${innerWidth}, ${innerHeight}]`);
+ appendOutput(`square size: [${square.clientWidth}, ${square.clientHeight}]`);
+ appendOutput(`zoom scale: ${(await UIHelper.zoomScale()).toFixed(2)}`);
+ appendOutput("");
+ }
+
+ testRunner.notifyDone();
+ }
+ </script>
+</head>
+
+<body _onload_="runTest()">
+ <div id="square"></div>
+ <pre id="output"></pre>
+</body>
+</html>
Added: trunk/LayoutTests/fast/viewport/ios/use-minimum-device-width-for-page-without-viewport-meta-expected.txt (0 => 238946)
--- trunk/LayoutTests/fast/viewport/ios/use-minimum-device-width-for-page-without-viewport-meta-expected.txt (rev 0)
+++ trunk/LayoutTests/fast/viewport/ios/use-minimum-device-width-for-page-without-viewport-meta-expected.txt 2018-12-07 01:35:25 UTC (rev 238946)
@@ -0,0 +1,41 @@
+setMinimumEffectiveWidth(640.00)
+window size: [640, 1096]
+square size: [64, 110]
+zoom scale: 0.50
+
+setMinimumEffectiveWidth(768.00)
+window size: [768, 1315]
+square size: [77, 132]
+zoom scale: 0.42
+
+setMinimumEffectiveWidth(834.00)
+window size: [834, 1428]
+square size: [83, 143]
+zoom scale: 0.38
+
+setMinimumEffectiveWidth(980.00)
+window size: [980, 1678]
+square size: [98, 168]
+zoom scale: 0.33
+
+setMinimumEffectiveWidth(1024.00)
+window size: [1024, 1754]
+square size: [102, 175]
+zoom scale: 0.31
+
+setMinimumEffectiveWidth(1112.00)
+window size: [1112, 1904]
+square size: [111, 190]
+zoom scale: 0.29
+
+setMinimumEffectiveWidth(1280.00)
+window size: [1280, 2192]
+square size: [128, 219]
+zoom scale: 0.25
+
+setMinimumEffectiveWidth(1336.00)
+window size: [1336, 2288]
+square size: [134, 229]
+zoom scale: 0.24
+
+
Added: trunk/LayoutTests/fast/viewport/ios/use-minimum-device-width-for-page-without-viewport-meta.html (0 => 238946)
--- trunk/LayoutTests/fast/viewport/ios/use-minimum-device-width-for-page-without-viewport-meta.html (rev 0)
+++ trunk/LayoutTests/fast/viewport/ios/use-minimum-device-width-for-page-without-viewport-meta.html 2018-12-07 01:35:25 UTC (rev 238946)
@@ -0,0 +1,57 @@
+<!DOCTYPE html> <!-- webkit-test-runner [ shouldIgnoreMetaViewport=true ] -->
+<html>
+<head>
+ <style>
+ #square {
+ position: absolute;
+ width: 10vw;
+ height: 10vh;
+ border: 2px solid black;
+ }
+
+ #output {
+ width: 100%;
+ height: 100%;
+ overflow: scroll;
+ }
+
+ body {
+ margin: 0;
+ width: 100%;
+ height: 100%;
+ }
+ </style>
+ <script src=""
+ <script>
+ if (window.testRunner) {
+ testRunner.dumpAsText();
+ testRunner.waitUntilDone();
+ }
+
+ async function runTest() {
+ const appendOutput = message => {
+ output.appendChild(document.createTextNode(message));
+ output.appendChild(document.createElement("br"));
+ };
+
+ for (let targetMinimumEffectiveWidth of [640, 768, 834, 980, 1024, 1112, 1280, 1336]) {
+ appendOutput(`setMinimumEffectiveWidth(${targetMinimumEffectiveWidth.toFixed(2)})`);
+
+ await UIHelper.setMinimumEffectiveWidth(targetMinimumEffectiveWidth);
+ await Promise.all([UIHelper.ensureVisibleContentRectUpdate(), UIHelper.ensurePresentationUpdate()]);
+ appendOutput(`window size: [${innerWidth}, ${innerHeight}]`);
+ appendOutput(`square size: [${square.clientWidth}, ${square.clientHeight}]`);
+ appendOutput(`zoom scale: ${(await UIHelper.zoomScale()).toFixed(2)}`);
+ appendOutput("");
+ }
+
+ testRunner.notifyDone();
+ }
+ </script>
+</head>
+
+<body _onload_="runTest()">
+ <div id="square"></div>
+ <pre id="output"></pre>
+</body>
+</html>
Modified: trunk/Source/WebCore/ChangeLog (238945 => 238946)
--- trunk/Source/WebCore/ChangeLog 2018-12-06 23:48:36 UTC (rev 238945)
+++ trunk/Source/WebCore/ChangeLog 2018-12-07 01:35:25 UTC (rev 238946)
@@ -1,3 +1,44 @@
+2018-12-06 Yongjun Zhang <[email protected]>
+
+ We should ignore minimumEffectiveDeviceWidth if the page specifies device-width in viewport meta-tag.
+ https://bugs.webkit.org/show_bug.cgi?id=192377
+ <rdar://problem/46364206>
+
+ Reviewed by Tim Horton.
+
+ If the page specifies width=device-width or initial-scale=1 in the viewport meta tag, we should use the
+ native device width and ignore the minimum effective device width in ViewportConfiguration. The patch
+ also introduces scalableNativeWebpageParameters() which uses the device width as default and also allows the page
+ to shrink-to-fit. If a page doesn't have viewport meta tag, or if the width argument isn't device-width
+ and the initial scale isn't 1, we will use scalableNativeWebpageParameters() as the default configuration.
+
+ Tests: fast/viewport/ios/ignore-minimum-device-width-for-page-with-viewport-device-width.html
+ fast/viewport/ios/use-minimum-device-width-for-page-without-viewport-meta.html
+
+ * page/ViewportConfiguration.cpp:
+ (WebCore::ViewportConfiguration::updateDefaultConfiguration): pick the default configuration based on
+ the page's viewport arguments. Also, we will always fall back to scalableNativeWebpageParameters() if we
+ can ignore scaling constraints.
+ (WebCore::ViewportConfiguration::setViewportArguments): When page sends us new ViewportArguments, pick
+ up the correponsding default configuration before updating the configuration.
+ (WebCore::ViewportConfiguration::setCanIgnoreScalingConstraints): When m_canIgnoreScalingConstraints is
+ changed, try to pick up the correponsding default configuration.
+ (WebCore::ViewportConfiguration::scalableNativeWebpageParameters): Add a new default set of viewport Parameters
+ this is very close to nativeWebpageParameters() excpet that it allows shrink to fit and its minimum scale
+ is 0.25. We will use this Parameters for pages that doesn't have viewport meta tag; or the width is
+ not device-width and initial scale is not 1.
+ (WebCore::ViewportConfiguration::updateConfiguration): If the page's viewport argument doesn't override
+ the default width, use the m_minimumLayoutSize.width().
+ * page/ViewportConfiguration.h:
+ (WebCore::ViewportConfiguration::shouldIgnoreMinimumEffectiveDeviceWidth const): A helper method to tell
+ if we should avoid using minimum effective device width.
+ (WebCore::ViewportConfiguration::canOverrideConfigurationParameters const): If we are using a default
+ configuration that is neither nativeWebpageParameters() nor scalableNativeWebpageParameters(), don't override
+ it.
+ (WebCore::ViewportConfiguration::minimumEffectiveDeviceWidth const): Add a helper method to return minimum
+ effective device width based on shouldIgnoreMinimumEffectiveDeviceWidth().
+ (WebCore::ViewportConfiguration::effectiveLayoutSizeScaleFactor const): Use minimumEffectiveDeviceWidth().
+
2018-12-06 Adrian Perez de Castro <[email protected]>
Content Extensions: Misc fixes to debugging / perf testing code
Modified: trunk/Source/WebCore/page/ViewportConfiguration.cpp (238945 => 238946)
--- trunk/Source/WebCore/page/ViewportConfiguration.cpp 2018-12-06 23:48:36 UTC (rev 238945)
+++ trunk/Source/WebCore/page/ViewportConfiguration.cpp 2018-12-07 01:35:25 UTC (rev 238946)
@@ -143,6 +143,27 @@
return true;
}
+bool ViewportConfiguration::canOverrideConfigurationParameters() const
+{
+ return m_defaultConfiguration == ViewportConfiguration::nativeWebpageParameters() || m_defaultConfiguration == ViewportConfiguration::scalableNativeWebpageParameters();
+}
+
+void ViewportConfiguration::updateDefaultConfiguration()
+{
+ if (!canOverrideConfigurationParameters())
+ return;
+
+ if (m_canIgnoreScalingConstraints) {
+ m_defaultConfiguration = ViewportConfiguration::scalableNativeWebpageParameters();
+ return;
+ }
+
+ if (shouldIgnoreMinimumEffectiveDeviceWidth())
+ m_defaultConfiguration = ViewportConfiguration::nativeWebpageParameters();
+ else
+ m_defaultConfiguration = ViewportConfiguration::scalableNativeWebpageParameters();
+}
+
bool ViewportConfiguration::setViewportArguments(const ViewportArguments& viewportArguments)
{
if (m_viewportArguments == viewportArguments)
@@ -151,6 +172,7 @@
LOG_WITH_STREAM(Viewports, stream << "ViewportConfiguration::setViewportArguments " << viewportArguments);
m_viewportArguments = viewportArguments;
+ updateDefaultConfiguration();
updateMinimumLayoutSize();
updateConfiguration();
return true;
@@ -162,6 +184,7 @@
return false;
m_canIgnoreScalingConstraints = canIgnoreScalingConstraints;
+ updateDefaultConfiguration();
updateConfiguration();
return true;
}
@@ -325,6 +348,14 @@
return parameters;
}
+ViewportConfiguration::Parameters ViewportConfiguration::scalableNativeWebpageParameters()
+{
+ Parameters parameters = ViewportConfiguration::nativeWebpageParameters();
+ parameters.allowsShrinkToFit = true;
+ parameters.minimumScale = 0.25;
+ return parameters;
+}
+
ViewportConfiguration::Parameters ViewportConfiguration::webpageParameters()
{
Parameters parameters;
@@ -448,6 +479,9 @@
else if (booleanViewportArgumentIsSet(m_viewportArguments.shrinkToFit))
m_configuration.allowsShrinkToFit = m_viewportArguments.shrinkToFit != 0.;
+ if (canOverrideConfigurationParameters() && !viewportArgumentsOverridesWidth)
+ m_configuration.width = m_minimumLayoutSize.width();
+
m_configuration.avoidsUnsafeArea = m_viewportArguments.viewportFit != ViewportFit::Cover;
m_configuration.initialScaleIgnoringLayoutScaleFactor = m_configuration.initialScale;
float effectiveLayoutScale = effectiveLayoutSizeScaleFactor();
Modified: trunk/Source/WebCore/page/ViewportConfiguration.h (238945 => 238946)
--- trunk/Source/WebCore/page/ViewportConfiguration.h 2018-12-06 23:48:36 UTC (rev 238945)
+++ trunk/Source/WebCore/page/ViewportConfiguration.h 2018-12-07 01:35:25 UTC (rev 238946)
@@ -103,6 +103,7 @@
// Matches a width=device-width, initial-scale=1 viewport.
WEBCORE_EXPORT static Parameters nativeWebpageParameters();
+ static Parameters scalableNativeWebpageParameters();
WEBCORE_EXPORT static Parameters webpageParameters();
WEBCORE_EXPORT static Parameters textDocumentParameters();
WEBCORE_EXPORT static Parameters imageDocumentParameters();
@@ -126,7 +127,30 @@
bool shouldIgnoreScalingConstraints() const;
bool shouldIgnoreVerticalScalingConstraints() const;
bool shouldIgnoreHorizontalScalingConstraints() const;
+ void updateDefaultConfiguration();
+ bool canOverrideConfigurationParameters() const;
+ constexpr bool shouldIgnoreMinimumEffectiveDeviceWidth() const
+ {
+ if (m_canIgnoreScalingConstraints)
+ return true;
+
+ if (m_viewportArguments == ViewportArguments())
+ return false;
+
+ if (m_viewportArguments.width == ViewportArguments::ValueDeviceWidth || m_viewportArguments.zoom == 1.)
+ return true;
+
+ return false;
+ }
+
+ constexpr double minimumEffectiveDeviceWidth() const
+ {
+ if (shouldIgnoreMinimumEffectiveDeviceWidth())
+ return 0;
+ return m_minimumEffectiveDeviceWidth;
+ }
+
constexpr double forceAlwaysUserScalableMaximumScale() const
{
const double forceAlwaysUserScalableMaximumScaleIgnoringLayoutScaleFactor = 5;
@@ -141,9 +165,9 @@
constexpr double effectiveLayoutSizeScaleFactor() const
{
- if (!m_viewLayoutSize.width() || !m_minimumEffectiveDeviceWidth)
+ if (!m_viewLayoutSize.width() || !minimumEffectiveDeviceWidth())
return m_layoutSizeScaleFactor;
- return m_layoutSizeScaleFactor * m_viewLayoutSize.width() / std::max<double>(m_minimumEffectiveDeviceWidth, m_viewLayoutSize.width());
+ return m_layoutSizeScaleFactor * m_viewLayoutSize.width() / std::max<double>(minimumEffectiveDeviceWidth(), m_viewLayoutSize.width());
}
void updateMinimumLayoutSize();
Modified: trunk/Source/WebKit/ChangeLog (238945 => 238946)
--- trunk/Source/WebKit/ChangeLog 2018-12-06 23:48:36 UTC (rev 238945)
+++ trunk/Source/WebKit/ChangeLog 2018-12-07 01:35:25 UTC (rev 238946)
@@ -1,3 +1,19 @@
+2018-12-06 Yongjun Zhang <[email protected]>
+
+ We should ignore minimumEffectiveDeviceWidth if the page specifies device-width in viewport meta-tag.
+ https://bugs.webkit.org/show_bug.cgi?id=192377
+ <rdar://problem/46364206>
+
+ Reviewed by Tim Horton.
+
+ Since we are using page's viewport arguments to decide the default viewport parameters and
+ whether we can use mininum effective device width, we should always call setViewportArguments()
+ regardless of shouldIgnoreMetaViewport settings.
+
+ * WebProcess/WebPage/WebPage.cpp:
+ (WebKit::WebPage::viewportPropertiesDidChange): Always call setViewportArguments().
+ (WebKit::WebPage::didCommitLoad): Ditto.
+
2018-12-06 Tim Horton <[email protected]>
Web Share API: share overlay does not stick to the Safari window
Modified: trunk/Source/WebKit/WebProcess/WebPage/WebPage.cpp (238945 => 238946)
--- trunk/Source/WebKit/WebProcess/WebPage/WebPage.cpp 2018-12-06 23:48:36 UTC (rev 238945)
+++ trunk/Source/WebKit/WebProcess/WebPage/WebPage.cpp 2018-12-07 01:35:25 UTC (rev 238946)
@@ -1932,7 +1932,7 @@
void WebPage::viewportPropertiesDidChange(const ViewportArguments& viewportArguments)
{
#if PLATFORM(IOS_FAMILY)
- if (!m_page->settings().shouldIgnoreMetaViewport() && m_viewportConfiguration.setViewportArguments(viewportArguments))
+ if (m_viewportConfiguration.setViewportArguments(viewportArguments))
viewportConfigurationChanged();
#endif
@@ -5547,7 +5547,7 @@
if (m_viewportConfiguration.setContentsSize(coreFrame->view()->contentsSize()))
viewportChanged = true;
- if (!m_page->settings().shouldIgnoreMetaViewport() && m_viewportConfiguration.setViewportArguments(coreFrame->document()->viewportArguments()))
+ if (m_viewportConfiguration.setViewportArguments(coreFrame->document()->viewportArguments()))
viewportChanged = true;
if (viewportChanged)
