<!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>[168171] trunk/Source/WebCore</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/168171">168171</a></dd>
<dt>Author</dt> <dd>cfleizach@apple.com</dd>
<dt>Date</dt> <dd>2014-05-02 09:19:32 -0700 (Fri, 02 May 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>AX: WK2: iOS web page scrolling doesn't work with VoiceOver
https://bugs.webkit.org/show_bug.cgi?id=132028
Reviewed by Mario Sanchez Prada.
With the AX tree residing in the WebProcess, scrolling needs to be implemented in
WebCore using accessibilityScroll: in order for accessibility clients to scroll through the AX API.
* accessibility/AccessibilityObject.cpp:
(WebCore::AccessibilityObject::scrollViewAncestor):
(WebCore::AccessibilityObject::scrollToMakeVisibleWithSubFocus):
* accessibility/AccessibilityObject.h:
* accessibility/ios/WebAccessibilityObjectWrapperIOS.h:
* accessibility/ios/WebAccessibilityObjectWrapperIOS.mm:
(-[WebAccessibilityObjectWrapper _accessibilityConvertPointToViewSpace:]):
(-[WebAccessibilityObjectWrapper _accessibilityScrollToVisible]):
(-[WebAccessibilityObjectWrapper accessibilityScroll:]):
(-[WebAccessibilityObjectWrapper postScrollStatusChangeNotification]):
(-[WebAccessibilityObjectWrapper _accessibilityScrollPosition]):
(-[WebAccessibilityObjectWrapper _accessibilityScrollSize]):
(-[WebAccessibilityObjectWrapper _accessibilityScrollVisibleRect]):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreaccessibilityAccessibilityObjectcpp">trunk/Source/WebCore/accessibility/AccessibilityObject.cpp</a></li>
<li><a href="#trunkSourceWebCoreaccessibilityAccessibilityObjecth">trunk/Source/WebCore/accessibility/AccessibilityObject.h</a></li>
<li><a href="#trunkSourceWebCoreaccessibilityiosWebAccessibilityObjectWrapperIOSh">trunk/Source/WebCore/accessibility/ios/WebAccessibilityObjectWrapperIOS.h</a></li>
<li><a href="#trunkSourceWebCoreaccessibilityiosWebAccessibilityObjectWrapperIOSmm">trunk/Source/WebCore/accessibility/ios/WebAccessibilityObjectWrapperIOS.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (168170 => 168171)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-05-02 16:04:09 UTC (rev 168170)
+++ trunk/Source/WebCore/ChangeLog 2014-05-02 16:19:32 UTC (rev 168171)
</span><span class="lines">@@ -1,3 +1,27 @@
</span><ins>+2014-05-02 Chris Fleizach <cfleizach@apple.com>
+
+ AX: WK2: iOS web page scrolling doesn't work with VoiceOver
+ https://bugs.webkit.org/show_bug.cgi?id=132028
+
+ Reviewed by Mario Sanchez Prada.
+
+ With the AX tree residing in the WebProcess, scrolling needs to be implemented in
+ WebCore using accessibilityScroll: in order for accessibility clients to scroll through the AX API.
+
+ * accessibility/AccessibilityObject.cpp:
+ (WebCore::AccessibilityObject::scrollViewAncestor):
+ (WebCore::AccessibilityObject::scrollToMakeVisibleWithSubFocus):
+ * accessibility/AccessibilityObject.h:
+ * accessibility/ios/WebAccessibilityObjectWrapperIOS.h:
+ * accessibility/ios/WebAccessibilityObjectWrapperIOS.mm:
+ (-[WebAccessibilityObjectWrapper _accessibilityConvertPointToViewSpace:]):
+ (-[WebAccessibilityObjectWrapper _accessibilityScrollToVisible]):
+ (-[WebAccessibilityObjectWrapper accessibilityScroll:]):
+ (-[WebAccessibilityObjectWrapper postScrollStatusChangeNotification]):
+ (-[WebAccessibilityObjectWrapper _accessibilityScrollPosition]):
+ (-[WebAccessibilityObjectWrapper _accessibilityScrollSize]):
+ (-[WebAccessibilityObjectWrapper _accessibilityScrollVisibleRect]):
+
</ins><span class="cx"> 2014-05-02 Jeremy Jones <jeremyj@apple.com>
</span><span class="cx">
</span><span class="cx"> Pause playback on exit fullscreen when inline playback not allowed.
</span></span></pre></div>
<a id="trunkSourceWebCoreaccessibilityAccessibilityObjectcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/accessibility/AccessibilityObject.cpp (168170 => 168171)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/accessibility/AccessibilityObject.cpp 2014-05-02 16:04:09 UTC (rev 168170)
+++ trunk/Source/WebCore/accessibility/AccessibilityObject.cpp 2014-05-02 16:19:32 UTC (rev 168171)
</span><span class="lines">@@ -31,6 +31,7 @@
</span><span class="cx">
</span><span class="cx"> #include "AXObjectCache.h"
</span><span class="cx"> #include "AccessibilityRenderObject.h"
</span><ins>+#include "AccessibilityScrollView.h"
</ins><span class="cx"> #include "AccessibilityTable.h"
</span><span class="cx"> #include "DOMTokenList.h"
</span><span class="cx"> #include "Editor.h"
</span><span class="lines">@@ -1408,7 +1409,17 @@
</span><span class="cx"> updateChildrenIfNecessary();
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><del>-
</del><ins>+
+ScrollView* AccessibilityObject::scrollViewAncestor() const
+{
+ for (const AccessibilityObject* scrollParent = this; scrollParent; scrollParent = scrollParent->parentObject()) {
+ if (scrollParent->isAccessibilityScrollView())
+ return toAccessibilityScrollView(scrollParent)->scrollView();
+ }
+
+ return nullptr;
+}
+
</ins><span class="cx"> Document* AccessibilityObject::document() const
</span><span class="cx"> {
</span><span class="cx"> FrameView* frameView = documentFrameView();
</span></span></pre></div>
<a id="trunkSourceWebCoreaccessibilityAccessibilityObjecth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/accessibility/AccessibilityObject.h (168170 => 168171)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/accessibility/AccessibilityObject.h 2014-05-02 16:04:09 UTC (rev 168170)
+++ trunk/Source/WebCore/accessibility/AccessibilityObject.h 2014-05-02 16:19:32 UTC (rev 168171)
</span><span class="lines">@@ -86,6 +86,7 @@
</span><span class="cx"> class RenderObject;
</span><span class="cx"> class RenderListItem;
</span><span class="cx"> class ScrollableArea;
</span><ins>+class ScrollView;
</ins><span class="cx"> class Widget;
</span><span class="cx">
</span><span class="cx"> typedef unsigned AXID;
</span><span class="lines">@@ -709,6 +710,7 @@
</span><span class="cx"> Frame* frame() const;
</span><span class="cx"> MainFrame* mainFrame() const;
</span><span class="cx"> Document* topDocument() const;
</span><ins>+ ScrollView* scrollViewAncestor() const;
</ins><span class="cx"> String language() const;
</span><span class="cx"> // 1-based, to match the aria-level spec.
</span><span class="cx"> virtual unsigned hierarchicalLevel() const { return 0; }
</span></span></pre></div>
<a id="trunkSourceWebCoreaccessibilityiosWebAccessibilityObjectWrapperIOSh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/accessibility/ios/WebAccessibilityObjectWrapperIOS.h (168170 => 168171)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/accessibility/ios/WebAccessibilityObjectWrapperIOS.h 2014-05-02 16:04:09 UTC (rev 168170)
+++ trunk/Source/WebCore/accessibility/ios/WebAccessibilityObjectWrapperIOS.h 2014-05-02 16:19:32 UTC (rev 168171)
</span><span class="lines">@@ -61,6 +61,7 @@
</span><span class="cx"> - (void)postChildrenChangedNotification;
</span><span class="cx"> - (void)postInvalidStatusChangedNotification;
</span><span class="cx"> - (void)postLiveRegionCreatedNotification;
</span><ins>+- (void)postScrollStatusChangeNotification;
</ins><span class="cx">
</span><span class="cx"> @end
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreaccessibilityiosWebAccessibilityObjectWrapperIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/accessibility/ios/WebAccessibilityObjectWrapperIOS.mm (168170 => 168171)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/accessibility/ios/WebAccessibilityObjectWrapperIOS.mm 2014-05-02 16:04:09 UTC (rev 168170)
+++ trunk/Source/WebCore/accessibility/ios/WebAccessibilityObjectWrapperIOS.mm 2014-05-02 16:19:32 UTC (rev 168171)
</span><span class="lines">@@ -86,6 +86,15 @@
</span><span class="cx"> using namespace WebCore;
</span><span class="cx"> using namespace HTMLNames;
</span><span class="cx">
</span><ins>+typedef NS_ENUM(NSInteger, UIAccessibilityScrollDirection) {
+ UIAccessibilityScrollDirectionRight = 1,
+ UIAccessibilityScrollDirectionLeft,
+ UIAccessibilityScrollDirectionUp,
+ UIAccessibilityScrollDirectionDown,
+ UIAccessibilityScrollDirectionNext,
+ UIAccessibilityScrollDirectionPrevious
+};
+
</ins><span class="cx"> // These are tokens accessibility uses to denote attributes.
</span><span class="cx"> static NSString * const UIAccessibilityTokenBlockquoteLevel = @"UIAccessibilityTokenBlockquoteLevel";
</span><span class="cx"> static NSString * const UIAccessibilityTokenHeadingLevel = @"UIAccessibilityTokenHeadingLevel";
</span><span class="lines">@@ -994,6 +1003,80 @@
</span><span class="cx"> return (NSURL*)url;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+- (CGPoint)_accessibilityConvertPointToViewSpace:(CGPoint)point
+{
+ if (![self _prepareAccessibilityCall])
+ return point;
+
+ FloatPoint floatPoint = FloatPoint(point);
+ return [self convertPointToScreenSpace:floatPoint];
+}
+
+- (BOOL)_accessibilityScrollToVisible
+{
+ if (![self _prepareAccessibilityCall])
+ return NO;
+
+ m_object->scrollToMakeVisible();
+ return YES;
+}
+
+
+- (BOOL)accessibilityScroll:(UIAccessibilityScrollDirection)direction
+{
+ if (![self _prepareAccessibilityCall])
+ return NO;
+
+ ScrollView* scrollView = m_object->scrollViewAncestor();
+ if (!scrollView)
+ return NO;
+
+ IntPoint scrollPosition = scrollView->scrollPosition();
+ IntPoint newScrollPosition = scrollPosition;
+ IntSize scrollSize = scrollView->contentsSize();
+ IntRect scrollVisibleRect = scrollView->visibleContentRect(ScrollableArea::LegacyIOSDocumentVisibleRect);
+ switch (direction) {
+ case UIAccessibilityScrollDirectionRight: {
+ int scrollAmount = scrollVisibleRect.size().width();
+ int newX = scrollPosition.x() - scrollAmount;
+ newScrollPosition.setX(std::max(newX, 0));
+ break;
+ }
+ case UIAccessibilityScrollDirectionLeft: {
+ int scrollAmount = scrollVisibleRect.size().width();
+ int newX = scrollAmount + scrollPosition.x();
+ int maxX = scrollSize.width() - scrollAmount;
+ newScrollPosition.setX(std::min(newX, maxX));
+ break;
+ }
+ case UIAccessibilityScrollDirectionUp: {
+ int scrollAmount = scrollVisibleRect.size().height();
+ int newY = scrollPosition.y() - scrollAmount;
+ newScrollPosition.setY(std::max(newY, 0));
+ break;
+ }
+ case UIAccessibilityScrollDirectionDown: {
+ int scrollAmount = scrollVisibleRect.size().height();
+ int newY = scrollAmount + scrollPosition.y();
+ int maxY = scrollSize.height() - scrollAmount;
+ newScrollPosition.setY(std::min(newY, maxY));
+ break;
+ }
+ default:
+ break;
+ }
+
+ if (newScrollPosition != scrollPosition) {
+ scrollView->setScrollPosition(newScrollPosition);
+ m_object->document()->updateLayoutIgnorePendingStylesheets();
+ }
+
+ [self postScrollStatusChangeNotification];
+
+ // This means that this object handled the scroll and no other ancestor should attempt scrolling.
+ return YES;
+}
+
</ins><span class="cx"> - (CGPoint)convertPointToScreenSpace:(FloatPoint &)point
</span><span class="cx"> {
</span><span class="cx"> if (!m_object)
</span><span class="lines">@@ -1387,6 +1470,45 @@
</span><span class="cx"> // The UIKit accessibility wrapper will override and post appropriate notification.
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+- (void)postScrollStatusChangeNotification
+{
+ // The UIKit accessibility wrapper will override and post appropriate notification.
+}
+
+// These will be used by the UIKit wrapper to calculate an appropriate description of scroll status.
+- (CGPoint)_accessibilityScrollPosition
+{
+ if (![self _prepareAccessibilityCall])
+ return CGPointZero;
+
+ ScrollView* scrollView = m_object->scrollViewAncestor();
+ if (!scrollView)
+ return CGPointZero;
+ return scrollView->scrollPosition();
+}
+
+- (CGSize)_accessibilityScrollSize
+{
+ if (![self _prepareAccessibilityCall])
+ return CGSizeZero;
+
+ ScrollView* scrollView = m_object->scrollViewAncestor();
+ if (!scrollView)
+ return CGSizeZero;
+ return scrollView->contentsSize();
+}
+
+- (CGRect)_accessibilityScrollVisibleRect
+{
+ if (![self _prepareAccessibilityCall])
+ return CGRectZero;
+
+ ScrollView* scrollView = m_object->scrollViewAncestor();
+ if (!scrollView)
+ return CGRectZero;
+ return scrollView->visibleContentRect(ScrollableArea::LegacyIOSDocumentVisibleRect);
+}
+
</ins><span class="cx"> - (void)accessibilityElementDidBecomeFocused
</span><span class="cx"> {
</span><span class="cx"> if (![self _prepareAccessibilityCall])
</span></span></pre>
</div>
</div>
</body>
</html>