Attachment 339338 Details for Bug 185205 – Proposed fix

[patch] Proposed fix

Patch.patch (text/plain), 5.23 KB, created by Aditya Keerthi on 2018-05-02 14:17:38 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Aditya Keerthi

Created: 2018-05-02 14:17:38 PDT

Size: 5.23 KB

patch

obsolete

>diff --git a/Source/WebCore/platform/mac/PasteboardMac.mm b/Source/WebCore/platform/mac/PasteboardMac.mm
>index 3658dd1ef49..8757a73654e 100644
>--- a/Source/WebCore/platform/mac/PasteboardMac.mm
>+++ b/Source/WebCore/platform/mac/PasteboardMac.mm
>@@ -199,7 +199,7 @@ static long writeURLForTypes(const Vector<String>& types, const String& pasteboa
>     if (types.contains(WebURLsWithTitlesPboardType)) {
>         Vector<String> paths;
>         paths.append([cocoaURL absoluteString]);
>-        paths.append(pasteboardURL.title.stripWhiteSpace());
>+        paths.append([title stringByTrimmingCharactersInSet:[NSCharacterSet whitespaceCharacterSet]]);
>         newChangeCount = platformStrategies()->pasteboardStrategy()->setPathnamesForType(paths, WebURLsWithTitlesPboardType, pasteboardName);
>     }
>     if (types.contains(String(legacyURLPasteboardType())))
>diff --git a/Tools/TestWebKitAPI/Tests/mac/ContextMenuCanCopyURL.html b/Tools/TestWebKitAPI/Tests/mac/ContextMenuCanCopyURL.html
>index 3147603ce4c..c0cc607a29a 100644
>--- a/Tools/TestWebKitAPI/Tests/mac/ContextMenuCanCopyURL.html
>+++ b/Tools/TestWebKitAPI/Tests/mac/ContextMenuCanCopyURL.html
>@@ -1,4 +1,4 @@
> <head>
> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
> </head>
>-Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.<a href='http://www.webkit.org/'>Click me</a>Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.<a href='http://xn--ls8h.la/'>http://ð©.la</a>.Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
>\ No newline at end of file
>+Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.<a href='http://www.webkit.org/'>Click me</a>Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.<a href='http://xn--ls8h.la/'>http://ð©.la</a>.Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.<a href='https://www.quirksmode.org/html5/videos/big_buck_bunny.mp4' style='background: #000000; display: block; width: 200px; height: 200px;'></a>
>diff --git a/Tools/TestWebKitAPI/Tests/mac/ContextMenuCanCopyURL.mm b/Tools/TestWebKitAPI/Tests/mac/ContextMenuCanCopyURL.mm
>index 8350f4b1c93..7f25ab4df3c 100644
>--- a/Tools/TestWebKitAPI/Tests/mac/ContextMenuCanCopyURL.mm
>+++ b/Tools/TestWebKitAPI/Tests/mac/ContextMenuCanCopyURL.mm
>@@ -110,6 +110,13 @@ TEST(WebKitLegacy, ContextMenuCanCopyURL)
>     NSArray * titles = [WebURLsWithTitles titlesFromPasteboard: [NSPasteboard generalPasteboard]];
>     EXPECT_WK_STREQ(@"http://xn--ls8h.la/", [[urls objectAtIndex:0] absoluteString]);
>     EXPECT_WK_STREQ(@"http://ð©.la", [titles objectAtIndex:0]);
>+
>+    contextMenuCopyLink(webView.get(), 2);
>+
>+    urls = [WebURLsWithTitles URLsFromPasteboard: [NSPasteboard generalPasteboard]];
>+    titles = [WebURLsWithTitles titlesFromPasteboard: [NSPasteboard generalPasteboard]];
>+    EXPECT_WK_STREQ(@"https://www.quirksmode.org/html5/videos/big_buck_bunny.mp4", [[urls objectAtIndex:0] absoluteString]);
>+    EXPECT_WK_STREQ(@"big_buck_bunny.mp4", [titles objectAtIndex:0]);
> }
> 
> } // namespace TestWebKitAPI

Actions: View | Formatted Diff | Diff

Attachments on bug 185205: 339338 | 339344 | 339354