Changeset 161726 in webkit

Timestamp:

Jan 10, 2014, 8:31:53 PM (12 years ago)

Author:

Joseph Pecoraro

Message:

Fix WebAccessibilityObjectWrapperIOS.o for iOS. Unreviewed build fix.

The upstreamed WebAccessibilityObjectWrapperIOS.mm was out of date, e.g.
it was using GSFonts. Just upstream a newer version of the file. Also
explicitly namespace qualify std::pair.

• accessibility/ios/WebAccessibilityObjectWrapperIOS.mm:

(AXAttributeStringSetStyle):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• accessibility/ios/WebAccessibilityObjectWrapperIOS.mm (modified) (5 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2014-01-10  Joseph Pecoraro  <pecoraro@apple.com>
+
+        Fix WebAccessibilityObjectWrapperIOS.o for iOS. Unreviewed build fix.
+
+        The upstreamed WebAccessibilityObjectWrapperIOS.mm was out of date, e.g.
+        it was using GSFonts. Just upstream a newer version of the file. Also
+        explicitly namespace qualify std::pair.
+
+        * accessibility/ios/WebAccessibilityObjectWrapperIOS.mm:
+        (AXAttributeStringSetStyle):
+
 2014-01-10  Jinwoo Song  <jinwoo7.song@samsung.com>
 

trunk/Source/WebCore/accessibility/ios/WebAccessibilityObjectWrapperIOS.mm

@@ -53 +53 @@
 #import "VisibleUnits.h"
 
-#import <GraphicsServices/GraphicsServices.h>
+#import <CoreText/CoreText.h>
 
 @interface NSObject (AccessibilityPrivate)
@@ -771 +771 @@
         return 0;
 
-    return toAccessibilityTableCell(cell);
+    return static_cast<AccessibilityTableCell*>(cell);
 }
 
@@ -784 +784 @@
         return 0;
     
-    return toAccessibilityTable(parentTable);
+    return static_cast<AccessibilityTable*>(parentTable);
 }
 
@@ -1480 +1480 @@
 }
 
-static void AXAttributeStringSetFont(NSMutableAttributedString* attrString, GSFontRef font, NSRange range)
+static void AXAttributeStringSetFont(NSMutableAttributedString* attrString, CTFontRef font, NSRange range)
 {
     if (!font)
         return;
     
-    const char* nameCStr = GSFontGetFullName(font);
-    const char* familyCStr = GSFontGetFamilyName(font);
-    NSNumber* size = [NSNumber numberWithFloat:GSFontGetSize(font)];
-    NSNumber* bold = [NSNumber numberWithBool:GSFontIsBold(font)];
-    GSFontTraitMask traits = GSFontGetTraits(font);
-    if (nameCStr)
-        [attrString addAttribute:UIAccessibilityTokenFontName value:[NSString stringWithUTF8String:nameCStr] range:range];
-    if (familyCStr)
-        [attrString addAttribute:UIAccessibilityTokenFontFamily value:[NSString stringWithUTF8String:familyCStr] range:range];
+    RetainPtr<CFStringRef> fullName = adoptCF(CTFontCopyFullName(font));
+    RetainPtr<CFStringRef> familyName = adoptCF(CTFontCopyFamilyName(font));
+
+    NSNumber* size = [NSNumber numberWithFloat:CTFontGetSize(font)];
+    CTFontSymbolicTraits traits = CTFontGetSymbolicTraits(font);
+    NSNumber* bold = [NSNumber numberWithBool:(traits & kCTFontTraitBold)];
+    if (fullName)
+        [attrString addAttribute:UIAccessibilityTokenFontName value:(NSString*)fullName.get() range:range];
+    if (familyName)
+        [attrString addAttribute:UIAccessibilityTokenFontFamily value:(NSString*)familyName.get() range:range];
     if ([size boolValue])
         [attrString addAttribute:UIAccessibilityTokenFontSize value:size range:range];
-    if ([bold boolValue] || (traits & GSBoldFontMask))
+    if ([bold boolValue] || (traits & kCTFontTraitBold))
         [attrString addAttribute:UIAccessibilityTokenBold value:[NSNumber numberWithBool:YES] range:range];
-    if (traits & GSItalicFontMask)
+    if (traits & kCTFontTraitItalic)
         [attrString addAttribute:UIAccessibilityTokenItalic value:[NSNumber numberWithBool:YES] range:range];
 
@@ -1513 +1514 @@
 static void AXAttributeStringSetStyle(NSMutableAttributedString* attrString, RenderObject* renderer, NSRange range)
 {
-    RenderStyle* style = renderer->style();
+    RenderStyle& style = renderer->style();
     
     // set basic font info
-    AXAttributeStringSetFont(attrString, style->font().primaryFont()->getGSFont(), range);
+    AXAttributeStringSetFont(attrString, style.font().primaryFont()->getCTFont(), range);
                 
-    int decor = style->textDecorationsInEffect();
+    int decor = style.textDecorationsInEffect();
     if ((decor & (TextDecorationUnderline | TextDecorationLineThrough)) != 0) {
         // find colors using quirk mode approach (strict mode would use current