<!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>[193556] branches/safari-601.1.46-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/193556">193556</a></dd>
<dt>Author</dt> <dd>bshafiei@apple.com</dd>
<dt>Date</dt> <dd>2015-12-05 22:16:59 -0800 (Sat, 05 Dec 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merged <a href="http://trac.webkit.org/projects/webkit/changeset/191452">r191452</a>. rdar://problem/23766290</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari601146branchLayoutTestsChangeLog">branches/safari-601.1.46-branch/LayoutTests/ChangeLog</a></li>
<li><a href="#branchessafari601146branchLayoutTestsTestExpectations">branches/safari-601.1.46-branch/LayoutTests/TestExpectations</a></li>
<li><a href="#branchessafari601146branchLayoutTestsplatformiossimulatorwk2TestExpectations">branches/safari-601.1.46-branch/LayoutTests/platform/ios-simulator-wk2/TestExpectations</a></li>
<li><a href="#branchessafari601146branchSourceWebCoreChangeLog">branches/safari-601.1.46-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari601146branchSourceWebCorecssCSSComputedStyleDeclarationcpp">branches/safari-601.1.46-branch/Source/WebCore/css/CSSComputedStyleDeclaration.cpp</a></li>
<li><a href="#branchessafari601146branchSourceWebCorecssCSSParsercpp">branches/safari-601.1.46-branch/Source/WebCore/css/CSSParser.cpp</a></li>
<li><a href="#branchessafari601146branchSourceWebCorecssCSSPrimitiveValueMappingsh">branches/safari-601.1.46-branch/Source/WebCore/css/CSSPrimitiveValueMappings.h</a></li>
<li><a href="#branchessafari601146branchSourceWebCorecssCSSPropertyNamesin">branches/safari-601.1.46-branch/Source/WebCore/css/CSSPropertyNames.in</a></li>
<li><a href="#branchessafari601146branchSourceWebCorecssCSSValueKeywordsin">branches/safari-601.1.46-branch/Source/WebCore/css/CSSValueKeywords.in</a></li>
<li><a href="#branchessafari601146branchSourceWebCoredomElementcpp">branches/safari-601.1.46-branch/Source/WebCore/dom/Element.cpp</a></li>
<li><a href="#branchessafari601146branchSourceWebCoredomElementh">branches/safari-601.1.46-branch/Source/WebCore/dom/Element.h</a></li>
<li><a href="#branchessafari601146branchSourceWebCoredomNodeh">branches/safari-601.1.46-branch/Source/WebCore/dom/Node.h</a></li>
<li><a href="#branchessafari601146branchSourceWebCorerenderingstyleRenderStyleh">branches/safari-601.1.46-branch/Source/WebCore/rendering/style/RenderStyle.h</a></li>
<li><a href="#branchessafari601146branchSourceWebCorerenderingstyleRenderStyleConstantsh">branches/safari-601.1.46-branch/Source/WebCore/rendering/style/RenderStyleConstants.h</a></li>
<li><a href="#branchessafari601146branchSourceWebCorerenderingstyleStyleRareNonInheritedDatacpp">branches/safari-601.1.46-branch/Source/WebCore/rendering/style/StyleRareNonInheritedData.cpp</a></li>
<li><a href="#branchessafari601146branchSourceWebCorerenderingstyleStyleRareNonInheritedDatah">branches/safari-601.1.46-branch/Source/WebCore/rendering/style/StyleRareNonInheritedData.h</a></li>
<li><a href="#branchessafari601146branchSourceWebKit2ChangeLog">branches/safari-601.1.46-branch/Source/WebKit2/ChangeLog</a></li>
<li><a href="#branchessafari601146branchSourceWebKit2WebProcessWebPageiosWebPageIOSmm">branches/safari-601.1.46-branch/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li>branches/safari-601.1.46-branch/LayoutTests/css3/touch-action/</li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari601146branchLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/LayoutTests/ChangeLog (193555 => 193556)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/LayoutTests/ChangeLog 2015-12-06 06:14:18 UTC (rev 193555)
+++ branches/safari-601.1.46-branch/LayoutTests/ChangeLog 2015-12-06 06:16:59 UTC (rev 193556)
</span><span class="lines">@@ -1,5 +1,31 @@
</span><span class="cx"> 2015-12-05 Babak Shafiei <bshafiei@apple.com>
</span><span class="cx">
</span><ins>+ Merge r191452.
+
+ 2015-10-22 Wenson Hsieh <wenson_hsieh@apple.com>
+
+ Implement touch-action: manipulation; for iOS
+ https://bugs.webkit.org/show_bug.cgi?id=149854
+ <rdar://problem/23017145>
+
+ Reviewed by Benjamin Poulain.
+
+ Add tests to check that the manipulation and auto values of the touch-action property can be
+ properly parsed and can be obtained through computed style. Also tests that putting touch-action:
+ manipulation on an element and tapping repeatedly on it will fire clicks instead of recognizing
+ double taps and causing the viewport to zoom.
+
+ * TestExpectations:
+ * css3/touch-action/touch-action-computed-style-expected.txt: Added.
+ * css3/touch-action/touch-action-computed-style.html: Added.
+ * css3/touch-action/touch-action-manipulation-fast-clicks-expected.txt: Added.
+ * css3/touch-action/touch-action-manipulation-fast-clicks.html: Added.
+ * css3/touch-action/touch-action-parsing-expected.txt: Added.
+ * css3/touch-action/touch-action-parsing.html: Added.
+ * platform/ios-simulator-wk2/TestExpectations:
+
+2015-12-05 Babak Shafiei <bshafiei@apple.com>
+
</ins><span class="cx"> Merge r191072.
</span><span class="cx">
</span><span class="cx"> 2015-10-14 Wenson Hsieh <wenson_hsieh@apple.com>
</span></span></pre></div>
<a id="branchessafari601146branchLayoutTestsTestExpectations"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/LayoutTests/TestExpectations (193555 => 193556)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/LayoutTests/TestExpectations 2015-12-06 06:14:18 UTC (rev 193555)
+++ branches/safari-601.1.46-branch/LayoutTests/TestExpectations 2015-12-06 06:16:59 UTC (rev 193556)
</span><span class="lines">@@ -2,6 +2,16 @@
</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><ins>+#//////////////////////////////////////////////////////////////////////////////////////////
+# Platform-specific tests. Skipped here, then re-enabled on the appropriate platform.
+#//////////////////////////////////////////////////////////////////////////////////////////
+
+css3/touch-action [ Skip ]
+
+#//////////////////////////////////////////////////////////////////////////////////////////
+# End platform-specific tests.
+#//////////////////////////////////////////////////////////////////////////////////////////
+
</ins><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="branchessafari601146branchLayoutTestsplatformiossimulatorwk2TestExpectations"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/LayoutTests/platform/ios-simulator-wk2/TestExpectations (193555 => 193556)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/LayoutTests/platform/ios-simulator-wk2/TestExpectations 2015-12-06 06:14:18 UTC (rev 193555)
+++ branches/safari-601.1.46-branch/LayoutTests/platform/ios-simulator-wk2/TestExpectations 2015-12-06 06:16:59 UTC (rev 193556)
</span><span class="lines">@@ -2,6 +2,16 @@
</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><ins>+#//////////////////////////////////////////////////////////////////////////////////////////
+# Platform-specific directories. Skipped globally, then re-enabled here.
+#//////////////////////////////////////////////////////////////////////////////////////////
+
+css3/touch-action [ Pass ]
+
+#//////////////////////////////////////////////////////////////////////////////////////////
+# End platform-specific directories.
+#//////////////////////////////////////////////////////////////////////////////////////////
+
</ins><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="branchessafari601146branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/Source/WebCore/ChangeLog (193555 => 193556)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/Source/WebCore/ChangeLog 2015-12-06 06:14:18 UTC (rev 193555)
+++ branches/safari-601.1.46-branch/Source/WebCore/ChangeLog 2015-12-06 06:16:59 UTC (rev 193556)
</span><span class="lines">@@ -1,3 +1,48 @@
</span><ins>+2015-12-05 Babak Shafiei <bshafiei@apple.com>
+
+ Merge r191452.
+
+ 2015-10-22 Wenson Hsieh <wenson_hsieh@apple.com>
+
+ Implement touch-action: manipulation; for iOS
+ https://bugs.webkit.org/show_bug.cgi?id=149854
+ <rdar://problem/23017145>
+
+ Reviewed by Benjamin Poulain.
+
+ Implements the manipulation value for the CSS property touch-action. Adds support for
+ parsing the touch-action property and two of its values: auto and manipulation.
+
+ Tests: css3/touch-action/touch-action-computed-style.html
+ css3/touch-action/touch-action-manipulation-fast-clicks.html
+ css3/touch-action/touch-action-parsing.html
+
+ * css/CSSComputedStyleDeclaration.cpp:
+ (WebCore::ComputedStyleExtractor::propertyValue):
+ * css/CSSParser.cpp:
+ (WebCore::isValidKeywordPropertyAndValue):
+ (WebCore::isKeywordPropertyID):
+ (WebCore::CSSParser::parseValue):
+ * css/CSSPrimitiveValueMappings.h:
+ (WebCore::CSSPrimitiveValue::CSSPrimitiveValue):
+ (WebCore::CSSPrimitiveValue::operator TouchAction):
+ * css/CSSPropertyNames.in:
+ * css/CSSValueKeywords.in:
+ * dom/Element.cpp:
+ (WebCore::Element::allowsDoubleTapGesture): Here, we determine whether an element that resulted from
+ hit-testing a touch should allow double-tap gestures. To do this, we walk up the element's parents,
+ stopping when we detect an element that disallows double tap gestures by having a touch-action other
+ than auto or by hitting the root node.
+ * dom/Element.h:
+ * dom/Node.h:
+ (WebCore::Node::allowsDoubleTapGesture):
+ * rendering/style/RenderStyle.h:
+ * rendering/style/RenderStyleConstants.h:
+ * rendering/style/StyleRareNonInheritedData.cpp:
+ (WebCore::StyleRareNonInheritedData::StyleRareNonInheritedData):
+ (WebCore::StyleRareNonInheritedData::operator==):
+ * rendering/style/StyleRareNonInheritedData.h:
+
</ins><span class="cx"> 2015-12-05 David Kilzer <ddkilzer@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r192129. rdar://problem/23221177
</span></span></pre></div>
<a id="branchessafari601146branchSourceWebCorecssCSSComputedStyleDeclarationcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/Source/WebCore/css/CSSComputedStyleDeclaration.cpp (193555 => 193556)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/Source/WebCore/css/CSSComputedStyleDeclaration.cpp 2015-12-06 06:14:18 UTC (rev 193555)
+++ branches/safari-601.1.46-branch/Source/WebCore/css/CSSComputedStyleDeclaration.cpp 2015-12-06 06:16:59 UTC (rev 193556)
</span><span class="lines">@@ -2943,6 +2943,8 @@
</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><ins>+ case CSSPropertyTouchAction:
+ return cssValuePool().createValue(style->touchAction());
</ins><span class="cx"> #endif
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> case CSSPropertyWebkitTouchCallout:
</span></span></pre></div>
<a id="branchessafari601146branchSourceWebCorecssCSSParsercpp"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/Source/WebCore/css/CSSParser.cpp (193555 => 193556)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/Source/WebCore/css/CSSParser.cpp 2015-12-06 06:14:18 UTC (rev 193555)
+++ branches/safari-601.1.46-branch/Source/WebCore/css/CSSParser.cpp 2015-12-06 06:16:59 UTC (rev 193556)
</span><span class="lines">@@ -745,6 +745,12 @@
</span><span class="cx"> if (valueID == CSSValueNormal || valueID == CSSValueBreakWord)
</span><span class="cx"> return true;
</span><span class="cx"> break;
</span><ins>+#if ENABLE(TOUCH_EVENTS)
+ case CSSPropertyTouchAction: // auto | manipulation
+ if (valueID == CSSValueAuto || valueID == CSSValueManipulation)
+ return true;
+ break;
+#endif
</ins><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">@@ -1160,6 +1166,9 @@
</span><span class="cx"> case CSSPropertyWhiteSpace:
</span><span class="cx"> case CSSPropertyWordBreak:
</span><span class="cx"> case CSSPropertyWordWrap:
</span><ins>+#if ENABLE(TOUCH_EVENTS)
+ case CSSPropertyTouchAction:
+#endif
</ins><span class="cx"> #if ENABLE(CSS_SCROLL_SNAP)
</span><span class="cx"> case CSSPropertyWebkitScrollSnapType:
</span><span class="cx"> #endif
</span><span class="lines">@@ -3149,6 +3158,9 @@
</span><span class="cx"> case CSSPropertyWhiteSpace:
</span><span class="cx"> case CSSPropertyWordBreak:
</span><span class="cx"> case CSSPropertyWordWrap:
</span><ins>+#if ENABLE(TOUCH_EVENTS)
+ case CSSPropertyTouchAction:
+#endif
</ins><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="branchessafari601146branchSourceWebCorecssCSSPrimitiveValueMappingsh"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/Source/WebCore/css/CSSPrimitiveValueMappings.h (193555 => 193556)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/Source/WebCore/css/CSSPrimitiveValueMappings.h 2015-12-06 06:14:18 UTC (rev 193555)
+++ branches/safari-601.1.46-branch/Source/WebCore/css/CSSPrimitiveValueMappings.h 2015-12-06 06:16:59 UTC (rev 193556)
</span><span class="lines">@@ -5254,6 +5254,37 @@
</span><span class="cx"> return ContentDistributionStretch;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+#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
+
</ins><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="branchessafari601146branchSourceWebCorecssCSSPropertyNamesin"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/Source/WebCore/css/CSSPropertyNames.in (193555 => 193556)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/Source/WebCore/css/CSSPropertyNames.in 2015-12-06 06:14:18 UTC (rev 193555)
+++ branches/safari-601.1.46-branch/Source/WebCore/css/CSSPropertyNames.in 2015-12-06 06:16:59 UTC (rev 193556)
</span><span class="lines">@@ -656,6 +656,9 @@
</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><ins>+#if defined(ENABLE_TOUCH_EVENTS) && ENABLE_TOUCH_EVENTS
+touch-action
+#endif
</ins><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="branchessafari601146branchSourceWebCorecssCSSValueKeywordsin"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/Source/WebCore/css/CSSValueKeywords.in (193555 => 193556)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/Source/WebCore/css/CSSValueKeywords.in 2015-12-06 06:14:18 UTC (rev 193555)
+++ branches/safari-601.1.46-branch/Source/WebCore/css/CSSValueKeywords.in 2015-12-06 06:16:59 UTC (rev 193556)
</span><span class="lines">@@ -1135,3 +1135,8 @@
</span><span class="cx"> // will-change
</span><span class="cx"> scroll-position
</span><span class="cx"> contents
</span><ins>+
+#if defined(ENABLE_TOUCH_EVENTS) && ENABLE_TOUCH_EVENTS
+// touch-action
+manipulation
+#endif
</ins></span></pre></div>
<a id="branchessafari601146branchSourceWebCoredomElementcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/Source/WebCore/dom/Element.cpp (193555 => 193556)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/Source/WebCore/dom/Element.cpp 2015-12-06 06:14:18 UTC (rev 193555)
+++ branches/safari-601.1.46-branch/Source/WebCore/dom/Element.cpp 2015-12-06 06:16:59 UTC (rev 193556)
</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-2014 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2004-2015 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,6 +1369,17 @@
</span><span class="cx"> return document().completeURL(stripLeadingAndTrailingHTMLSpaces(linkAttribute));
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+#if ENABLE(TOUCH_EVENTS)
+bool Element::allowsDoubleTapGesture() const
+{
+ if (renderStyle() && renderStyle()->touchAction() != TouchAction::Auto)
+ return false;
+
+ Element* parent = parentElement();
+ return !parent || parent->allowsDoubleTapGesture();
+}
+#endif
+
</ins><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="branchessafari601146branchSourceWebCoredomElementh"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/Source/WebCore/dom/Element.h (193555 => 193556)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/Source/WebCore/dom/Element.h 2015-12-06 06:14:18 UTC (rev 193555)
+++ branches/safari-601.1.46-branch/Source/WebCore/dom/Element.h 2015-12-06 06:16:59 UTC (rev 193556)
</span><span class="lines">@@ -485,6 +485,10 @@
</span><span class="cx">
</span><span class="cx"> WEBCORE_EXPORT URL absoluteLinkURL() const;
</span><span class="cx">
</span><ins>+#if ENABLE(TOUCH_EVENTS)
+ virtual bool allowsDoubleTapGesture() const override;
+#endif
+
</ins><span class="cx"> protected:
</span><span class="cx"> Element(const QualifiedName&, Document&, ConstructionType);
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari601146branchSourceWebCoredomNodeh"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/Source/WebCore/dom/Node.h (193555 => 193556)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/Source/WebCore/dom/Node.h 2015-12-06 06:14:18 UTC (rev 193555)
+++ branches/safari-601.1.46-branch/Source/WebCore/dom/Node.h 2015-12-06 06:16:59 UTC (rev 193556)
</span><span class="lines">@@ -528,6 +528,10 @@
</span><span class="cx"> void dispatchSubtreeModifiedEvent();
</span><span class="cx"> bool dispatchDOMActivateEvent(int detail, PassRefPtr<Event> underlyingEvent);
</span><span class="cx">
</span><ins>+#if ENABLE(TOUCH_EVENTS)
+ virtual bool allowsDoubleTapGesture() const { return true; }
+#endif
+
</ins><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="branchessafari601146branchSourceWebCorerenderingstyleRenderStyleh"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/Source/WebCore/rendering/style/RenderStyle.h (193555 => 193556)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/Source/WebCore/rendering/style/RenderStyle.h 2015-12-06 06:14:18 UTC (rev 193555)
+++ branches/safari-601.1.46-branch/Source/WebCore/rendering/style/RenderStyle.h 2015-12-06 06:16:59 UTC (rev 193556)
</span><span class="lines">@@ -1107,6 +1107,10 @@
</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><ins>+#if ENABLE(TOUCH_EVENTS)
+ TouchAction touchAction() const { return static_cast<TouchAction>(rareNonInheritedData->m_touchAction); }
+#endif
+
</ins><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">@@ -1663,6 +1667,10 @@
</span><span class="cx">
</span><span class="cx"> void setInitialLetter(const IntSize& size) { SET_VAR(rareNonInheritedData, m_initialLetter, size); }
</span><span class="cx">
</span><ins>+#if ENABLE(TOUCH_EVENTS)
+ void setTouchAction(TouchAction touchAction) { SET_VAR(rareNonInheritedData, m_touchAction, static_cast<unsigned>(touchAction)); }
+#endif
+
</ins><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">@@ -2016,6 +2024,10 @@
</span><span class="cx">
</span><span class="cx"> static WillChangeData* initialWillChange() { return nullptr; }
</span><span class="cx">
</span><ins>+#if ENABLE(TOUCH_EVENTS)
+ static TouchAction initialTouchAction() { return TouchAction::Auto; }
+#endif
+
</ins><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="branchessafari601146branchSourceWebCorerenderingstyleRenderStyleConstantsh"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/Source/WebCore/rendering/style/RenderStyleConstants.h (193555 => 193556)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/Source/WebCore/rendering/style/RenderStyleConstants.h 2015-12-06 06:14:18 UTC (rev 193555)
+++ branches/safari-601.1.46-branch/Source/WebCore/rendering/style/RenderStyleConstants.h 2015-12-06 06:16:59 UTC (rev 193556)
</span><span class="lines">@@ -637,6 +637,13 @@
</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><ins>+#if ENABLE(TOUCH_EVENTS)
+enum class TouchAction {
+ Auto,
+ Manipulation
+};
+#endif
+
</ins><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="branchessafari601146branchSourceWebCorerenderingstyleStyleRareNonInheritedDatacpp"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/Source/WebCore/rendering/style/StyleRareNonInheritedData.cpp (193555 => 193556)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/Source/WebCore/rendering/style/StyleRareNonInheritedData.cpp 2015-12-06 06:14:18 UTC (rev 193555)
+++ branches/safari-601.1.46-branch/Source/WebCore/rendering/style/StyleRareNonInheritedData.cpp 2015-12-06 06:16:59 UTC (rev 193556)
</span><span class="lines">@@ -77,6 +77,9 @@
</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><ins>+#if ENABLE(TOUCH_EVENTS)
+ , m_touchAction(static_cast<unsigned>(RenderStyle::initialTouchAction()))
+#endif
</ins><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">@@ -166,6 +169,9 @@
</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><ins>+#if ENABLE(TOUCH_EVENTS)
+ , m_touchAction(o.m_touchAction)
+#endif
</ins><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">@@ -280,6 +286,9 @@
</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><ins>+#if ENABLE(TOUCH_EVENTS)
+ && m_touchAction == o.m_touchAction
+#endif
</ins><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="branchessafari601146branchSourceWebCorerenderingstyleStyleRareNonInheritedDatah"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/Source/WebCore/rendering/style/StyleRareNonInheritedData.h (193555 => 193556)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/Source/WebCore/rendering/style/StyleRareNonInheritedData.h 2015-12-06 06:14:18 UTC (rev 193555)
+++ branches/safari-601.1.46-branch/Source/WebCore/rendering/style/StyleRareNonInheritedData.h 2015-12-06 06:16:59 UTC (rev 193556)
</span><span class="lines">@@ -189,6 +189,10 @@
</span><span class="cx"> StyleSelfAlignmentData m_justifyItems;
</span><span class="cx"> StyleSelfAlignmentData m_justifySelf;
</span><span class="cx">
</span><ins>+#if ENABLE(TOUCH_EVENTS)
+ unsigned m_touchAction : 1; // TouchAction
+#endif
+
</ins><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="branchessafari601146branchSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/Source/WebKit2/ChangeLog (193555 => 193556)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/Source/WebKit2/ChangeLog 2015-12-06 06:14:18 UTC (rev 193555)
+++ branches/safari-601.1.46-branch/Source/WebKit2/ChangeLog 2015-12-06 06:16:59 UTC (rev 193556)
</span><span class="lines">@@ -1,5 +1,25 @@
</span><span class="cx"> 2015-12-05 Babak Shafiei <bshafiei@apple.com>
</span><span class="cx">
</span><ins>+ Merge r191452.
+
+ 2015-10-22 Wenson Hsieh <wenson_hsieh@apple.com>
+
+ Implement touch-action: manipulation; for iOS
+ https://bugs.webkit.org/show_bug.cgi?id=149854
+ <rdar://problem/23017145>
+
+ Reviewed by Benjamin Poulain.
+
+ Implements the manipulation value for the CSS property touch-action. Performs hit-testing upon receiving a potential
+ tap to determine whether to disable double-tap gesture recognition over the duration of the tap. If so, sends a message
+ from the web process to the UI process indicating that double-tapping should be disabled, allowing single taps to
+ avoid the delay.
+
+ * WebProcess/WebPage/ios/WebPageIOS.mm:
+ (WebKit::WebPage::potentialTapAtPosition):
+
+2015-12-05 Babak Shafiei <bshafiei@apple.com>
+
</ins><span class="cx"> Merge r191409.
</span><span class="cx">
</span><span class="cx"> 2015-10-21 Wenson Hsieh <wenson_hsieh@apple.com>
</span></span></pre></div>
<a id="branchessafari601146branchSourceWebKit2WebProcessWebPageiosWebPageIOSmm"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm (193555 => 193556)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm 2015-12-06 06:14:18 UTC (rev 193555)
+++ branches/safari-601.1.46-branch/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm 2015-12-06 06:16:59 UTC (rev 193556)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2012-2014 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2012-2015 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,6 +663,12 @@
</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><ins>+#if ENABLE(TOUCH_EVENTS)
+ if (!m_potentialTapNode->allowsDoubleTapGesture()) {
+ send(Messages::WebPageProxy::DisableDoubleTapGesturesUntilTapIsFinishedIfNecessary(requestID, false, FloatRect(), false, 0, 0));
+ return;
+ }
+#endif
</ins><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>