Changeset 150054 in webkit

Timestamp:

May 13, 2013 9:09:27 PM (11 years ago)

Author:

ddkilzer@apple.com

Message:

BUILD FIX (r150049): Fix RetainPtr<> type in PasteboardIOS.mm

• platform/ios/PasteboardIOS.mm:

(WebCore::Pasteboard::writeImage): Use RetainPtr<CFStringRef>
instead of RetainPtr<NSString>.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/ios/PasteboardIOS.mm (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-05-13  David Kilzer  <ddkilzer@apple.com>
+
+        BUILD FIX (r150049): Fix RetainPtr<> type in PasteboardIOS.mm
+
+        * platform/ios/PasteboardIOS.mm:
+        (WebCore::Pasteboard::writeImage): Use RetainPtr<CFStringRef>
+        instead of RetainPtr<NSString>.
+
 2013-05-13  Benjamin Poulain  <bpoulain@apple.com>
 

trunk/Source/WebCore/platform/ios/PasteboardIOS.mm

@@ -196 +196 @@
     RetainPtr<NSMutableDictionary> dictionary = adoptNS([[NSMutableDictionary alloc] init]);
     NSString *mimeType = cachedImage->response().mimeType();
-    RetainPtr<NSString> uti = adoptCF((NSString *)UTTypeCreatePreferredIdentifierForTag(kUTTagClassMIMEType, (CFStringRef)mimeType, NULL));
+    RetainPtr<CFStringRef> uti = adoptCF(UTTypeCreatePreferredIdentifierForTag(kUTTagClassMIMEType, (CFStringRef)mimeType, NULL));
     if (uti) {
-        [dictionary.get() setObject:imageData.get() forKey:uti.get()];
+        [dictionary.get() setObject:imageData.get() forKey:(NSString *)uti.get()];
         [dictionary.get() setObject:(NSString *)node->document()->completeURL(stripLeadingAndTrailingHTMLSpaces(static_cast<HTMLElement*>(node)->getAttribute("src"))) forKey:(NSString *)kUTTypeURL];
     }