Title: [143263] trunk/Source/WebCore
- Revision
- 143263
- Author
- [email protected]
- Date
- 2013-02-18 14:11:47 -0800 (Mon, 18 Feb 2013)
Log Message
BUILD FIX (r143230): Fix renamed header and implementation of -[WebAccessibilityObjectWrapper accessibilityPostedNotification:]
<http://webkit.org/b/110077>
Fixes the following build failures:
AccessibilityObjectIOS.mm:35:9: fatal error: 'AccessibilityObjectWrapperIOS.h' file not found
#import "AccessibilityObjectWrapperIOS.h"
^
1 error generated.
WebAccessibilityObjectWrapperIOS.mm:2051:35: error: use of undeclared identifier 'notificationString'; did you mean 'notificationType'?
if (AXNotificationCallback && notificationString)
^~~~~~~~~~~~~~~~~~
notificationType
WebAccessibilityObjectWrapperIOS.mm:2049:81: note: 'notificationType' declared here
- (void)accessibilityPostedNotification:(WebCore::AXObjectCache::AXNotification)notificationType
^
WebAccessibilityObjectWrapperIOS.mm:2052:38: error: use of undeclared identifier 'notificationString'; did you mean 'notificationType'?
AXNotificationCallback(self, notificationString, AXPostedNotificationContext);
^~~~~~~~~~~~~~~~~~
notificationType
WebAccessibilityObjectWrapperIOS.mm:2049:81: note: 'notificationType' declared here
- (void)accessibilityPostedNotification:(WebCore::AXObjectCache::AXNotification)notificationType
^
WebAccessibilityObjectWrapperIOS.mm:2052:38: error: cannot initialize a parameter of type 'NSString *' with an lvalue of type 'WebCore::AXObjectCache::AXNotification'
AXNotificationCallback(self, notificationString, AXPostedNotificationContext);
^~~~~~~~~~~~~~~~~~
WebAccessibilityObjectWrapperIOS.mm:2049:81: error: conflicting parameter types in implementation of 'accessibilityPostedNotification:': 'NSString *' vs 'WebCore::AXObjectCache::AXNotification' [-Werror,-Wmismatched-parameter-types]
- (void)accessibilityPostedNotification:(WebCore::AXObjectCache::AXNotification)notificationType
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ^
WebAccessibilityObjectWrapperBase.h:48:53: note: previous definition is here
- (void)accessibilityPostedNotification:(NSString *)notificationName;
~~~~~~~~~~ ^
4 errors generated.
* accessibility/ios/AccessibilityObjectIOS.mm: Fix name of
included header.
* accessibility/ios/WebAccessibilityObjectWrapperIOS.mm:
(-[WebAccessibilityObjectWrapper accessibilityPostedNotification:]):
Fix implementation to match declaration.
* accessibility/ios/WebAccessibilityObjectWrapperIOS.h:
* accessibility/ios/WebAccessibilityObjectWrapperIOS.mm:
* accessibility/ios/AXObjectCacheIOS.mm:
- Clean up #endif comments.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (143262 => 143263)
--- trunk/Source/WebCore/ChangeLog 2013-02-18 21:52:34 UTC (rev 143262)
+++ trunk/Source/WebCore/ChangeLog 2013-02-18 22:11:47 UTC (rev 143263)
@@ -1,3 +1,51 @@
+2013-02-18 David Kilzer <[email protected]>
+
+ BUILD FIX (r143230): Fix renamed header and implementation of -[WebAccessibilityObjectWrapper accessibilityPostedNotification:]
+ <http://webkit.org/b/110077>
+
+ Fixes the following build failures:
+
+ AccessibilityObjectIOS.mm:35:9: fatal error: 'AccessibilityObjectWrapperIOS.h' file not found
+ #import "AccessibilityObjectWrapperIOS.h"
+ ^
+ 1 error generated.
+
+ WebAccessibilityObjectWrapperIOS.mm:2051:35: error: use of undeclared identifier 'notificationString'; did you mean 'notificationType'?
+ if (AXNotificationCallback && notificationString)
+ ^~~~~~~~~~~~~~~~~~
+ notificationType
+ WebAccessibilityObjectWrapperIOS.mm:2049:81: note: 'notificationType' declared here
+ - (void)accessibilityPostedNotification:(WebCore::AXObjectCache::AXNotification)notificationType
+ ^
+ WebAccessibilityObjectWrapperIOS.mm:2052:38: error: use of undeclared identifier 'notificationString'; did you mean 'notificationType'?
+ AXNotificationCallback(self, notificationString, AXPostedNotificationContext);
+ ^~~~~~~~~~~~~~~~~~
+ notificationType
+ WebAccessibilityObjectWrapperIOS.mm:2049:81: note: 'notificationType' declared here
+ - (void)accessibilityPostedNotification:(WebCore::AXObjectCache::AXNotification)notificationType
+ ^
+ WebAccessibilityObjectWrapperIOS.mm:2052:38: error: cannot initialize a parameter of type 'NSString *' with an lvalue of type 'WebCore::AXObjectCache::AXNotification'
+ AXNotificationCallback(self, notificationString, AXPostedNotificationContext);
+ ^~~~~~~~~~~~~~~~~~
+ WebAccessibilityObjectWrapperIOS.mm:2049:81: error: conflicting parameter types in implementation of 'accessibilityPostedNotification:': 'NSString *' vs 'WebCore::AXObjectCache::AXNotification' [-Werror,-Wmismatched-parameter-types]
+ - (void)accessibilityPostedNotification:(WebCore::AXObjectCache::AXNotification)notificationType
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ^
+ WebAccessibilityObjectWrapperBase.h:48:53: note: previous definition is here
+ - (void)accessibilityPostedNotification:(NSString *)notificationName;
+ ~~~~~~~~~~ ^
+ 4 errors generated.
+
+ * accessibility/ios/AccessibilityObjectIOS.mm: Fix name of
+ included header.
+ * accessibility/ios/WebAccessibilityObjectWrapperIOS.mm:
+ (-[WebAccessibilityObjectWrapper accessibilityPostedNotification:]):
+ Fix implementation to match declaration.
+
+ * accessibility/ios/WebAccessibilityObjectWrapperIOS.h:
+ * accessibility/ios/WebAccessibilityObjectWrapperIOS.mm:
+ * accessibility/ios/AXObjectCacheIOS.mm:
+ - Clean up #endif comments.
+
2013-02-18 Jer Noble <[email protected]>
EME: Add a CDMPrivate implementation using AVFoundation.
Modified: trunk/Source/WebCore/accessibility/ios/AXObjectCacheIOS.mm (143262 => 143263)
--- trunk/Source/WebCore/accessibility/ios/AXObjectCacheIOS.mm 2013-02-18 21:52:34 UTC (rev 143262)
+++ trunk/Source/WebCore/accessibility/ios/AXObjectCacheIOS.mm 2013-02-18 22:11:47 UTC (rev 143263)
@@ -109,4 +109,4 @@
}
-#endif // HAVE(ACCESSIBILITY)
+#endif // HAVE(ACCESSIBILITY) && PLATFORM(IOS)
Modified: trunk/Source/WebCore/accessibility/ios/AccessibilityObjectIOS.mm (143262 => 143263)
--- trunk/Source/WebCore/accessibility/ios/AccessibilityObjectIOS.mm 2013-02-18 21:52:34 UTC (rev 143262)
+++ trunk/Source/WebCore/accessibility/ios/AccessibilityObjectIOS.mm 2013-02-18 22:11:47 UTC (rev 143263)
@@ -32,7 +32,7 @@
#if HAVE(ACCESSIBILITY) && PLATFORM(IOS)
-#import "AccessibilityObjectWrapperIOS.h"
+#import "WebAccessibilityObjectWrapperIOS.h"
@interface WAKView (iOSAccessibility)
- (BOOL)accessibilityIsIgnored;
Modified: trunk/Source/WebCore/accessibility/ios/WebAccessibilityObjectWrapperIOS.h (143262 => 143263)
--- trunk/Source/WebCore/accessibility/ios/WebAccessibilityObjectWrapperIOS.h 2013-02-18 21:52:34 UTC (rev 143262)
+++ trunk/Source/WebCore/accessibility/ios/WebAccessibilityObjectWrapperIOS.h 2013-02-18 22:11:47 UTC (rev 143263)
@@ -63,6 +63,6 @@
@end
-#endif
+#endif // HAVE(ACCESSIBILITY) && PLATFORM(IOS)
#endif // AccessibilityObjectWrapperIOS_h
Modified: trunk/Source/WebCore/accessibility/ios/WebAccessibilityObjectWrapperIOS.mm (143262 => 143263)
--- trunk/Source/WebCore/accessibility/ios/WebAccessibilityObjectWrapperIOS.mm 2013-02-18 21:52:34 UTC (rev 143262)
+++ trunk/Source/WebCore/accessibility/ios/WebAccessibilityObjectWrapperIOS.mm 2013-02-18 22:11:47 UTC (rev 143263)
@@ -2046,10 +2046,10 @@
AXPostedNotificationContext = context;
}
-- (void)accessibilityPostedNotification:(WebCore::AXObjectCache::AXNotification)notificationType
+- (void)accessibilityPostedNotification:(NSString *)notificationName
{
- if (AXNotificationCallback && notificationString)
- AXNotificationCallback(self, notificationString, AXPostedNotificationContext);
+ if (AXNotificationCallback && notificationName)
+ AXNotificationCallback(self, notificationName, AXPostedNotificationContext);
}
#ifndef NDEBUG
@@ -2062,4 +2062,4 @@
@end
-#endif // PLATFORM(IOS)
+#endif // HAVE(ACCESSIBILITY) && PLATFORM(IOS)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
