<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[193567] branches/safari-601-branch</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/193567">193567</a></dd>
<dt>Author</dt> <dd>matthew_hanson@apple.com</dd>
<dt>Date</dt> <dd>2015-12-05 23:27:33 -0800 (Sat, 05 Dec 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Roll out <a href="http://trac.webkit.org/projects/webkit/changeset/193478">r193478</a>. rdar://problem/23732400</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari601branchLayoutTestsChangeLog">branches/safari-601-branch/LayoutTests/ChangeLog</a></li>
<li><a href="#branchessafari601branchLayoutTestsTestExpectations">branches/safari-601-branch/LayoutTests/TestExpectations</a></li>
<li><a href="#branchessafari601branchLayoutTestsplatformiossimulatorwk2TestExpectations">branches/safari-601-branch/LayoutTests/platform/ios-simulator-wk2/TestExpectations</a></li>
<li><a href="#branchessafari601branchSourceWebCoreChangeLog">branches/safari-601-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari601branchSourceWebCorecssCSSComputedStyleDeclarationcpp">branches/safari-601-branch/Source/WebCore/css/CSSComputedStyleDeclaration.cpp</a></li>
<li><a href="#branchessafari601branchSourceWebCorecssCSSParsercpp">branches/safari-601-branch/Source/WebCore/css/CSSParser.cpp</a></li>
<li><a href="#branchessafari601branchSourceWebCorecssCSSPrimitiveValueMappingsh">branches/safari-601-branch/Source/WebCore/css/CSSPrimitiveValueMappings.h</a></li>
<li><a href="#branchessafari601branchSourceWebCorecssCSSPropertyNamesin">branches/safari-601-branch/Source/WebCore/css/CSSPropertyNames.in</a></li>
<li><a href="#branchessafari601branchSourceWebCorecssCSSValueKeywordsin">branches/safari-601-branch/Source/WebCore/css/CSSValueKeywords.in</a></li>
<li><a href="#branchessafari601branchSourceWebCoredomElementcpp">branches/safari-601-branch/Source/WebCore/dom/Element.cpp</a></li>
<li><a href="#branchessafari601branchSourceWebCoredomElementh">branches/safari-601-branch/Source/WebCore/dom/Element.h</a></li>
<li><a href="#branchessafari601branchSourceWebCoredomNodeh">branches/safari-601-branch/Source/WebCore/dom/Node.h</a></li>
<li><a href="#branchessafari601branchSourceWebCorerenderingstyleRenderStyleh">branches/safari-601-branch/Source/WebCore/rendering/style/RenderStyle.h</a></li>
<li><a href="#branchessafari601branchSourceWebCorerenderingstyleRenderStyleConstantsh">branches/safari-601-branch/Source/WebCore/rendering/style/RenderStyleConstants.h</a></li>
<li><a href="#branchessafari601branchSourceWebCorerenderingstyleStyleRareNonInheritedDatacpp">branches/safari-601-branch/Source/WebCore/rendering/style/StyleRareNonInheritedData.cpp</a></li>
<li><a href="#branchessafari601branchSourceWebCorerenderingstyleStyleRareNonInheritedDatah">branches/safari-601-branch/Source/WebCore/rendering/style/StyleRareNonInheritedData.h</a></li>
<li><a href="#branchessafari601branchSourceWebKit2ChangeLog">branches/safari-601-branch/Source/WebKit2/ChangeLog</a></li>
<li><a href="#branchessafari601branchSourceWebKit2WebProcessWebPageiosWebPageIOSmm">branches/safari-601-branch/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#branchessafari601branchLayoutTestscss3touchactiontouchactioncomputedstyleexpectedtxt">branches/safari-601-branch/LayoutTests/css3/touch-action/touch-action-computed-style-expected.txt</a></li>
<li><a href="#branchessafari601branchLayoutTestscss3touchactiontouchactioncomputedstylehtml">branches/safari-601-branch/LayoutTests/css3/touch-action/touch-action-computed-style.html</a></li>
<li><a href="#branchessafari601branchLayoutTestscss3touchactiontouchactionmanipulationfastclicksexpectedtxt">branches/safari-601-branch/LayoutTests/css3/touch-action/touch-action-manipulation-fast-clicks-expected.txt</a></li>
<li><a href="#branchessafari601branchLayoutTestscss3touchactiontouchactionmanipulationfastclickshtml">branches/safari-601-branch/LayoutTests/css3/touch-action/touch-action-manipulation-fast-clicks.html</a></li>
<li><a href="#branchessafari601branchLayoutTestscss3touchactiontouchactionparsingexpectedtxt">branches/safari-601-branch/LayoutTests/css3/touch-action/touch-action-parsing-expected.txt</a></li>
<li><a href="#branchessafari601branchLayoutTestscss3touchactiontouchactionparsinghtml">branches/safari-601-branch/LayoutTests/css3/touch-action/touch-action-parsing.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari601branchLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/LayoutTests/ChangeLog (193566 => 193567)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/LayoutTests/ChangeLog 2015-12-06 07:18:59 UTC (rev 193566)
+++ branches/safari-601-branch/LayoutTests/ChangeLog 2015-12-06 07:27:33 UTC (rev 193567)
</span><span class="lines">@@ -1,3 +1,7 @@
</span><ins>+2015-12-05 Matthew Hanson <matthew_hanson@apple.com>
+
+ Rollout r193478. rdar://problem/23732400
+
</ins><span class="cx"> 2015-12-05 David Kilzer <ddkilzer@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r191981. rdar://problem/23732379
</span></span></pre></div>
<a id="branchessafari601branchLayoutTestsTestExpectations"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/LayoutTests/TestExpectations (193566 => 193567)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/LayoutTests/TestExpectations 2015-12-06 07:18:59 UTC (rev 193566)
+++ branches/safari-601-branch/LayoutTests/TestExpectations 2015-12-06 07:27:33 UTC (rev 193567)
</span><span class="lines">@@ -2,16 +2,6 @@
</span><span class="cx"> #
</span><span class="cx"> # See http://trac.webkit.org/wiki/TestExpectations for more information on this file.
</span><span class="cx">
</span><del>-#//////////////////////////////////////////////////////////////////////////////////////////
-# Platform-specific tests. Skipped here, then re-enabled on the appropriate platform.
-#//////////////////////////////////////////////////////////////////////////////////////////
-
-css3/touch-action [ Skip ]
-
-#//////////////////////////////////////////////////////////////////////////////////////////
-# End platform-specific tests.
-#//////////////////////////////////////////////////////////////////////////////////////////
-
</del><span class="cx"> # pending functional patch and per-port verification
</span><span class="cx"> webkit.org/b/109954 css3/line-break [ Skip ]
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari601branchLayoutTestscss3touchactiontouchactioncomputedstyleexpectedtxt"></a>
<div class="delfile"><h4>Deleted: branches/safari-601-branch/LayoutTests/css3/touch-action/touch-action-computed-style-expected.txt (193566 => 193567)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/LayoutTests/css3/touch-action/touch-action-computed-style-expected.txt 2015-12-06 07:18:59 UTC (rev 193566)
+++ branches/safari-601-branch/LayoutTests/css3/touch-action/touch-action-computed-style-expected.txt 2015-12-06 07:27:33 UTC (rev 193567)
</span><span class="lines">@@ -1,22 +0,0 @@
</span><del>-Testing touch-action: manipulation;
-PASS window.getComputedStyle(document.body).getPropertyValue('touch-action') is 'manipulation'
-Testing touch-action: auto;
-PASS window.getComputedStyle(document.body).getPropertyValue('touch-action') is 'auto'
-Testing a bogus value
-PASS window.getComputedStyle(document.body).getPropertyValue('touch-action') is 'auto'
-Testing all caps
-PASS window.getComputedStyle(document.body).getPropertyValue('touch-action') is 'manipulation'
-Testing weird casing
-PASS window.getComputedStyle(document.body).getPropertyValue('touch-action') is 'auto'
-Testing !important (auto)
-PASS window.getComputedStyle(document.body).getPropertyValue('touch-action') is 'auto'
-Testing !important (manipulation)
-PASS window.getComputedStyle(document.body).getPropertyValue('touch-action') is 'manipulation'
-Testing non-inheritance
-PASS window.getComputedStyle(document.getElementById('child')).getPropertyValue('touch-action') is 'auto'
-PASS successfullyParsed is true
-
-TEST COMPLETE
-Testing the computed style of touch-action:
-
-On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
</del></span></pre></div>
<a id="branchessafari601branchLayoutTestscss3touchactiontouchactioncomputedstylehtml"></a>
<div class="delfile"><h4>Deleted: branches/safari-601-branch/LayoutTests/css3/touch-action/touch-action-computed-style.html (193566 => 193567)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/LayoutTests/css3/touch-action/touch-action-computed-style.html 2015-12-06 07:18:59 UTC (rev 193566)
+++ branches/safari-601-branch/LayoutTests/css3/touch-action/touch-action-computed-style.html 2015-12-06 07:27:33 UTC (rev 193567)
</span><span class="lines">@@ -1,61 +0,0 @@
</span><del>-<html>
- <head>
- <script src="../../resources/js-test-pre.js"></script>
- </head>
-
- <body id="body-elem">
- <div id="child"></div>
- <p id="description"></p>
- <script>
- description("Testing the computed style of touch-action:");
- let styleElement = document.createElement("style");
- document.head.appendChild(styleElement);
- let stylesheet = styleElement.sheet;
-
- debug("Testing touch-action: manipulation;");
- stylesheet.insertRule("body { touch-action: manipulation; }", 0);
- shouldBe("window.getComputedStyle(document.body).getPropertyValue('touch-action')", "'manipulation'");
- stylesheet.deleteRule(0);
-
- debug("Testing touch-action: auto;");
- stylesheet.insertRule("body { touch-action: auto; }", 0);
- shouldBe("window.getComputedStyle(document.body).getPropertyValue('touch-action')", "'auto'");
- stylesheet.deleteRule(0);
-
- debug("Testing a bogus value");
- stylesheet.insertRule("body { touch-action: typo; }", 0);
- shouldBe("window.getComputedStyle(document.body).getPropertyValue('touch-action')", "'auto'");
- stylesheet.deleteRule(0);
-
- debug("Testing all caps");
- stylesheet.insertRule("body { touch-action: MANIPULATION; }", 0);
- shouldBe("window.getComputedStyle(document.body).getPropertyValue('touch-action')", "'manipulation'");
- stylesheet.deleteRule(0);
-
- debug("Testing weird casing");
- stylesheet.insertRule("body { touch-action: aUtO; }", 0);
- shouldBe("window.getComputedStyle(document.body).getPropertyValue('touch-action')", "'auto'");
- stylesheet.deleteRule(0);
-
- debug("Testing !important (auto)");
- stylesheet.insertRule("body { touch-action: auto !important; }", 0);
- stylesheet.insertRule("#body-elem { touch-action: manipulation; }", 1);
- shouldBe("window.getComputedStyle(document.body).getPropertyValue('touch-action')", "'auto'");
- stylesheet.deleteRule(1);
- stylesheet.deleteRule(0);
-
- debug("Testing !important (manipulation)");
- stylesheet.insertRule("body { touch-action: manipulation !important; }", 0);
- stylesheet.insertRule("#body-elem { touch-action: auto; }", 1);
- shouldBe("window.getComputedStyle(document.body).getPropertyValue('touch-action')", "'manipulation'");
- stylesheet.deleteRule(1);
- stylesheet.deleteRule(0);
-
- debug("Testing non-inheritance");
- stylesheet.insertRule("body { touch-action: manipulation; }", 0);
- shouldBe("window.getComputedStyle(document.getElementById('child')).getPropertyValue('touch-action')", "'auto'");
- stylesheet.deleteRule(0);
- </script>
- <script src="../../resources/js-test-post.js"></script>
- </body>
-</html>
</del></span></pre></div>
<a id="branchessafari601branchLayoutTestscss3touchactiontouchactionmanipulationfastclicksexpectedtxt"></a>
<div class="delfile"><h4>Deleted: branches/safari-601-branch/LayoutTests/css3/touch-action/touch-action-manipulation-fast-clicks-expected.txt (193566 => 193567)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/LayoutTests/css3/touch-action/touch-action-manipulation-fast-clicks-expected.txt 2015-12-06 07:18:59 UTC (rev 193566)
+++ branches/safari-601-branch/LayoutTests/css3/touch-action/touch-action-manipulation-fast-clicks-expected.txt 2015-12-06 07:27:33 UTC (rev 193567)
</span><span class="lines">@@ -1,12 +0,0 @@
</span><del>-PASS successfullyParsed is true
-
-TEST COMPLETE
-
-Repeatedly tapping on the button should fire click events.
-
-This test is best run in WebKitTestRunner. If you are running this test manually, verify that tapping the button causes a "Click!" message to appear below, and that click occurred without the regular 350ms delay for double tapping.
-
-Click!
-Click!
-Click!
-
</del></span></pre></div>
<a id="branchessafari601branchLayoutTestscss3touchactiontouchactionmanipulationfastclickshtml"></a>
<div class="delfile"><h4>Deleted: branches/safari-601-branch/LayoutTests/css3/touch-action/touch-action-manipulation-fast-clicks.html (193566 => 193567)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/LayoutTests/css3/touch-action/touch-action-manipulation-fast-clicks.html 2015-12-06 07:18:59 UTC (rev 193566)
+++ branches/safari-601-branch/LayoutTests/css3/touch-action/touch-action-manipulation-fast-clicks.html 2015-12-06 07:27:33 UTC (rev 193567)
</span><span class="lines">@@ -1,59 +0,0 @@
</span><del>-<!DOCTYPE html> <!-- webkit-test-runner [ useFlexibleViewport=true ] -->
-
-<html>
-<meta name="viewport" content="initial-scale=1.0">
-
-<head>
- <script src="../../resources/js-test-pre.js"></script>
- <script id="ui-script" type="text/plain">
- (function() {
- function performTap() {
- uiController.singleTapAtPoint(200, 200, performTap);
- }
- performTap();
- })();
- </script>
-
- <script>
- var clickCount = 0;
- if (window.testRunner)
- testRunner.waitUntilDone();
-
- function getUIScript() {
- return document.getElementById("ui-script").text;
- }
-
- function runTest() {
- if (testRunner.runUIScript)
- testRunner.runUIScript(getUIScript(), function(result) { });
- }
- function handleClicked() {
- clickCount++;
- document.body.appendChild(document.createTextNode("Click!"));
- document.body.appendChild(document.createElement("br"));
- if (clickCount == 3)
- testRunner.notifyDone();
- }
- </script>
-
- <style>
- body {
- margin: 0;
- }
-
- #target {
- touch-action: manipulation;
- width: 400px;
- height: 400px;
- }
- </style>
-</head>
-
-<body onload="runTest()">
- <button id="target" onclick="handleClicked()"></button>
- <p>Repeatedly tapping on the button should fire click events.</p>
- <p>This test is best run in WebKitTestRunner. If you are running this test manually, verify that tapping the button causes a "Click!" message to appear below, and that click occurred without the regular 350ms delay for double tapping.</p>
- <script src="../../resources/js-test-post.js"></script>
-</body>
-
-</html>
</del></span></pre></div>
<a id="branchessafari601branchLayoutTestscss3touchactiontouchactionparsingexpectedtxt"></a>
<div class="delfile"><h4>Deleted: branches/safari-601-branch/LayoutTests/css3/touch-action/touch-action-parsing-expected.txt (193566 => 193567)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/LayoutTests/css3/touch-action/touch-action-parsing-expected.txt 2015-12-06 07:18:59 UTC (rev 193566)
+++ branches/safari-601-branch/LayoutTests/css3/touch-action/touch-action-parsing-expected.txt 2015-12-06 07:27:33 UTC (rev 193567)
</span><span class="lines">@@ -1,12 +0,0 @@
</span><del>-PASS cssRule.type is 1
-PASS declaration.length is 1
-PASS declaration.getPropertyValue('touch-action') is 'manipulation'
-PASS cssRule.type is 1
-PASS declaration.length is 1
-PASS declaration.getPropertyValue('touch-action') is 'auto'
-PASS successfullyParsed is true
-
-TEST COMPLETE
-Test the parsing of touch-action.
-
-On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
</del></span></pre></div>
<a id="branchessafari601branchLayoutTestscss3touchactiontouchactionparsinghtml"></a>
<div class="delfile"><h4>Deleted: branches/safari-601-branch/LayoutTests/css3/touch-action/touch-action-parsing.html (193566 => 193567)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/LayoutTests/css3/touch-action/touch-action-parsing.html 2015-12-06 07:18:59 UTC (rev 193566)
+++ branches/safari-601-branch/LayoutTests/css3/touch-action/touch-action-parsing.html 2015-12-06 07:27:33 UTC (rev 193567)
</span><span class="lines">@@ -1,31 +0,0 @@
</span><del>-<html>
- <head>
- <script src="../../resources/js-test-pre.js"></script>
- </head>
- <body>
- <p id="description"></p>
- <script>
- description("Test the parsing of touch-action.");
-
- var cssRule, declaration;
- var styleElement = document.createElement("style");
- document.head.appendChild(styleElement);
- let stylesheet = styleElement.sheet;
-
- stylesheet.insertRule("body { touch-action: manipulation; }", 0);
- cssRule = stylesheet.cssRules.item(0);
- shouldBe("cssRule.type", "1");
- declaration = cssRule.style;
- shouldBe("declaration.length", "1");
- shouldBe("declaration.getPropertyValue('touch-action')", "'manipulation'");
-
- stylesheet.insertRule("body { touch-action: auto; }", 0);
- cssRule = stylesheet.cssRules.item(0);
- shouldBe("cssRule.type", "1");
- declaration = cssRule.style;
- shouldBe("declaration.length", "1");
- shouldBe("declaration.getPropertyValue('touch-action')", "'auto'");
- </script>
- <script src="../../resources/js-test-post.js"></script>
- </body>
-</html>
</del></span></pre></div>
<a id="branchessafari601branchLayoutTestsplatformiossimulatorwk2TestExpectations"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/LayoutTests/platform/ios-simulator-wk2/TestExpectations (193566 => 193567)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/LayoutTests/platform/ios-simulator-wk2/TestExpectations 2015-12-06 07:18:59 UTC (rev 193566)
+++ branches/safari-601-branch/LayoutTests/platform/ios-simulator-wk2/TestExpectations 2015-12-06 07:27:33 UTC (rev 193567)
</span><span class="lines">@@ -2,16 +2,6 @@
</span><span class="cx"> #
</span><span class="cx"> # See http://trac.webkit.org/wiki/TestExpectations for more information on this file.
</span><span class="cx">
</span><del>-#//////////////////////////////////////////////////////////////////////////////////////////
-# Platform-specific directories. Skipped globally, then re-enabled here.
-#//////////////////////////////////////////////////////////////////////////////////////////
-
-css3/touch-action [ Pass ]
-
-#//////////////////////////////////////////////////////////////////////////////////////////
-# End platform-specific directories.
-#//////////////////////////////////////////////////////////////////////////////////////////
-
</del><span class="cx"> # Animation tests that fail:
</span><span class="cx"> webkit.org/b/129562 [ Debug ] animations/animation-direction-reverse-fill-mode.html [ Skip ]
</span><span class="cx"> webkit.org/b/129562 [ Debug ] animations/fill-mode-reverse.html [ Skip ]
</span></span></pre></div>
<a id="branchessafari601branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebCore/ChangeLog (193566 => 193567)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebCore/ChangeLog 2015-12-06 07:18:59 UTC (rev 193566)
+++ branches/safari-601-branch/Source/WebCore/ChangeLog 2015-12-06 07:27:33 UTC (rev 193567)
</span><span class="lines">@@ -1,3 +1,7 @@
</span><ins>+2015-12-05 Matthew Hanson <matthew_hanson@apple.com>
+
+ Rollout r193478. rdar://problem/23732400
+
</ins><span class="cx"> 2015-12-05 David Kilzer <ddkilzer@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r192129. rdar://problem/23732379
</span></span></pre></div>
<a id="branchessafari601branchSourceWebCorecssCSSComputedStyleDeclarationcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebCore/css/CSSComputedStyleDeclaration.cpp (193566 => 193567)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebCore/css/CSSComputedStyleDeclaration.cpp 2015-12-06 07:18:59 UTC (rev 193566)
+++ branches/safari-601-branch/Source/WebCore/css/CSSComputedStyleDeclaration.cpp 2015-12-06 07:27:33 UTC (rev 193567)
</span><span class="lines">@@ -2969,8 +2969,6 @@
</span><span class="cx"> #if ENABLE(TOUCH_EVENTS)
</span><span class="cx"> case CSSPropertyWebkitTapHighlightColor:
</span><span class="cx"> return currentColorOrValidColor(style.get(), style->tapHighlightColor());
</span><del>- case CSSPropertyTouchAction:
- return cssValuePool.createValue(style->touchAction());
</del><span class="cx"> #endif
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> case CSSPropertyWebkitTouchCallout:
</span></span></pre></div>
<a id="branchessafari601branchSourceWebCorecssCSSParsercpp"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebCore/css/CSSParser.cpp (193566 => 193567)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebCore/css/CSSParser.cpp 2015-12-06 07:18:59 UTC (rev 193566)
+++ branches/safari-601-branch/Source/WebCore/css/CSSParser.cpp 2015-12-06 07:27:33 UTC (rev 193567)
</span><span class="lines">@@ -749,12 +749,6 @@
</span><span class="cx"> if (valueID == CSSValueNormal || valueID == CSSValueBreakWord)
</span><span class="cx"> return true;
</span><span class="cx"> break;
</span><del>-#if ENABLE(TOUCH_EVENTS)
- case CSSPropertyTouchAction: // auto | manipulation
- if (valueID == CSSValueAuto || valueID == CSSValueManipulation)
- return true;
- break;
-#endif
</del><span class="cx"> #if ENABLE(CSS_SCROLL_SNAP)
</span><span class="cx"> case CSSPropertyWebkitScrollSnapType: // none | mandatory | proximity
</span><span class="cx"> if (valueID == CSSValueNone || valueID == CSSValueMandatory || valueID == CSSValueProximity)
</span><span class="lines">@@ -1170,9 +1164,6 @@
</span><span class="cx"> case CSSPropertyWhiteSpace:
</span><span class="cx"> case CSSPropertyWordBreak:
</span><span class="cx"> case CSSPropertyWordWrap:
</span><del>-#if ENABLE(TOUCH_EVENTS)
- case CSSPropertyTouchAction:
-#endif
</del><span class="cx"> #if ENABLE(CSS_SCROLL_SNAP)
</span><span class="cx"> case CSSPropertyWebkitScrollSnapType:
</span><span class="cx"> #endif
</span><span class="lines">@@ -3229,9 +3220,6 @@
</span><span class="cx"> case CSSPropertyWhiteSpace:
</span><span class="cx"> case CSSPropertyWordBreak:
</span><span class="cx"> case CSSPropertyWordWrap:
</span><del>-#if ENABLE(TOUCH_EVENTS)
- case CSSPropertyTouchAction:
-#endif
</del><span class="cx"> #if ENABLE(CSS_SCROLL_SNAP)
</span><span class="cx"> case CSSPropertyWebkitScrollSnapType:
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="branchessafari601branchSourceWebCorecssCSSPrimitiveValueMappingsh"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebCore/css/CSSPrimitiveValueMappings.h (193566 => 193567)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebCore/css/CSSPrimitiveValueMappings.h 2015-12-06 07:18:59 UTC (rev 193566)
+++ branches/safari-601-branch/Source/WebCore/css/CSSPrimitiveValueMappings.h 2015-12-06 07:27:33 UTC (rev 193567)
</span><span class="lines">@@ -5254,37 +5254,6 @@
</span><span class="cx"> return ContentDistributionStretch;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if ENABLE(TOUCH_EVENTS)
-template<> inline CSSPrimitiveValue::CSSPrimitiveValue(TouchAction touchAction)
- : CSSValue(PrimitiveClass)
-{
- m_primitiveUnitType = CSS_VALUE_ID;
- switch (touchAction) {
- case TouchAction::Auto:
- m_value.valueID = CSSValueAuto;
- break;
- case TouchAction::Manipulation:
- m_value.valueID = CSSValueManipulation;
- break;
- }
-}
-
-template<> inline CSSPrimitiveValue::operator TouchAction() const
-{
- ASSERT(isValueID());
- switch (m_value.valueID) {
- case CSSValueAuto:
- return TouchAction::Auto;
- case CSSValueManipulation:
- return TouchAction::Manipulation;
- default:
- break;
- }
- ASSERT_NOT_REACHED();
- return TouchAction::Auto;
-}
-#endif
-
</del><span class="cx"> #if ENABLE(CSS_SCROLL_SNAP)
</span><span class="cx"> template<> inline CSSPrimitiveValue::CSSPrimitiveValue(ScrollSnapType e)
</span><span class="cx"> : CSSValue(PrimitiveClass)
</span></span></pre></div>
<a id="branchessafari601branchSourceWebCorecssCSSPropertyNamesin"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebCore/css/CSSPropertyNames.in (193566 => 193567)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebCore/css/CSSPropertyNames.in 2015-12-06 07:18:59 UTC (rev 193566)
+++ branches/safari-601-branch/Source/WebCore/css/CSSPropertyNames.in 2015-12-06 07:27:33 UTC (rev 193567)
</span><span class="lines">@@ -657,9 +657,6 @@
</span><span class="cx"> #if defined(ENABLE_ACCELERATED_OVERFLOW_SCROLLING) && ENABLE_ACCELERATED_OVERFLOW_SCROLLING
</span><span class="cx"> -webkit-overflow-scrolling [Inherited, NameForMethods=UseTouchOverflowScrolling, Converter=OverflowScrolling]
</span><span class="cx"> #endif
</span><del>-#if defined(ENABLE_TOUCH_EVENTS) && ENABLE_TOUCH_EVENTS
-touch-action
-#endif
</del><span class="cx"> #if defined(WTF_PLATFORM_IOS) && WTF_PLATFORM_IOS
</span><span class="cx"> -webkit-touch-callout [Inherited, NameForMethods=TouchCalloutEnabled, Converter=TouchCallout]
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="branchessafari601branchSourceWebCorecssCSSValueKeywordsin"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebCore/css/CSSValueKeywords.in (193566 => 193567)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebCore/css/CSSValueKeywords.in 2015-12-06 07:18:59 UTC (rev 193566)
+++ branches/safari-601-branch/Source/WebCore/css/CSSValueKeywords.in 2015-12-06 07:27:33 UTC (rev 193567)
</span><span class="lines">@@ -1138,8 +1138,3 @@
</span><span class="cx"> // will-change
</span><span class="cx"> scroll-position
</span><span class="cx"> contents
</span><del>-
-#if defined(ENABLE_TOUCH_EVENTS) && ENABLE_TOUCH_EVENTS
-// touch-action
-manipulation
-#endif
</del></span></pre></div>
<a id="branchessafari601branchSourceWebCoredomElementcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebCore/dom/Element.cpp (193566 => 193567)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebCore/dom/Element.cpp 2015-12-06 07:18:59 UTC (rev 193566)
+++ branches/safari-601-branch/Source/WebCore/dom/Element.cpp 2015-12-06 07:27:33 UTC (rev 193567)
</span><span class="lines">@@ -4,7 +4,7 @@
</span><span class="cx"> * (C) 2001 Peter Kelly (pmk@post.com)
</span><span class="cx"> * (C) 2001 Dirk Mueller (mueller@kde.org)
</span><span class="cx"> * (C) 2007 David Smith (catfish.man@gmail.com)
</span><del>- * Copyright (C) 2004-2015 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2004-2014 Apple Inc. All rights reserved.
</ins><span class="cx"> * (C) 2007 Eric Seidel (eric@webkit.org)
</span><span class="cx"> *
</span><span class="cx"> * This library is free software; you can redistribute it and/or
</span><span class="lines">@@ -1369,17 +1369,6 @@
</span><span class="cx"> return document().completeURL(stripLeadingAndTrailingHTMLSpaces(linkAttribute));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if ENABLE(TOUCH_EVENTS)
-bool Element::allowsDoubleTapGesture() const
-{
- if (renderStyle() && renderStyle()->touchAction() != TouchAction::Auto)
- return false;
-
- Element* parent = parentElement();
- return !parent || parent->allowsDoubleTapGesture();
-}
-#endif
-
</del><span class="cx"> // Returns true is the given attribute is an event handler.
</span><span class="cx"> // We consider an event handler any attribute that begins with "on".
</span><span class="cx"> // It is a simple solution that has the advantage of not requiring any
</span></span></pre></div>
<a id="branchessafari601branchSourceWebCoredomElementh"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebCore/dom/Element.h (193566 => 193567)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebCore/dom/Element.h 2015-12-06 07:18:59 UTC (rev 193566)
+++ branches/safari-601-branch/Source/WebCore/dom/Element.h 2015-12-06 07:27:33 UTC (rev 193567)
</span><span class="lines">@@ -485,10 +485,6 @@
</span><span class="cx">
</span><span class="cx"> WEBCORE_EXPORT URL absoluteLinkURL() const;
</span><span class="cx">
</span><del>-#if ENABLE(TOUCH_EVENTS)
- virtual bool allowsDoubleTapGesture() const override;
-#endif
-
</del><span class="cx"> protected:
</span><span class="cx"> Element(const QualifiedName&, Document&, ConstructionType);
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari601branchSourceWebCoredomNodeh"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebCore/dom/Node.h (193566 => 193567)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebCore/dom/Node.h 2015-12-06 07:18:59 UTC (rev 193566)
+++ branches/safari-601-branch/Source/WebCore/dom/Node.h 2015-12-06 07:27:33 UTC (rev 193567)
</span><span class="lines">@@ -528,10 +528,6 @@
</span><span class="cx"> void dispatchSubtreeModifiedEvent();
</span><span class="cx"> bool dispatchDOMActivateEvent(int detail, PassRefPtr<Event> underlyingEvent);
</span><span class="cx">
</span><del>-#if ENABLE(TOUCH_EVENTS)
- virtual bool allowsDoubleTapGesture() const { return true; }
-#endif
-
</del><span class="cx"> #if ENABLE(TOUCH_EVENTS) && !PLATFORM(IOS)
</span><span class="cx"> bool dispatchTouchEvent(PassRefPtr<TouchEvent>);
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="branchessafari601branchSourceWebCorerenderingstyleRenderStyleh"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebCore/rendering/style/RenderStyle.h (193566 => 193567)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebCore/rendering/style/RenderStyle.h 2015-12-06 07:18:59 UTC (rev 193566)
+++ branches/safari-601-branch/Source/WebCore/rendering/style/RenderStyle.h 2015-12-06 07:27:33 UTC (rev 193567)
</span><span class="lines">@@ -1112,10 +1112,6 @@
</span><span class="cx"> int initialLetterDrop() const { return initialLetter().width(); }
</span><span class="cx"> int initialLetterHeight() const { return initialLetter().height(); }
</span><span class="cx">
</span><del>-#if ENABLE(TOUCH_EVENTS)
- TouchAction touchAction() const { return static_cast<TouchAction>(rareNonInheritedData->m_touchAction); }
-#endif
-
</del><span class="cx"> #if ENABLE(CSS_SCROLL_SNAP)
</span><span class="cx"> ScrollSnapType scrollSnapType() const { return static_cast<ScrollSnapType>(rareNonInheritedData->m_scrollSnapType); }
</span><span class="cx"> const ScrollSnapPoints* scrollSnapPointsX() const;
</span><span class="lines">@@ -1674,10 +1670,6 @@
</span><span class="cx">
</span><span class="cx"> void setInitialLetter(const IntSize& size) { SET_VAR(rareNonInheritedData, m_initialLetter, size); }
</span><span class="cx">
</span><del>-#if ENABLE(TOUCH_EVENTS)
- void setTouchAction(TouchAction touchAction) { SET_VAR(rareNonInheritedData, m_touchAction, static_cast<unsigned>(touchAction)); }
-#endif
-
</del><span class="cx"> #if ENABLE(CSS_SCROLL_SNAP)
</span><span class="cx"> void setScrollSnapType(ScrollSnapType type) { SET_VAR(rareNonInheritedData, m_scrollSnapType, static_cast<unsigned>(type)); }
</span><span class="cx"> void setScrollSnapPointsX(std::unique_ptr<ScrollSnapPoints>);
</span><span class="lines">@@ -2031,10 +2023,6 @@
</span><span class="cx">
</span><span class="cx"> static WillChangeData* initialWillChange() { return nullptr; }
</span><span class="cx">
</span><del>-#if ENABLE(TOUCH_EVENTS)
- static TouchAction initialTouchAction() { return TouchAction::Auto; }
-#endif
-
</del><span class="cx"> #if ENABLE(CSS_SCROLL_SNAP)
</span><span class="cx"> static ScrollSnapType initialScrollSnapType() { return ScrollSnapType::None; }
</span><span class="cx"> static ScrollSnapPoints* initialScrollSnapPointsX() { return nullptr; }
</span></span></pre></div>
<a id="branchessafari601branchSourceWebCorerenderingstyleRenderStyleConstantsh"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebCore/rendering/style/RenderStyleConstants.h (193566 => 193567)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebCore/rendering/style/RenderStyleConstants.h 2015-12-06 07:18:59 UTC (rev 193566)
+++ branches/safari-601-branch/Source/WebCore/rendering/style/RenderStyleConstants.h 2015-12-06 07:27:33 UTC (rev 193567)
</span><span class="lines">@@ -637,13 +637,6 @@
</span><span class="cx"> // Fill, Stroke, ViewBox are just used for SVG.
</span><span class="cx"> enum CSSBoxType { BoxMissing = 0, MarginBox, BorderBox, PaddingBox, ContentBox, Fill, Stroke, ViewBox };
</span><span class="cx">
</span><del>-#if ENABLE(TOUCH_EVENTS)
-enum class TouchAction {
- Auto,
- Manipulation
-};
-#endif
-
</del><span class="cx"> #if ENABLE(CSS_SCROLL_SNAP)
</span><span class="cx"> enum class ScrollSnapType {
</span><span class="cx"> None,
</span></span></pre></div>
<a id="branchessafari601branchSourceWebCorerenderingstyleStyleRareNonInheritedDatacpp"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebCore/rendering/style/StyleRareNonInheritedData.cpp (193566 => 193567)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebCore/rendering/style/StyleRareNonInheritedData.cpp 2015-12-06 07:18:59 UTC (rev 193566)
+++ branches/safari-601-branch/Source/WebCore/rendering/style/StyleRareNonInheritedData.cpp 2015-12-06 07:27:33 UTC (rev 193567)
</span><span class="lines">@@ -77,9 +77,6 @@
</span><span class="cx"> , m_justifyContent(RenderStyle::initialContentAlignment())
</span><span class="cx"> , m_justifyItems(RenderStyle::initialSelfAlignment())
</span><span class="cx"> , m_justifySelf(RenderStyle::initialSelfAlignment())
</span><del>-#if ENABLE(TOUCH_EVENTS)
- , m_touchAction(static_cast<unsigned>(RenderStyle::initialTouchAction()))
-#endif
</del><span class="cx"> #if ENABLE(CSS_SCROLL_SNAP)
</span><span class="cx"> , m_scrollSnapType(static_cast<unsigned>(RenderStyle::initialScrollSnapType()))
</span><span class="cx"> #endif
</span><span class="lines">@@ -169,9 +166,6 @@
</span><span class="cx"> , m_justifyContent(o.m_justifyContent)
</span><span class="cx"> , m_justifyItems(o.m_justifyItems)
</span><span class="cx"> , m_justifySelf(o.m_justifySelf)
</span><del>-#if ENABLE(TOUCH_EVENTS)
- , m_touchAction(o.m_touchAction)
-#endif
</del><span class="cx"> #if ENABLE(CSS_SCROLL_SNAP)
</span><span class="cx"> , m_scrollSnapType(o.m_scrollSnapType)
</span><span class="cx"> #endif
</span><span class="lines">@@ -286,9 +280,6 @@
</span><span class="cx"> && m_borderFit == o.m_borderFit
</span><span class="cx"> && m_textCombine == o.m_textCombine
</span><span class="cx"> && m_textDecorationStyle == o.m_textDecorationStyle
</span><del>-#if ENABLE(TOUCH_EVENTS)
- && m_touchAction == o.m_touchAction
-#endif
</del><span class="cx"> #if ENABLE(CSS_SCROLL_SNAP)
</span><span class="cx"> && m_scrollSnapType == o.m_scrollSnapType
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="branchessafari601branchSourceWebCorerenderingstyleStyleRareNonInheritedDatah"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebCore/rendering/style/StyleRareNonInheritedData.h (193566 => 193567)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebCore/rendering/style/StyleRareNonInheritedData.h 2015-12-06 07:18:59 UTC (rev 193566)
+++ branches/safari-601-branch/Source/WebCore/rendering/style/StyleRareNonInheritedData.h 2015-12-06 07:27:33 UTC (rev 193567)
</span><span class="lines">@@ -189,10 +189,6 @@
</span><span class="cx"> StyleSelfAlignmentData m_justifyItems;
</span><span class="cx"> StyleSelfAlignmentData m_justifySelf;
</span><span class="cx">
</span><del>-#if ENABLE(TOUCH_EVENTS)
- unsigned m_touchAction : 1; // TouchAction
-#endif
-
</del><span class="cx"> #if ENABLE(CSS_SCROLL_SNAP)
</span><span class="cx"> unsigned m_scrollSnapType : 2; // ScrollSnapType
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="branchessafari601branchSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebKit2/ChangeLog (193566 => 193567)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebKit2/ChangeLog 2015-12-06 07:18:59 UTC (rev 193566)
+++ branches/safari-601-branch/Source/WebKit2/ChangeLog 2015-12-06 07:27:33 UTC (rev 193567)
</span><span class="lines">@@ -1,3 +1,7 @@
</span><ins>+2015-12-05 Matthew Hanson <matthew_hanson@apple.com>
+
+ Rollout r193478. rdar://problem/23732400
+
</ins><span class="cx"> 2015-12-04 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r191452. rdar://problem/23732400
</span></span></pre></div>
<a id="branchessafari601branchSourceWebKit2WebProcessWebPageiosWebPageIOSmm"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm (193566 => 193567)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm 2015-12-06 07:18:59 UTC (rev 193566)
+++ branches/safari-601-branch/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm 2015-12-06 07:27:33 UTC (rev 193567)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2012-2015 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2012-2014 Apple Inc. All rights reserved.
</ins><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="cx"> * modification, are permitted provided that the following conditions
</span><span class="lines">@@ -663,12 +663,6 @@
</span><span class="cx"> m_potentialTapNode = m_page->mainFrame().nodeRespondingToClickEvents(position, m_potentialTapLocation);
</span><span class="cx"> sendTapHighlightForNodeIfNecessary(requestID, m_potentialTapNode.get());
</span><span class="cx"> if (m_potentialTapNode) {
</span><del>-#if ENABLE(TOUCH_EVENTS)
- if (!m_potentialTapNode->allowsDoubleTapGesture()) {
- send(Messages::WebPageProxy::DisableDoubleTapGesturesUntilTapIsFinishedIfNecessary(requestID, false, FloatRect(), false, 0, 0));
- return;
- }
-#endif
</del><span class="cx"> FloatPoint origin = position;
</span><span class="cx"> FloatRect renderRect;
</span><span class="cx"> bool isReplaced;
</span></span></pre>
</div>
</div>
</body>
</html>