Title: [202239] trunk
- Revision
- 202239
- Author
- [email protected]
- Date
- 2016-06-20 13:40:03 -0700 (Mon, 20 Jun 2016)
Log Message
Unreviewed, rolling out r202179.
https://bugs.webkit.org/show_bug.cgi?id=158946
The test either fails or times out 100% of the time (Requested
by ap on #webkit).
Reverted changeset:
"REGRESSION: Double tap to zoom does not work on yahoo
finance"
https://bugs.webkit.org/show_bug.cgi?id=158886
http://trac.webkit.org/changeset/202179
Patch by Commit Queue <[email protected]> on 2016-06-20
Modified Paths
Removed Paths
Diff
Modified: trunk/LayoutTests/ChangeLog (202238 => 202239)
--- trunk/LayoutTests/ChangeLog 2016-06-20 20:38:41 UTC (rev 202238)
+++ trunk/LayoutTests/ChangeLog 2016-06-20 20:40:03 UTC (rev 202239)
@@ -1,3 +1,18 @@
+2016-06-20 Commit Queue <[email protected]>
+
+ Unreviewed, rolling out r202179.
+ https://bugs.webkit.org/show_bug.cgi?id=158946
+
+ The test either fails or times out 100% of the time (Requested
+ by ap on #webkit).
+
+ Reverted changeset:
+
+ "REGRESSION: Double tap to zoom does not work on yahoo
+ finance"
+ https://bugs.webkit.org/show_bug.cgi?id=158886
+ http://trac.webkit.org/changeset/202179
+
2016-06-20 Alexey Proskuryakov <[email protected]>
Fix a run-webkit-tests --lint warning.
Deleted: trunk/LayoutTests/fast/events/ios/viewport-shrink-to-fit-allows-double-tap-expected.txt (202238 => 202239)
--- trunk/LayoutTests/fast/events/ios/viewport-shrink-to-fit-allows-double-tap-expected.txt 2016-06-20 20:38:41 UTC (rev 202238)
+++ trunk/LayoutTests/fast/events/ios/viewport-shrink-to-fit-allows-double-tap-expected.txt 2016-06-20 20:40:03 UTC (rev 202239)
@@ -1,4 +0,0 @@
-The viewport zoomed to scale: 1.6
-This test ensures that a page with width=device-width but content that causes a shrink-to-fit will not block double-tap-to-zoom. It runs automatically in WebKit tests. If you're viewing this manually, double tap on this text and the page should zoom in.
-
-This is an element that will cause shrinkage.
Deleted: trunk/LayoutTests/fast/events/ios/viewport-shrink-to-fit-allows-double-tap.html (202238 => 202239)
--- trunk/LayoutTests/fast/events/ios/viewport-shrink-to-fit-allows-double-tap.html 2016-06-20 20:38:41 UTC (rev 202238)
+++ trunk/LayoutTests/fast/events/ios/viewport-shrink-to-fit-allows-double-tap.html 2016-06-20 20:40:03 UTC (rev 202239)
@@ -1,61 +0,0 @@
-<!DOCTYPE html> <!-- webkit-test-runner [ useFlexibleViewport=true ] -->
-
-<html>
-<meta name="viewport" content="width=device-width">
-<head>
- <script>
- if (window.testRunner) {
- testRunner.dumpAsText();
- testRunner.waitUntilDone();
- }
-
- function getUIScript()
- {
- return `
- (function() {
- uiController.didEndZoomingCallback = function() {
- uiController.uiScriptComplete(uiController.zoomScale);
- };
- uiController.doubleTapAtPoint(15, 15, function() {});
- })();`;
- }
-
- function runTest()
- {
- if (!window.eventSender || !testRunner.runUIScript)
- return;
-
- testRunner.runUIScript(getUIScript(), function(result) {
- document.getElementById("target").innerText = "The viewport zoomed to scale: " + result;
- testRunner.notifyDone();
- });
- }
- </script>
- <style>
- body {
- margin: 0;
- min-width: 800px;
- }
- p {
- width: 300px;
- }
- #target {
- height: 100px;
- width: 100px;
- background-color: silver;
- }
- </style>
-</head>
-<body _onload_="runTest()">
-<div id="target"></div>
-<p>
- This test ensures that a page with width=device-width but content that
- causes a shrink-to-fit will not block double-tap-to-zoom. It runs automatically
- in WebKit tests. If you're viewing this manually, double tap on this text and
- the page should zoom in.
-</p>
-<p style="height: 3000px; background-color: #f0e0f0">
- This is an element that will cause shrinkage.
-</p>
-</body>
-</html>
Modified: trunk/Source/WebKit2/ChangeLog (202238 => 202239)
--- trunk/Source/WebKit2/ChangeLog 2016-06-20 20:38:41 UTC (rev 202238)
+++ trunk/Source/WebKit2/ChangeLog 2016-06-20 20:40:03 UTC (rev 202239)
@@ -1,3 +1,18 @@
+2016-06-20 Commit Queue <[email protected]>
+
+ Unreviewed, rolling out r202179.
+ https://bugs.webkit.org/show_bug.cgi?id=158946
+
+ The test either fails or times out 100% of the time (Requested
+ by ap on #webkit).
+
+ Reverted changeset:
+
+ "REGRESSION: Double tap to zoom does not work on yahoo
+ finance"
+ https://bugs.webkit.org/show_bug.cgi?id=158886
+ http://trac.webkit.org/changeset/202179
+
2016-06-20 Tim Horton <[email protected]>
REGRESSION (r191499): Tab content "jumps" down when focusing tabs that load in the background
Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm (202238 => 202239)
--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2016-06-20 20:38:41 UTC (rev 202238)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2016-06-20 20:40:03 UTC (rev 202239)
@@ -1736,16 +1736,11 @@
if (!_viewportMetaTagWidthWasExplicit || _viewportMetaTagCameFromImageDocument)
return YES;
- // If the page set a viewport width that wasn't the device width, then it was
- // scaled and thus will probably need to zoom.
+ // For scalable viewports, only disable double tap gestures if the viewport width is device width.
if (_viewportMetaTagWidth != WebCore::ViewportArguments::ValueDeviceWidth)
return YES;
- // At this point, we have a page that asked for width = device-width. However,
- // if the content's width and height were large, we might have had to shrink it.
- // Since we'll enable double tap zoom whenever we're not at the actual
- // initial scale, this simply becomes a test of the current scale against 1.
- return !areEssentiallyEqualAsFloat(contentZoomScale(self), 1);
+ return !areEssentiallyEqualAsFloat(contentZoomScale(self), _initialScaleFactor);
}
#pragma mark - UIScrollViewDelegate
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
