Skip to content
Permalink
Browse files
REGRESSION (r215290): "Where From" metadata is empty when dragging an…
… image out of Safari

https://bugs.webkit.org/show_bug.cgi?id=176068

Reviewed by Wenson Hsieh.

If you drag an image out of Safari, drop it on the Desktop, and open "Get Info", there is a
"Where from:" field under "More Info" that should list the image's URL. After r215290, this
field is blank due to a mixup with the string passed to URLWithUserTypedString().

Fix this by passing metadataURLString to URLWithUserTypedString() instead of urlString.

Not possible to reliably test this since WebKit adds metadata on a global concurrent queue.

* platform/mac/FileSystemMac.mm:
(WebCore::setMetadataURL):


Canonical link: https://commits.webkit.org/192748@main
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@221321 268f45cc-cd09-0410-ab3c-d52691b4dbfc
  • Loading branch information
aestes committed Aug 29, 2017
1 parent 8064ec7 commit da50c94ae3b3507e96044dbdb78b0500be53fe8d
Showing with 19 additions and 1 deletion.
  1. +18 −0 Source/WebCore/ChangeLog
  2. +1 −1 Source/WebCore/platform/mac/FileSystemMac.mm
@@ -1,3 +1,21 @@
2017-08-29 Andy Estes <aestes@apple.com>

REGRESSION (r215290): "Where From" metadata is empty when dragging an image out of Safari
https://bugs.webkit.org/show_bug.cgi?id=176068

Reviewed by Wenson Hsieh.

If you drag an image out of Safari, drop it on the Desktop, and open "Get Info", there is a
"Where from:" field under "More Info" that should list the image's URL. After r215290, this
field is blank due to a mixup with the string passed to URLWithUserTypedString().

Fix this by passing metadataURLString to URLWithUserTypedString() instead of urlString.

Not possible to reliably test this since WebKit adds metadata on a global concurrent queue.

* platform/mac/FileSystemMac.mm:
(WebCore::setMetadataURL):

2017-08-29 Youenn Fablet <youenn@apple.com>

CacheStorage does not need to sort its caches
@@ -52,7 +52,7 @@ bool deleteEmptyDirectory(const String& path)
void setMetadataURL(const String& path, const String& metadataURLString, const String& referrer)
{
String urlString;
if (NSURL *url = URLWithUserTypedString(urlString, nil))
if (NSURL *url = URLWithUserTypedString(metadataURLString, nil))
urlString = userVisibleString(URLByRemovingUserInfo(url));
else
urlString = metadataURLString;

0 comments on commit da50c94

Please sign in to comment.