Diff
Modified: trunk/Source/WebCore/ChangeLog (154338 => 154339)
--- trunk/Source/WebCore/ChangeLog 2013-08-20 17:17:12 UTC (rev 154338)
+++ trunk/Source/WebCore/ChangeLog 2013-08-20 17:31:14 UTC (rev 154339)
@@ -1,3 +1,25 @@
+2013-08-20 Daniel Bates <[email protected]>
+
+ <https://webkit.org/b/119914> [iOS] Upstream changes to WebCore/accessibility
+
+ Reviewed by Darin Adler and Chris Fleizach.
+
+ * accessibility/AccessibilityMenuList.cpp:
+ (WebCore::AccessibilityMenuList::press):
+ (WebCore::AccessibilityMenuList::isCollapsed):
+ * accessibility/AccessibilityObject.cpp:
+ (WebCore::AccessibilityObject::headingElementForNode):
+ (WebCore::AccessibilityObject::actionVerb):
+ * accessibility/AccessibilityObject.h:
+ * accessibility/AccessibilityRenderObject.cpp:
+ (WebCore::AccessibilityRenderObject::boundsForVisiblePositionRange):
+ (WebCore::AccessibilityRenderObject::actionVerb):
+ * accessibility/AccessibilityTableColumn.cpp:
+ (WebCore::AccessibilityTableColumn::computeAccessibilityIsIgnored):
+ * accessibility/AccessibilityTableHeaderContainer.cpp:
+ (WebCore::AccessibilityTableHeaderContainer::computeAccessibilityIsIgnored):
+ * accessibility/ios/WebAccessibilityObjectWrapperIOS.mm:
+
2013-08-20 Bruno de Oliveira Abinader <[email protected]>
[css3-text] Implement CSS3 text-decoration shorthand
Modified: trunk/Source/WebCore/accessibility/AccessibilityMenuList.cpp (154338 => 154339)
--- trunk/Source/WebCore/accessibility/AccessibilityMenuList.cpp 2013-08-20 17:17:12 UTC (rev 154338)
+++ trunk/Source/WebCore/accessibility/AccessibilityMenuList.cpp 2013-08-20 17:31:14 UTC (rev 154339)
@@ -44,12 +44,16 @@
bool AccessibilityMenuList::press() const
{
+#if !PLATFORM(IOS)
RenderMenuList* menuList = static_cast<RenderMenuList*>(m_renderer);
if (menuList->popupIsVisible())
menuList->hidePopup();
else
menuList->showPopup();
return true;
+#else
+ return false;
+#endif
}
void AccessibilityMenuList::addChildren()
@@ -84,7 +88,11 @@
bool AccessibilityMenuList::isCollapsed() const
{
+#if !PLATFORM(IOS)
return !static_cast<RenderMenuList*>(m_renderer)->popupIsVisible();
+#else
+ return true;
+#endif
}
bool AccessibilityMenuList::canSetFocusAttribute() const
Modified: trunk/Source/WebCore/accessibility/AccessibilityObject.cpp (154338 => 154339)
--- trunk/Source/WebCore/accessibility/AccessibilityObject.cpp 2013-08-20 17:17:12 UTC (rev 154338)
+++ trunk/Source/WebCore/accessibility/AccessibilityObject.cpp 2013-08-20 17:31:14 UTC (rev 154339)
@@ -1225,7 +1225,22 @@
return anchorRenderer->document()->axObjectCache()->getOrCreate(anchorRenderer);
}
+
+AccessibilityObject* AccessibilityObject::headingElementForNode(Node* node)
+{
+ if (!node)
+ return 0;
+ RenderObject* renderObject = node->renderer();
+ if (!renderObject)
+ return 0;
+
+ AccessibilityObject* axObject = renderObject->document()->axObjectCache()->getOrCreate(renderObject);
+ for (; axObject && axObject->roleValue() != HeadingRole; axObject = axObject->parentObject()) { }
+
+ return axObject;
+}
+
void AccessibilityObject::ariaTreeRows(AccessibilityChildrenVector& result)
{
AccessibilityChildrenVector axChildren = children();
@@ -1276,6 +1291,7 @@
#if HAVE(ACCESSIBILITY)
const String& AccessibilityObject::actionVerb() const
{
+#if !PLATFORM(IOS)
// FIXME: Need to add verbs for select elements.
DEFINE_STATIC_LOCAL(const String, buttonAction, (AXButtonActionVerb()));
DEFINE_STATIC_LOCAL(const String, textFieldAction, (AXTextFieldActionVerb()));
@@ -1311,6 +1327,10 @@
default:
return noAction;
}
+#else
+ DEFINE_STATIC_LOCAL(const String, noAction, ());
+ return noAction;
+#endif
}
#endif
Modified: trunk/Source/WebCore/accessibility/AccessibilityObject.h (154338 => 154339)
--- trunk/Source/WebCore/accessibility/AccessibilityObject.h 2013-08-20 17:17:12 UTC (rev 154338)
+++ trunk/Source/WebCore/accessibility/AccessibilityObject.h 2013-08-20 17:31:14 UTC (rev 154339)
@@ -617,6 +617,7 @@
AXID axObjectID() const { return m_id; }
static AccessibilityObject* anchorElementForNode(Node*);
+ static AccessibilityObject* headingElementForNode(Node*);
virtual Element* anchorElement() const { return 0; }
virtual Element* actionElement() const { return 0; }
virtual LayoutRect boundingBoxRect() const { return LayoutRect(); }
@@ -868,6 +869,10 @@
AccessibilityObjectInclusion accessibilityPlatformIncludesObject() const { return DefaultBehavior; }
#endif
+#if PLATFORM(IOS)
+ int accessibilityPasswordFieldLength();
+#endif
+
// allows for an AccessibilityObject to update its render tree or perform
// other operations update type operations
void updateBackingStore();
Modified: trunk/Source/WebCore/accessibility/AccessibilityRenderObject.cpp (154338 => 154339)
--- trunk/Source/WebCore/accessibility/AccessibilityRenderObject.cpp 2013-08-20 17:17:12 UTC (rev 154338)
+++ trunk/Source/WebCore/accessibility/AccessibilityRenderObject.cpp 2013-08-20 17:31:14 UTC (rev 154339)
@@ -1952,7 +1952,7 @@
ourrect = boundingBox;
}
-#if PLATFORM(MAC)
+#if PLATFORM(MAC) && !PLATFORM(IOS)
return m_renderer->document()->view()->contentsToScreen(pixelSnappedIntRect(ourrect));
#else
return pixelSnappedIntRect(ourrect);
@@ -3143,6 +3143,7 @@
const String& AccessibilityRenderObject::actionVerb() const
{
+#if !PLATFORM(IOS)
// FIXME: Need to add verbs for select elements.
DEFINE_STATIC_LOCAL(const String, buttonAction, (AXButtonActionVerb()));
DEFINE_STATIC_LOCAL(const String, textFieldAction, (AXTextFieldActionVerb()));
@@ -3169,6 +3170,10 @@
default:
return noAction;
}
+#else
+ DEFINE_STATIC_LOCAL(const String, noAction, ());
+ return noAction;
+#endif
}
void AccessibilityRenderObject::setAccessibleName(const AtomicString& name)
Modified: trunk/Source/WebCore/accessibility/AccessibilityTableColumn.cpp (154338 => 154339)
--- trunk/Source/WebCore/accessibility/AccessibilityTableColumn.cpp 2013-08-20 17:17:12 UTC (rev 154338)
+++ trunk/Source/WebCore/accessibility/AccessibilityTableColumn.cpp 2013-08-20 17:31:14 UTC (rev 154339)
@@ -157,7 +157,7 @@
if (!m_parent)
return true;
-#if PLATFORM(GTK)
+#if PLATFORM(IOS) || PLATFORM(GTK)
return true;
#endif
Modified: trunk/Source/WebCore/accessibility/AccessibilityTableHeaderContainer.cpp (154338 => 154339)
--- trunk/Source/WebCore/accessibility/AccessibilityTableHeaderContainer.cpp 2013-08-20 17:17:12 UTC (rev 154338)
+++ trunk/Source/WebCore/accessibility/AccessibilityTableHeaderContainer.cpp 2013-08-20 17:31:14 UTC (rev 154339)
@@ -60,7 +60,7 @@
if (!m_parent)
return true;
-#if PLATFORM(GTK)
+#if PLATFORM(IOS) || PLATFORM(GTK)
return true;
#endif
Modified: trunk/Source/WebCore/accessibility/ios/WebAccessibilityObjectWrapperIOS.mm (154338 => 154339)
--- trunk/Source/WebCore/accessibility/ios/WebAccessibilityObjectWrapperIOS.mm 2013-08-20 17:17:12 UTC (rev 154338)
+++ trunk/Source/WebCore/accessibility/ios/WebAccessibilityObjectWrapperIOS.mm 2013-08-20 17:31:14 UTC (rev 154339)
@@ -50,7 +50,7 @@
#import "WAKView.h"
#import "WAKWindow.h"
#import "WebCoreThread.h"
-#import "visible_units.h"
+#import "VisibleUnits.h"
#import <GraphicsServices/GraphicsServices.h>
