Changeset 217584 in webkit

Timestamp:

May 30, 2017 4:40:33 PM (7 years ago)

Author:

Joseph Pecoraro

Message:

Web Inspector: images dragged from Inspector to Desktop are named "Unknown.png"
​https://bugs.webkit.org/show_bug.cgi?id=141515
<rdar://problem/9251308>

Reviewed by Wenson Hsieh.

Source/WebCore:

• html/HTMLAttributeNames.in:

Source/WebInspectorUI:

• UserInterface/Views/ImageResourceContentView.js:

(WebInspector.ImageResourceContentView.prototype.contentAvailable):
Set a non-standard "filename" attribute to provide a suggested filename
for this <img> containing data: or blob: content.

Source/WebKit2:

In Web Inspector these images are <img src="..."> with data: or blob:
content. In these cases we have the image data but the URL does not
provide a useful name. In fact the name "Unknown.png" comes from
-[NSURLResponse suggestedFilename] for this URL / content.

To start, improve this situation for drags in Web Inspector pages.
If the image element being dragged has a filename attribute use that
as the suggested filename for the drag.

• WebProcess/WebCoreSupport/mac/WebDragClientMac.mm:

(WebKit::WebDragClient::declareAndWriteDragImage):

Location:

trunk/Source

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/html/HTMLAttributeNames.in (modified) (1 diff)
• WebInspectorUI/ChangeLog (modified) (1 diff)
• WebInspectorUI/UserInterface/Views/ImageResourceContentView.js (modified) (1 diff)
• WebKit2/ChangeLog (modified) (1 diff)
• WebKit2/WebProcess/WebCoreSupport/mac/WebDragClientMac.mm (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2017-05-30  Joseph Pecoraro  <pecoraro@apple.com>
+
+        Web Inspector: images dragged from Inspector to Desktop are named "Unknown.png"
+        https://bugs.webkit.org/show_bug.cgi?id=141515
+        <rdar://problem/9251308>
+
+        Reviewed by Wenson Hsieh.
+
+        * html/HTMLAttributeNames.in:
+
 2017-05-30  Youenn Fablet  <youenn@apple.com>
 

trunk/Source/WebCore/html/HTMLAttributeNames.in

@@ -118 +118 @@
 expanded
 face
+filename
 focused
 for

trunk/Source/WebInspectorUI/ChangeLog

@@ +1 @@
+2017-05-30  Joseph Pecoraro  <pecoraro@apple.com>
+
+        Web Inspector: images dragged from Inspector to Desktop are named "Unknown.png"
+        https://bugs.webkit.org/show_bug.cgi?id=141515
+        <rdar://problem/9251308>
+
+        Reviewed by Wenson Hsieh.
+
+        * UserInterface/Views/ImageResourceContentView.js:
+        (WebInspector.ImageResourceContentView.prototype.contentAvailable):
+        Set a non-standard "filename" attribute to provide a suggested filename
+        for this <img> containing data: or blob: content.
+
 2017-05-30  Fujii Hironori  <Hironori.Fujii@sony.com>
 

trunk/Source/WebInspectorUI/UserInterface/Views/ImageResourceContentView.js

@@ -53 +53 @@
         this._imageElement.addEventListener("load", function() { URL.revokeObjectURL(objectURL); });
         this._imageElement.src = objectURL;
+        this._imageElement.setAttribute("filename", this.resource.urlComponents.lastPathComponent || "");
 
         this.element.appendChild(this._imageElement);

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2017-05-30  Joseph Pecoraro  <pecoraro@apple.com>
+
+        Web Inspector: images dragged from Inspector to Desktop are named "Unknown.png"
+        https://bugs.webkit.org/show_bug.cgi?id=141515
+        <rdar://problem/9251308>
+
+        Reviewed by Wenson Hsieh.
+
+        In Web Inspector these images are <img src="..."> with data: or blob:
+        content. In these cases we have the image data but the URL does not
+        provide a useful name. In fact the name "Unknown.png" comes from
+        -[NSURLResponse suggestedFilename] for this URL / content.
+
+        To start, improve this situation for drags in Web Inspector pages.
+        If the image element being dragged has a filename attribute use that
+        as the suggested filename for the drag.
+
+        * WebProcess/WebCoreSupport/mac/WebDragClientMac.mm:
+        (WebKit::WebDragClient::declareAndWriteDragImage):
+
 2017-05-30  Ryosuke Niwa  <rniwa@webkit.org>
 

trunk/Source/WebKit2/WebProcess/WebCoreSupport/mac/WebDragClientMac.mm

@@ -174 +174 @@
         archiveSharedMemoryBuffer->createHandle(archiveHandle, SharedMemory::Protection::ReadOnly);
     }
-    m_page->send(Messages::WebPageProxy::SetPromisedDataForImage(pasteboardName, imageHandle, imageSize, String([response suggestedFilename]), extension, title, String([[response URL] absoluteString]), userVisibleString((NSURL *)url), archiveHandle, archiveSize));
+
+    String filename = String([response suggestedFilename]);
+    if (m_page->isInspectorPage()) {
+        String downloadFilename = ResourceResponseBase::sanitizeSuggestedFilename(element.attributeWithoutSynchronization(HTMLNames::filenameAttr));
+        if (!downloadFilename.isEmpty())
+            filename = downloadFilename;
+    }
+
+    m_page->send(Messages::WebPageProxy::SetPromisedDataForImage(pasteboardName, imageHandle, imageSize, filename, extension, title, String([[response URL] absoluteString]), userVisibleString((NSURL *)url), archiveHandle, archiveSize));
 }