Diff
Modified: tags/Safari-606.1.8/LayoutTests/ChangeLog (229434 => 229435)
--- tags/Safari-606.1.8/LayoutTests/ChangeLog 2018-03-08 22:15:11 UTC (rev 229434)
+++ tags/Safari-606.1.8/LayoutTests/ChangeLog 2018-03-08 22:47:50 UTC (rev 229435)
@@ -1,3 +1,7 @@
+2018-03-08 Kocsen Chung <[email protected]>
+
+ Revert r229310. rdar://problem/37764380
+
2018-03-07 Yusuke Suzuki <[email protected]>
HTML `pattern` attribute should set `u` flag for regular expressions
Modified: tags/Safari-606.1.8/LayoutTests/js/dom/dom-static-property-for-in-iteration-expected.txt (229434 => 229435)
--- tags/Safari-606.1.8/LayoutTests/js/dom/dom-static-property-for-in-iteration-expected.txt 2018-03-08 22:15:11 UTC (rev 229434)
+++ tags/Safari-606.1.8/LayoutTests/js/dom/dom-static-property-for-in-iteration-expected.txt 2018-03-08 22:47:50 UTC (rev 229435)
@@ -134,15 +134,8 @@
PASS a["clientHeight"] is 0
PASS a["innerHTML"] is nerget
PASS a["outerHTML"] is <a id="foo" href=""
-PASS a["onaccessiblecontextmenu"] is null
PASS a["onaccessibleclick"] is null
-PASS a["onaccessibledecrement"] is null
-PASS a["onaccessibledismiss"] is null
-PASS a["onaccessiblefocus"] is null
-PASS a["onaccessibleincrement"] is null
-PASS a["onaccessiblescrollintoview"] is null
PASS a["onaccessiblesetvalue"] is null
-PASS a["onaccessibleselect"] is null
PASS a["oncopy"] is null
PASS a["oncut"] is null
PASS a["onpaste"] is null
Modified: tags/Safari-606.1.8/LayoutTests/platform/mac-wk1/TestExpectations (229434 => 229435)
--- tags/Safari-606.1.8/LayoutTests/platform/mac-wk1/TestExpectations 2018-03-08 22:15:11 UTC (rev 229434)
+++ tags/Safari-606.1.8/LayoutTests/platform/mac-wk1/TestExpectations 2018-03-08 22:47:50 UTC (rev 229435)
@@ -494,7 +494,6 @@
webkit.org/b/172044 [ Debug ] imported/w3c/web-platform-tests/IndexedDB/open-request-queue.html [ Pass Timeout ]
webkit.org/b/180898 accessibility/mac/AOM-events.html [ Skip ]
-webkit.org/b/183023 accessibility/mac/AOM-events-all.html [ Skip ]
webkit.org/b/182752 accessibility/mac/accessibility-make-first-responder.html [ Skip ]
Modified: tags/Safari-606.1.8/Source/WebCore/ChangeLog (229434 => 229435)
--- tags/Safari-606.1.8/Source/WebCore/ChangeLog 2018-03-08 22:15:11 UTC (rev 229434)
+++ tags/Safari-606.1.8/Source/WebCore/ChangeLog 2018-03-08 22:47:50 UTC (rev 229435)
@@ -1,3 +1,7 @@
+2018-03-08 Kocsen Chung <[email protected]>
+
+ Revert r229310. rdar://problem/37764380
+
2018-03-07 Yusuke Suzuki <[email protected]>
HTML `pattern` attribute should set `u` flag for regular expressions
Modified: tags/Safari-606.1.8/Source/WebCore/accessibility/AccessibilityListBoxOption.cpp (229434 => 229435)
--- tags/Safari-606.1.8/Source/WebCore/accessibility/AccessibilityListBoxOption.cpp 2018-03-08 22:15:11 UTC (rev 229434)
+++ tags/Safari-606.1.8/Source/WebCore/accessibility/AccessibilityListBoxOption.cpp 2018-03-08 22:47:50 UTC (rev 229435)
@@ -177,9 +177,6 @@
if (!canSetSelectedAttribute())
return;
- if (selected && dispatchAccessibilityEventWithType(AccessibilityEventType::Select))
- return;
-
bool isOptionSelected = isSelected();
if ((isOptionSelected && selected) || (!isOptionSelected && !selected))
return;
Modified: tags/Safari-606.1.8/Source/WebCore/accessibility/AccessibilityMediaObject.cpp (229434 => 229435)
--- tags/Safari-606.1.8/Source/WebCore/accessibility/AccessibilityMediaObject.cpp 2018-03-08 22:15:11 UTC (rev 229434)
+++ tags/Safari-606.1.8/Source/WebCore/accessibility/AccessibilityMediaObject.cpp 2018-03-08 22:47:50 UTC (rev 229435)
@@ -107,15 +107,11 @@
void AccessibilityMediaObject::increment()
{
- if (dispatchAccessibilityEventWithType(AccessibilityEventType::Increment))
- return;
mediaSeek(AXSeekForward);
}
void AccessibilityMediaObject::decrement()
{
- if (dispatchAccessibilityEventWithType(AccessibilityEventType::Decrement))
- return;
mediaSeek(AXSeekBackward);
}
Modified: tags/Safari-606.1.8/Source/WebCore/accessibility/AccessibilityMenuListOption.cpp (229434 => 229435)
--- tags/Safari-606.1.8/Source/WebCore/accessibility/AccessibilityMenuListOption.cpp 2018-03-08 22:15:11 UTC (rev 229434)
+++ tags/Safari-606.1.8/Source/WebCore/accessibility/AccessibilityMenuListOption.cpp 2018-03-08 22:47:50 UTC (rev 229435)
@@ -82,9 +82,6 @@
{
if (!canSetSelectedAttribute())
return;
-
- if (selected && dispatchAccessibilityEventWithType(AccessibilityEventType::Select))
- return;
downcast<HTMLOptionElement>(*m_element).setSelected(selected);
}
Modified: tags/Safari-606.1.8/Source/WebCore/accessibility/AccessibilityNodeObject.cpp (229434 => 229435)
--- tags/Safari-606.1.8/Source/WebCore/accessibility/AccessibilityNodeObject.cpp 2018-03-08 22:15:11 UTC (rev 229434)
+++ tags/Safari-606.1.8/Source/WebCore/accessibility/AccessibilityNodeObject.cpp 2018-03-08 22:47:50 UTC (rev 229435)
@@ -1072,8 +1072,6 @@
void AccessibilityNodeObject::increment()
{
- if (dispatchAccessibilityEventWithType(AccessibilityEventType::Increment))
- return;
UserGestureIndicator gestureIndicator(ProcessingUserGesture, document());
alterSliderValue(true);
}
@@ -1080,8 +1078,6 @@
void AccessibilityNodeObject::decrement()
{
- if (dispatchAccessibilityEventWithType(AccessibilityEventType::Decrement))
- return;
UserGestureIndicator gestureIndicator(ProcessingUserGesture, document());
alterSliderValue(false);
}
Modified: tags/Safari-606.1.8/Source/WebCore/accessibility/AccessibilityObject.cpp (229434 => 229435)
--- tags/Safari-606.1.8/Source/WebCore/accessibility/AccessibilityObject.cpp 2018-03-08 22:15:11 UTC (rev 229434)
+++ tags/Safari-606.1.8/Source/WebCore/accessibility/AccessibilityObject.cpp 2018-03-08 22:47:50 UTC (rev 229435)
@@ -997,7 +997,8 @@
// dispatch accessibleclick event
if (auto* cache = axObjectCache()) {
if (auto* pressObject = cache->getOrCreate(pressElement)) {
- if (pressObject->dispatchAccessibilityEventWithType(AccessibilityEventType::Click))
+ auto event = Event::create(eventNames().accessibleclickEvent, true, true);
+ if (pressObject->dispatchAccessibilityEvent(event))
return true;
}
}
@@ -2152,12 +2153,10 @@
return nullAtom();
}
-bool AccessibilityObject::dispatchAccessibilityEvent(Event& event) const
+bool AccessibilityObject::dispatchAccessibilityEvent(Event& event)
{
Vector<Element*> eventPath;
for (auto* parentObject = this; parentObject; parentObject = parentObject->parentObject()) {
- if (parentObject->isWebArea())
- break;
if (auto* parentElement = parentObject->element())
eventPath.append(parentElement);
}
@@ -2168,44 +2167,8 @@
return event.defaultPrevented();
}
-bool AccessibilityObject::dispatchAccessibilityEventWithType(AccessibilityEventType type) const
+bool AccessibilityObject::dispatchAccessibleSetValueEvent(const String& value)
{
- AtomicString eventName;
- switch (type) {
- case AccessibilityEventType::ContextMenu:
- eventName = eventNames().accessiblecontextmenuEvent;
- break;
- case AccessibilityEventType::Click:
- eventName = eventNames().accessibleclickEvent;
- break;
- case AccessibilityEventType::Decrement:
- eventName = eventNames().accessibledecrementEvent;
- break;
- case AccessibilityEventType::Dismiss:
- eventName = eventNames().accessibledismissEvent;
- break;
- case AccessibilityEventType::Focus:
- eventName = eventNames().accessiblefocusEvent;
- break;
- case AccessibilityEventType::Increment:
- eventName = eventNames().accessibleincrementEvent;
- break;
- case AccessibilityEventType::ScrollIntoView:
- eventName = eventNames().accessiblescrollintoviewEvent;
- break;
- case AccessibilityEventType::Select:
- eventName = eventNames().accessibleselectEvent;
- break;
- default:
- return false;
- }
-
- auto event = Event::create(eventName, true, true);
- return dispatchAccessibilityEvent(event);
-}
-
-bool AccessibilityObject::dispatchAccessibleSetValueEvent(const String& value) const
-{
if (!canSetValueAttribute())
return false;
auto event = AccessibleSetValueEvent::create(eventNames().accessiblesetvalueEvent, value);
@@ -2961,8 +2924,6 @@
void AccessibilityObject::scrollToMakeVisible() const
{
- if (dispatchAccessibilityEventWithType(AccessibilityEventType::ScrollIntoView))
- return;
IntRect objectRect = snappedIntRect(boundingBoxRect());
objectRect.setLocation(IntPoint());
scrollToMakeVisibleWithSubFocus(objectRect);
Modified: tags/Safari-606.1.8/Source/WebCore/accessibility/AccessibilityObject.h (229434 => 229435)
--- tags/Safari-606.1.8/Source/WebCore/accessibility/AccessibilityObject.h 2018-03-08 22:15:11 UTC (rev 229434)
+++ tags/Safari-606.1.8/Source/WebCore/accessibility/AccessibilityObject.h 2018-03-08 22:47:50 UTC (rev 229435)
@@ -254,17 +254,6 @@
Subtitle,
Action,
};
-
-enum class AccessibilityEventType {
- ContextMenu,
- Click,
- Decrement,
- Dismiss,
- Focus,
- Increment,
- ScrollIntoView,
- Select,
-};
struct AccessibilityText {
String text;
@@ -906,9 +895,8 @@
const AtomicString& getAttribute(const QualifiedName&) const;
bool hasTagName(const QualifiedName&) const;
- bool dispatchAccessibilityEvent(Event&) const;
- bool dispatchAccessibilityEventWithType(AccessibilityEventType) const;
- bool dispatchAccessibleSetValueEvent(const String&) const;
+ bool dispatchAccessibilityEvent(Event&);
+ bool dispatchAccessibleSetValueEvent(const String&);
virtual VisiblePositionRange visiblePositionRange() const { return VisiblePositionRange(); }
virtual VisiblePositionRange visiblePositionRangeForLine(unsigned) const { return VisiblePositionRange(); }
Modified: tags/Safari-606.1.8/Source/WebCore/accessibility/AccessibilityRenderObject.cpp (229434 => 229435)
--- tags/Safari-606.1.8/Source/WebCore/accessibility/AccessibilityRenderObject.cpp 2018-03-08 22:15:11 UTC (rev 229434)
+++ tags/Safari-606.1.8/Source/WebCore/accessibility/AccessibilityRenderObject.cpp 2018-03-08 22:47:50 UTC (rev 229435)
@@ -1707,9 +1707,6 @@
void AccessibilityRenderObject::setFocused(bool on)
{
- if (on && dispatchAccessibilityEventWithType(AccessibilityEventType::Focus))
- return;
-
if (!canSetFocusAttribute())
return;
Modified: tags/Safari-606.1.8/Source/WebCore/dom/Element.idl (229434 => 229435)
--- tags/Safari-606.1.8/Source/WebCore/dom/Element.idl 2018-03-08 22:15:11 UTC (rev 229434)
+++ tags/Safari-606.1.8/Source/WebCore/dom/Element.idl 2018-03-08 22:47:50 UTC (rev 229435)
@@ -142,15 +142,8 @@
[NotEnumerable, Conditional=WIRELESS_PLAYBACK_TARGET] attribute EventHandler onwebkitplaybacktargetavailabilitychanged;
// Accessibility events.
- [EnabledAtRuntime=AccessibilityObjectModel] attribute EventHandler onaccessiblecontextmenu;
[EnabledAtRuntime=AccessibilityObjectModel] attribute EventHandler onaccessibleclick;
- [EnabledAtRuntime=AccessibilityObjectModel] attribute EventHandler onaccessibledecrement;
- [EnabledAtRuntime=AccessibilityObjectModel] attribute EventHandler onaccessibledismiss;
- [EnabledAtRuntime=AccessibilityObjectModel] attribute EventHandler onaccessiblefocus;
- [EnabledAtRuntime=AccessibilityObjectModel] attribute EventHandler onaccessibleincrement;
- [EnabledAtRuntime=AccessibilityObjectModel] attribute EventHandler onaccessiblescrollintoview;
[EnabledAtRuntime=AccessibilityObjectModel] attribute EventHandler onaccessiblesetvalue;
- [EnabledAtRuntime=AccessibilityObjectModel] attribute EventHandler onaccessibleselect;
};
dictionary ShadowRootInit {
Modified: tags/Safari-606.1.8/Source/WebCore/dom/EventNames.h (229434 => 229435)
--- tags/Safari-606.1.8/Source/WebCore/dom/EventNames.h 2018-03-08 22:15:11 UTC (rev 229434)
+++ tags/Safari-606.1.8/Source/WebCore/dom/EventNames.h 2018-03-08 22:47:50 UTC (rev 229435)
@@ -45,15 +45,8 @@
macro(DOMNodeRemovedFromDocument) \
macro(DOMSubtreeModified) \
macro(abort) \
- macro(accessiblecontextmenu) \
macro(accessibleclick) \
- macro(accessibledecrement) \
- macro(accessibledismiss) \
- macro(accessiblefocus) \
- macro(accessibleincrement) \
- macro(accessiblescrollintoview) \
macro(accessiblesetvalue) \
- macro(accessibleselect) \
macro(activate) \
macro(active) \
macro(addsourcebuffer) \
