Title: [150054] trunk/Source/WebCore
- Revision
- 150054
- Author
- [email protected]
- Date
- 2013-05-13 21:09:27 -0700 (Mon, 13 May 2013)
Log Message
BUILD FIX (r150049): Fix RetainPtr<> type in PasteboardIOS.mm
* platform/ios/PasteboardIOS.mm:
(WebCore::Pasteboard::writeImage): Use RetainPtr<CFStringRef>
instead of RetainPtr<NSString>.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (150053 => 150054)
--- trunk/Source/WebCore/ChangeLog 2013-05-14 04:04:36 UTC (rev 150053)
+++ trunk/Source/WebCore/ChangeLog 2013-05-14 04:09:27 UTC (rev 150054)
@@ -1,3 +1,11 @@
+2013-05-13 David Kilzer <[email protected]>
+
+ 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 <[email protected]>
Remove platform/graphic's Generator
Modified: trunk/Source/WebCore/platform/ios/PasteboardIOS.mm (150053 => 150054)
--- trunk/Source/WebCore/platform/ios/PasteboardIOS.mm 2013-05-14 04:04:36 UTC (rev 150053)
+++ trunk/Source/WebCore/platform/ios/PasteboardIOS.mm 2013-05-14 04:09:27 UTC (rev 150054)
@@ -195,9 +195,9 @@
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());
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
