BUILD FIX (r150049): Fix RetainPtr<> type in PasteboardIOS.mm
authorddkilzer@apple.com <ddkilzer@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 14 May 2013 04:09:27 +0000 (04:09 +0000)
committerddkilzer@apple.com <ddkilzer@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 14 May 2013 04:09:27 +0000 (04:09 +0000)
* platform/ios/PasteboardIOS.mm:
(WebCore::Pasteboard::writeImage): Use RetainPtr<CFStringRef>
instead of RetainPtr<NSString>.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@150054 268f45cc-cd09-0410-ab3c-d52691b4dbfc

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

index f2e595d233cce7807233fa7f5e233fc6881c4501..58c39b5fc1f90837be9e6b3a63e365d71b27578b 100644 (file)
@@ -1,3 +1,11 @@
+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>
 
         Remove platform/graphic's Generator
index d7e55cf4e12dbc4676ca811e20640b13f8bf707b..6f6d24c53fe70ac96c7c4e6767d8fab2a6106002 100644 (file)
@@ -195,9 +195,9 @@ void Pasteboard::writeImage(Node* node, Frame* frame)
 
     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];
     }
     frame->editor()->client()->writeDataToPasteboard(dictionary.get());