Title: [179228] trunk/Source/WebCore
- Revision
- 179228
- Author
- [email protected]
- Date
- 2015-01-27 16:13:37 -0800 (Tue, 27 Jan 2015)
Log Message
Some NSAccessibility methods we use are deprecated on 10.10
https://bugs.webkit.org/show_bug.cgi?id=140966
Reviewed by Anders Carlsson.
* accessibility/mac/AccessibilityObjectMac.mm:
(WebCore::AccessibilityObject::overrideAttachmentParent):
(WebCore::AccessibilityObject::accessibilityIgnoreAttachment):
* accessibility/mac/WebAccessibilityObjectWrapperMac.mm:
(-[WebAccessibilityObjectWrapper role]):
(-[WebAccessibilityObjectWrapper roleDescription]):
Silence the warnings for now.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (179227 => 179228)
--- trunk/Source/WebCore/ChangeLog 2015-01-28 00:02:45 UTC (rev 179227)
+++ trunk/Source/WebCore/ChangeLog 2015-01-28 00:13:37 UTC (rev 179228)
@@ -1,3 +1,18 @@
+2015-01-27 Alexey Proskuryakov <[email protected]>
+
+ Some NSAccessibility methods we use are deprecated on 10.10
+ https://bugs.webkit.org/show_bug.cgi?id=140966
+
+ Reviewed by Anders Carlsson.
+
+ * accessibility/mac/AccessibilityObjectMac.mm:
+ (WebCore::AccessibilityObject::overrideAttachmentParent):
+ (WebCore::AccessibilityObject::accessibilityIgnoreAttachment):
+ * accessibility/mac/WebAccessibilityObjectWrapperMac.mm:
+ (-[WebAccessibilityObjectWrapper role]):
+ (-[WebAccessibilityObjectWrapper roleDescription]):
+ Silence the warnings for now.
+
2015-01-27 Chris Dumez <[email protected]>
Rename isExpandedShorthand() to isShorthandCSSProperty() for clarity
Modified: trunk/Source/WebCore/accessibility/mac/AccessibilityObjectMac.mm (179227 => 179228)
--- trunk/Source/WebCore/accessibility/mac/AccessibilityObjectMac.mm 2015-01-28 00:02:45 UTC (rev 179227)
+++ trunk/Source/WebCore/accessibility/mac/AccessibilityObjectMac.mm 2015-01-28 00:13:37 UTC (rev 179228)
@@ -53,8 +53,11 @@
parent = parent->parentObjectUnignored();
parentWrapper = parent->wrapper();
}
-
+
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
[[wrapper() attachmentView] accessibilitySetOverrideValue:parentWrapper forAttribute:NSAccessibilityParentAttribute];
+#pragma clang diagnostic pop
}
bool AccessibilityObject::accessibilityIgnoreAttachment() const
@@ -65,9 +68,12 @@
if (isAttachment() && (widget = widgetForAttachmentView()) && widget->isFrameView())
return true;
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
if ([wrapper() attachmentView])
return [[wrapper() attachmentView] accessibilityIsIgnored];
-
+#pragma clang diagnostic pop
+
// Attachments are ignored by default (unless we determine that we should expose them).
return true;
}
Modified: trunk/Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperMac.mm (179227 => 179228)
--- trunk/Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperMac.mm 2015-01-28 00:02:45 UTC (rev 179227)
+++ trunk/Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperMac.mm 2015-01-28 00:13:37 UTC (rev 179228)
@@ -1969,8 +1969,11 @@
- (NSString*)role
{
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
if (m_object->isAttachment())
return [[self attachmentView] accessibilityAttributeValue:NSAccessibilityRoleAttribute];
+#pragma clang diagnostic pop
AccessibilityRole role = m_object->roleValue();
if (role == CanvasRole && m_object->canvasHasFallbackContent())
role = GroupRole;
@@ -2135,11 +2138,14 @@
{
if (!m_object)
return nil;
-
+
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
// attachments have the AXImage role, but a different subrole
if (m_object->isAttachment())
return [[self attachmentView] accessibilityAttributeValue:NSAccessibilityRoleDescriptionAttribute];
-
+#pragma clang diagnostic pop
+
NSString* axRole = [self role];
if ([axRole isEqualToString:NSAccessibilityGroupRole]) {
@@ -3150,6 +3156,9 @@
return paramAttrs;
}
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
+
- (void)accessibilityPerformPressAction
{
if (![self updateObjectBackingStore])
@@ -3183,6 +3192,8 @@
m_object->decrement();
}
+#pragma clang diagnostic pop
+
- (void)accessibilityPerformShowMenuAction
{
if (m_object->roleValue() == ComboBoxRole)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
