Changeset 143263 in webkit
- Timestamp:
- Feb 18, 2013 2:11:47 PM (11 years ago)
- Location:
- trunk/Source/WebCore
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebCore/ChangeLog
r143259 r143263 1 2013-02-18 David Kilzer <ddkilzer@apple.com> 2 3 BUILD FIX (r143230): Fix renamed header and implementation of -[WebAccessibilityObjectWrapper accessibilityPostedNotification:] 4 <http://webkit.org/b/110077> 5 6 Fixes the following build failures: 7 8 AccessibilityObjectIOS.mm:35:9: fatal error: 'AccessibilityObjectWrapperIOS.h' file not found 9 #import "AccessibilityObjectWrapperIOS.h" 10 ^ 11 1 error generated. 12 13 WebAccessibilityObjectWrapperIOS.mm:2051:35: error: use of undeclared identifier 'notificationString'; did you mean 'notificationType'? 14 if (AXNotificationCallback && notificationString) 15 ^~~~~~~~~~~~~~~~~~ 16 notificationType 17 WebAccessibilityObjectWrapperIOS.mm:2049:81: note: 'notificationType' declared here 18 - (void)accessibilityPostedNotification:(WebCore::AXObjectCache::AXNotification)notificationType 19 ^ 20 WebAccessibilityObjectWrapperIOS.mm:2052:38: error: use of undeclared identifier 'notificationString'; did you mean 'notificationType'? 21 AXNotificationCallback(self, notificationString, AXPostedNotificationContext); 22 ^~~~~~~~~~~~~~~~~~ 23 notificationType 24 WebAccessibilityObjectWrapperIOS.mm:2049:81: note: 'notificationType' declared here 25 - (void)accessibilityPostedNotification:(WebCore::AXObjectCache::AXNotification)notificationType 26 ^ 27 WebAccessibilityObjectWrapperIOS.mm:2052:38: error: cannot initialize a parameter of type 'NSString *' with an lvalue of type 'WebCore::AXObjectCache::AXNotification' 28 AXNotificationCallback(self, notificationString, AXPostedNotificationContext); 29 ^~~~~~~~~~~~~~~~~~ 30 WebAccessibilityObjectWrapperIOS.mm:2049:81: error: conflicting parameter types in implementation of 'accessibilityPostedNotification:': 'NSString *' vs 'WebCore::AXObjectCache::AXNotification' [-Werror,-Wmismatched-parameter-types] 31 - (void)accessibilityPostedNotification:(WebCore::AXObjectCache::AXNotification)notificationType 32 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ^ 33 WebAccessibilityObjectWrapperBase.h:48:53: note: previous definition is here 34 - (void)accessibilityPostedNotification:(NSString *)notificationName; 35 ~~~~~~~~~~ ^ 36 4 errors generated. 37 38 * accessibility/ios/AccessibilityObjectIOS.mm: Fix name of 39 included header. 40 * accessibility/ios/WebAccessibilityObjectWrapperIOS.mm: 41 (-[WebAccessibilityObjectWrapper accessibilityPostedNotification:]): 42 Fix implementation to match declaration. 43 44 * accessibility/ios/WebAccessibilityObjectWrapperIOS.h: 45 * accessibility/ios/WebAccessibilityObjectWrapperIOS.mm: 46 * accessibility/ios/AXObjectCacheIOS.mm: 47 - Clean up #endif comments. 48 1 49 2013-02-18 Jer Noble <jer.noble@apple.com> 2 50 -
trunk/Source/WebCore/accessibility/ios/AXObjectCacheIOS.mm
r143230 r143263 110 110 } 111 111 112 #endif // HAVE(ACCESSIBILITY) 112 #endif // HAVE(ACCESSIBILITY) && PLATFORM(IOS) -
trunk/Source/WebCore/accessibility/ios/AccessibilityObjectIOS.mm
r143143 r143263 33 33 #if HAVE(ACCESSIBILITY) && PLATFORM(IOS) 34 34 35 #import " AccessibilityObjectWrapperIOS.h"35 #import "WebAccessibilityObjectWrapperIOS.h" 36 36 37 37 @interface WAKView (iOSAccessibility) -
trunk/Source/WebCore/accessibility/ios/WebAccessibilityObjectWrapperIOS.h
r143230 r143263 64 64 @end 65 65 66 #endif 66 #endif // HAVE(ACCESSIBILITY) && PLATFORM(IOS) 67 67 68 68 #endif // AccessibilityObjectWrapperIOS_h -
trunk/Source/WebCore/accessibility/ios/WebAccessibilityObjectWrapperIOS.mm
r143230 r143263 2047 2047 } 2048 2048 2049 - (void)accessibilityPostedNotification:( WebCore::AXObjectCache::AXNotification)notificationType2050 { 2051 if (AXNotificationCallback && notification String)2052 AXNotificationCallback(self, notification String, AXPostedNotificationContext);2049 - (void)accessibilityPostedNotification:(NSString *)notificationName 2050 { 2051 if (AXNotificationCallback && notificationName) 2052 AXNotificationCallback(self, notificationName, AXPostedNotificationContext); 2053 2053 } 2054 2054 … … 2063 2063 @end 2064 2064 2065 #endif // PLATFORM(IOS)2065 #endif // HAVE(ACCESSIBILITY) && PLATFORM(IOS)
Note: See TracChangeset
for help on using the changeset viewer.