Title: [186936] branches/safari-601.1-branch/Source/WebCore
- Revision
- 186936
- Author
- matthew_han...@apple.com
- Date
- 2015-07-16 22:32:50 -0700 (Thu, 16 Jul 2015)
Log Message
Merge r186857. rdar://problem/21840845
Modified Paths
Diff
Modified: branches/safari-601.1-branch/Source/WebCore/ChangeLog (186935 => 186936)
--- branches/safari-601.1-branch/Source/WebCore/ChangeLog 2015-07-17 05:32:47 UTC (rev 186935)
+++ branches/safari-601.1-branch/Source/WebCore/ChangeLog 2015-07-17 05:32:50 UTC (rev 186936)
@@ -1,5 +1,25 @@
2015-07-16 Matthew Hanson <matthew_han...@apple.com>
+ Merge r186857. rdar://problem/21840845
+
+ 2015-07-15 Enrica Casucci <enr...@apple.com>
+
+ [iOS] Should look for RTF and RTFD pasteboard types before plain text.
+ https://bugs.webkit.org/show_bug.cgi?id=146971
+ rdar://problem/21840845
+
+ Reviewed by Sam Weinig.
+
+ The list of pasteboard types returned by supportedPasteboardTypes
+ determines the order in which WebKit looks for data in the pasteboard
+ to create a fragment. The incorrect order could make plain text to
+ be preferred over rich format.
+
+ * platform/ios/PasteboardIOS.mm:
+ (WebCore::Pasteboard::supportedPasteboardTypes):
+
+2015-07-16 Matthew Hanson <matthew_han...@apple.com>
+
Merge r186840. rdar://problem/21823681
2015-07-15 Wenson Hsieh <wenson_hs...@apple.com>
Modified: branches/safari-601.1-branch/Source/WebCore/platform/ios/PasteboardIOS.mm (186935 => 186936)
--- branches/safari-601.1-branch/Source/WebCore/platform/ios/PasteboardIOS.mm 2015-07-17 05:32:47 UTC (rev 186935)
+++ branches/safari-601.1-branch/Source/WebCore/platform/ios/PasteboardIOS.mm 2015-07-17 05:32:50 UTC (rev 186936)
@@ -246,7 +246,7 @@
NSArray* Pasteboard::supportedPasteboardTypes()
{
- return @[(id)WebArchivePboardType, (id)kUTTypeHTML, (id)kUTTypePNG, (id)kUTTypeTIFF, (id)kUTTypeJPEG, (id)kUTTypeGIF, (id)kUTTypeURL, (id)kUTTypeText, (id)kUTTypeRTFD, (id)kUTTypeRTF];
+ return @[(id)WebArchivePboardType, (id)kUTTypeRTFD, (id)kUTTypeRTF, (id)kUTTypeHTML, (id)kUTTypePNG, (id)kUTTypeTIFF, (id)kUTTypeJPEG, (id)kUTTypeGIF, (id)kUTTypeURL, (id)kUTTypeText];
}
bool Pasteboard::hasData()
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
