Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-25 05:41:12 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1368077: Strip page titles from URLs on the pasteboard when dragging on OSX/macOS. r=mstange

Browse Source
This commit is contained in:
Stephen A Pohl 2017-05-26 11:45:28 -04:00
parent affb1dc1e0
commit 352c559fa6
1 changed files with 18 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
widget/cocoa/nsClipboard.mm
View File

@ -689,6 +689,23 @@ nsClipboard::PasteboardDictFromTransferable(nsITransferable* aTransferable)
nsAutoString url;
urlObject->GetData(url);
NSString* nativeTitle = nil;
// A newline embedded in the URL means that the form is actually URL +
// title. This embedding occurs in nsDragService::GetData.
int32_t newlinePos = url.FindChar(char16_t('\n'));
if (newlinePos >= 0) {
url.Truncate(newlinePos);
nsAutoString urlTitle;
urlObject->GetData(urlTitle);
urlTitle.Mid(urlTitle, newlinePos + 1, len - (newlinePos + 1));
nativeTitle =
[NSString stringWithCharacters:
reinterpret_cast<const unichar*>(urlTitle.get())
length:urlTitle.Length()];
}
// The Finder doesn't like getting random binary data aka
// Unicode, so change it into an escaped URL containing only
// ASCII.
@ -703,18 +720,7 @@ nsClipboard::PasteboardDictFromTransferable(nsITransferable* aTransferable)
NSString* publicUrl =
[UTIHelper stringFromPboardType:kPublicUrlPboardType];
[pasteboardOutputDict setObject:nativeURL forKey:publicUrl];
// A newline embedded in the URL means that the form is actually URL + title.
int32_t newlinePos = url.FindChar(char16_t('\n'));
if (newlinePos >= 0) {
url.Truncate(newlinePos);
nsAutoString urlTitle;
urlObject->GetData(urlTitle);
urlTitle.Mid(urlTitle, newlinePos + 1, len - (newlinePos + 1));
NSString *nativeTitle = [[NSString alloc] initWithCharacters:reinterpret_cast<const unichar*>(urlTitle.get())
length:urlTitle.Length()];
if (nativeTitle) {
NSArray* urlsAndTitles = @[@[nativeURL], @[nativeTitle]];
NSString* urlName =
[UTIHelper stringFromPboardType:kPublicUrlNamePboardType];
@ -724,7 +730,6 @@ nsClipboard::PasteboardDictFromTransferable(nsITransferable* aTransferable)
forKey:urlName];
[pasteboardOutputDict setObject:urlsAndTitles
forKey:urlsWithTitles];
[nativeTitle release];
}
}
[pboardType release];