Diff
Modified: branches/safari-601-branch/LayoutTests/ChangeLog (193566 => 193567)
--- 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)
@@ -1,3 +1,7 @@
+2015-12-05 Matthew Hanson <matthew_han...@apple.com>
+
+ Rollout r193478. rdar://problem/23732400
+
2015-12-05 David Kilzer <ddkil...@apple.com>
Merge r191981. rdar://problem/23732379
Modified: branches/safari-601-branch/LayoutTests/TestExpectations (193566 => 193567)
--- 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)
@@ -2,16 +2,6 @@
#
# See http://trac.webkit.org/wiki/TestExpectations for more information on this file.
-#//////////////////////////////////////////////////////////////////////////////////////////
-# Platform-specific tests. Skipped here, then re-enabled on the appropriate platform.
-#//////////////////////////////////////////////////////////////////////////////////////////
-
-css3/touch-action [ Skip ]
-
-#//////////////////////////////////////////////////////////////////////////////////////////
-# End platform-specific tests.
-#//////////////////////////////////////////////////////////////////////////////////////////
-
# pending functional patch and per-port verification
webkit.org/b/109954 css3/line-break [ Skip ]
Deleted: branches/safari-601-branch/LayoutTests/css3/touch-action/touch-action-computed-style-expected.txt (193566 => 193567)
--- 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)
@@ -1,22 +0,0 @@
-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".
Deleted: branches/safari-601-branch/LayoutTests/css3/touch-action/touch-action-computed-style.html (193566 => 193567)
--- 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)
@@ -1,61 +0,0 @@
-<html>
- <head>
- <script src=""
- </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=""
- </body>
-</html>
Deleted: branches/safari-601-branch/LayoutTests/css3/touch-action/touch-action-manipulation-fast-clicks-expected.txt (193566 => 193567)
--- 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)
@@ -1,12 +0,0 @@
-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!
-
Deleted: branches/safari-601-branch/LayoutTests/css3/touch-action/touch-action-manipulation-fast-clicks.html (193566 => 193567)
--- 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)
@@ -1,59 +0,0 @@
-<!DOCTYPE html> <!-- webkit-test-runner [ useFlexibleViewport=true ] -->
-
-<html>
-<meta name="viewport" content="initial-scale=1.0">
-
-<head>
- <script src=""
- <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=""
-</body>
-
-</html>
Deleted: branches/safari-601-branch/LayoutTests/css3/touch-action/touch-action-parsing-expected.txt (193566 => 193567)
--- 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)
@@ -1,12 +0,0 @@
-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".
Deleted: branches/safari-601-branch/LayoutTests/css3/touch-action/touch-action-parsing.html (193566 => 193567)
--- 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)
@@ -1,31 +0,0 @@
-<html>
- <head>
- <script src=""
- </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=""
- </body>
-</html>
Modified: branches/safari-601-branch/LayoutTests/platform/ios-simulator-wk2/TestExpectations (193566 => 193567)
--- 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)
@@ -2,16 +2,6 @@
#
# See http://trac.webkit.org/wiki/TestExpectations for more information on this file.
-#//////////////////////////////////////////////////////////////////////////////////////////
-# Platform-specific directories. Skipped globally, then re-enabled here.
-#//////////////////////////////////////////////////////////////////////////////////////////
-
-css3/touch-action [ Pass ]
-
-#//////////////////////////////////////////////////////////////////////////////////////////
-# End platform-specific directories.
-#//////////////////////////////////////////////////////////////////////////////////////////
-
# Animation tests that fail:
webkit.org/b/129562 [ Debug ] animations/animation-direction-reverse-fill-mode.html [ Skip ]
webkit.org/b/129562 [ Debug ] animations/fill-mode-reverse.html [ Skip ]
Modified: branches/safari-601-branch/Source/WebCore/ChangeLog (193566 => 193567)
--- 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)
@@ -1,3 +1,7 @@
+2015-12-05 Matthew Hanson <matthew_han...@apple.com>
+
+ Rollout r193478. rdar://problem/23732400
+
2015-12-05 David Kilzer <ddkil...@apple.com>
Merge r192129. rdar://problem/23732379
Modified: branches/safari-601-branch/Source/WebCore/css/CSSComputedStyleDeclaration.cpp (193566 => 193567)
--- 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)
@@ -2969,8 +2969,6 @@
#if ENABLE(TOUCH_EVENTS)
case CSSPropertyWebkitTapHighlightColor:
return currentColorOrValidColor(style.get(), style->tapHighlightColor());
- case CSSPropertyTouchAction:
- return cssValuePool.createValue(style->touchAction());
#endif
#if PLATFORM(IOS)
case CSSPropertyWebkitTouchCallout:
Modified: branches/safari-601-branch/Source/WebCore/css/CSSParser.cpp (193566 => 193567)
--- 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)
@@ -749,12 +749,6 @@
if (valueID == CSSValueNormal || valueID == CSSValueBreakWord)
return true;
break;
-#if ENABLE(TOUCH_EVENTS)
- case CSSPropertyTouchAction: // auto | manipulation
- if (valueID == CSSValueAuto || valueID == CSSValueManipulation)
- return true;
- break;
-#endif
#if ENABLE(CSS_SCROLL_SNAP)
case CSSPropertyWebkitScrollSnapType: // none | mandatory | proximity
if (valueID == CSSValueNone || valueID == CSSValueMandatory || valueID == CSSValueProximity)
@@ -1170,9 +1164,6 @@
case CSSPropertyWhiteSpace:
case CSSPropertyWordBreak:
case CSSPropertyWordWrap:
-#if ENABLE(TOUCH_EVENTS)
- case CSSPropertyTouchAction:
-#endif
#if ENABLE(CSS_SCROLL_SNAP)
case CSSPropertyWebkitScrollSnapType:
#endif
@@ -3229,9 +3220,6 @@
case CSSPropertyWhiteSpace:
case CSSPropertyWordBreak:
case CSSPropertyWordWrap:
-#if ENABLE(TOUCH_EVENTS)
- case CSSPropertyTouchAction:
-#endif
#if ENABLE(CSS_SCROLL_SNAP)
case CSSPropertyWebkitScrollSnapType:
#endif
Modified: branches/safari-601-branch/Source/WebCore/css/CSSPrimitiveValueMappings.h (193566 => 193567)
--- 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)
@@ -5254,37 +5254,6 @@
return ContentDistributionStretch;
}
-#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
-
#if ENABLE(CSS_SCROLL_SNAP)
template<> inline CSSPrimitiveValue::CSSPrimitiveValue(ScrollSnapType e)
: CSSValue(PrimitiveClass)
Modified: branches/safari-601-branch/Source/WebCore/css/CSSPropertyNames.in (193566 => 193567)
--- 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)
@@ -657,9 +657,6 @@
#if defined(ENABLE_ACCELERATED_OVERFLOW_SCROLLING) && ENABLE_ACCELERATED_OVERFLOW_SCROLLING
-webkit-overflow-scrolling [Inherited, NameForMethods=UseTouchOverflowScrolling, Converter=OverflowScrolling]
#endif
-#if defined(ENABLE_TOUCH_EVENTS) && ENABLE_TOUCH_EVENTS
-touch-action
-#endif
#if defined(WTF_PLATFORM_IOS) && WTF_PLATFORM_IOS
-webkit-touch-callout [Inherited, NameForMethods=TouchCalloutEnabled, Converter=TouchCallout]
#endif
Modified: branches/safari-601-branch/Source/WebCore/css/CSSValueKeywords.in (193566 => 193567)
--- 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)
@@ -1138,8 +1138,3 @@
// will-change
scroll-position
contents
-
-#if defined(ENABLE_TOUCH_EVENTS) && ENABLE_TOUCH_EVENTS
-// touch-action
-manipulation
-#endif
Modified: branches/safari-601-branch/Source/WebCore/dom/Element.cpp (193566 => 193567)
--- 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)
@@ -4,7 +4,7 @@
* (C) 2001 Peter Kelly (p...@post.com)
* (C) 2001 Dirk Mueller (muel...@kde.org)
* (C) 2007 David Smith (catfish....@gmail.com)
- * Copyright (C) 2004-2015 Apple Inc. All rights reserved.
+ * Copyright (C) 2004-2014 Apple Inc. All rights reserved.
* (C) 2007 Eric Seidel (e...@webkit.org)
*
* This library is free software; you can redistribute it and/or
@@ -1369,17 +1369,6 @@
return document().completeURL(stripLeadingAndTrailingHTMLSpaces(linkAttribute));
}
-#if ENABLE(TOUCH_EVENTS)
-bool Element::allowsDoubleTapGesture() const
-{
- if (renderStyle() && renderStyle()->touchAction() != TouchAction::Auto)
- return false;
-
- Element* parent = parentElement();
- return !parent || parent->allowsDoubleTapGesture();
-}
-#endif
-
// Returns true is the given attribute is an event handler.
// We consider an event handler any attribute that begins with "on".
// It is a simple solution that has the advantage of not requiring any
Modified: branches/safari-601-branch/Source/WebCore/dom/Element.h (193566 => 193567)
--- 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)
@@ -485,10 +485,6 @@
WEBCORE_EXPORT URL absoluteLinkURL() const;
-#if ENABLE(TOUCH_EVENTS)
- virtual bool allowsDoubleTapGesture() const override;
-#endif
-
protected:
Element(const QualifiedName&, Document&, ConstructionType);
Modified: branches/safari-601-branch/Source/WebCore/dom/Node.h (193566 => 193567)
--- 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)
@@ -528,10 +528,6 @@
void dispatchSubtreeModifiedEvent();
bool dispatchDOMActivateEvent(int detail, PassRefPtr<Event> underlyingEvent);
-#if ENABLE(TOUCH_EVENTS)
- virtual bool allowsDoubleTapGesture() const { return true; }
-#endif
-
#if ENABLE(TOUCH_EVENTS) && !PLATFORM(IOS)
bool dispatchTouchEvent(PassRefPtr<TouchEvent>);
#endif
Modified: branches/safari-601-branch/Source/WebCore/rendering/style/RenderStyle.h (193566 => 193567)
--- 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)
@@ -1112,10 +1112,6 @@
int initialLetterDrop() const { return initialLetter().width(); }
int initialLetterHeight() const { return initialLetter().height(); }
-#if ENABLE(TOUCH_EVENTS)
- TouchAction touchAction() const { return static_cast<TouchAction>(rareNonInheritedData->m_touchAction); }
-#endif
-
#if ENABLE(CSS_SCROLL_SNAP)
ScrollSnapType scrollSnapType() const { return static_cast<ScrollSnapType>(rareNonInheritedData->m_scrollSnapType); }
const ScrollSnapPoints* scrollSnapPointsX() const;
@@ -1674,10 +1670,6 @@
void setInitialLetter(const IntSize& size) { SET_VAR(rareNonInheritedData, m_initialLetter, size); }
-#if ENABLE(TOUCH_EVENTS)
- void setTouchAction(TouchAction touchAction) { SET_VAR(rareNonInheritedData, m_touchAction, static_cast<unsigned>(touchAction)); }
-#endif
-
#if ENABLE(CSS_SCROLL_SNAP)
void setScrollSnapType(ScrollSnapType type) { SET_VAR(rareNonInheritedData, m_scrollSnapType, static_cast<unsigned>(type)); }
void setScrollSnapPointsX(std::unique_ptr<ScrollSnapPoints>);
@@ -2031,10 +2023,6 @@
static WillChangeData* initialWillChange() { return nullptr; }
-#if ENABLE(TOUCH_EVENTS)
- static TouchAction initialTouchAction() { return TouchAction::Auto; }
-#endif
-
#if ENABLE(CSS_SCROLL_SNAP)
static ScrollSnapType initialScrollSnapType() { return ScrollSnapType::None; }
static ScrollSnapPoints* initialScrollSnapPointsX() { return nullptr; }
Modified: branches/safari-601-branch/Source/WebCore/rendering/style/RenderStyleConstants.h (193566 => 193567)
--- 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)
@@ -637,13 +637,6 @@
// Fill, Stroke, ViewBox are just used for SVG.
enum CSSBoxType { BoxMissing = 0, MarginBox, BorderBox, PaddingBox, ContentBox, Fill, Stroke, ViewBox };
-#if ENABLE(TOUCH_EVENTS)
-enum class TouchAction {
- Auto,
- Manipulation
-};
-#endif
-
#if ENABLE(CSS_SCROLL_SNAP)
enum class ScrollSnapType {
None,
Modified: branches/safari-601-branch/Source/WebCore/rendering/style/StyleRareNonInheritedData.cpp (193566 => 193567)
--- 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)
@@ -77,9 +77,6 @@
, m_justifyContent(RenderStyle::initialContentAlignment())
, m_justifyItems(RenderStyle::initialSelfAlignment())
, m_justifySelf(RenderStyle::initialSelfAlignment())
-#if ENABLE(TOUCH_EVENTS)
- , m_touchAction(static_cast<unsigned>(RenderStyle::initialTouchAction()))
-#endif
#if ENABLE(CSS_SCROLL_SNAP)
, m_scrollSnapType(static_cast<unsigned>(RenderStyle::initialScrollSnapType()))
#endif
@@ -169,9 +166,6 @@
, m_justifyContent(o.m_justifyContent)
, m_justifyItems(o.m_justifyItems)
, m_justifySelf(o.m_justifySelf)
-#if ENABLE(TOUCH_EVENTS)
- , m_touchAction(o.m_touchAction)
-#endif
#if ENABLE(CSS_SCROLL_SNAP)
, m_scrollSnapType(o.m_scrollSnapType)
#endif
@@ -286,9 +280,6 @@
&& m_borderFit == o.m_borderFit
&& m_textCombine == o.m_textCombine
&& m_textDecorationStyle == o.m_textDecorationStyle
-#if ENABLE(TOUCH_EVENTS)
- && m_touchAction == o.m_touchAction
-#endif
#if ENABLE(CSS_SCROLL_SNAP)
&& m_scrollSnapType == o.m_scrollSnapType
#endif
Modified: branches/safari-601-branch/Source/WebCore/rendering/style/StyleRareNonInheritedData.h (193566 => 193567)
--- 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)
@@ -189,10 +189,6 @@
StyleSelfAlignmentData m_justifyItems;
StyleSelfAlignmentData m_justifySelf;
-#if ENABLE(TOUCH_EVENTS)
- unsigned m_touchAction : 1; // TouchAction
-#endif
-
#if ENABLE(CSS_SCROLL_SNAP)
unsigned m_scrollSnapType : 2; // ScrollSnapType
#endif
Modified: branches/safari-601-branch/Source/WebKit2/ChangeLog (193566 => 193567)
--- 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)
@@ -1,3 +1,7 @@
+2015-12-05 Matthew Hanson <matthew_han...@apple.com>
+
+ Rollout r193478. rdar://problem/23732400
+
2015-12-04 Matthew Hanson <matthew_han...@apple.com>
Merge r191452. rdar://problem/23732400
Modified: branches/safari-601-branch/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm (193566 => 193567)
--- 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)
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2012-2015 Apple Inc. All rights reserved.
+ * Copyright (C) 2012-2014 Apple Inc. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -663,12 +663,6 @@
m_potentialTapNode = m_page->mainFrame().nodeRespondingToClickEvents(position, m_potentialTapLocation);
sendTapHighlightForNodeIfNecessary(requestID, m_potentialTapNode.get());
if (m_potentialTapNode) {
-#if ENABLE(TOUCH_EVENTS)
- if (!m_potentialTapNode->allowsDoubleTapGesture()) {
- send(Messages::WebPageProxy::DisableDoubleTapGesturesUntilTapIsFinishedIfNecessary(requestID, false, FloatRect(), false, 0, 0));
- return;
- }
-#endif
FloatPoint origin = position;
FloatRect renderRect;
bool isReplaced;
