Changeset 239511 in webkit

Timestamp:

Dec 21, 2018 11:40:41 AM (5 years ago)

Author:

Wenson Hsieh

Message:

Setting the file wrapper and content type of an attachment to a PDF should update its image
​https://bugs.webkit.org/show_bug.cgi?id=192984
<rdar://problem/46798028>

Reviewed by Tim Horton.

Source/WebCore:

Allow PDF data to be used to update enclosing image elements when setting the file wrapper for an attachment.
Covered by a new API test: WKAttachmentTests.SetFileWrapperForPDFImageAttachment.

• html/HTMLAttachmentElement.cpp:

(WebCore::mimeTypeIsSuitableForInlineImageAttachment):
(WebCore::HTMLAttachmentElement::updateEnclosingImageWithData):

Tools:

Add an API test to verify that setting the file wrapper for a _WKAttachment with an enclosing image element with
PDF data correctly updates the image element.

• TestWebKitAPI/Tests/WebKitCocoa/WKAttachmentTests.mm:

Location:

trunk

Files:

• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/html/HTMLAttachmentElement.cpp (modified) (2 diffs)
• Tools/ChangeLog (modified) (1 diff)
• Tools/TestWebKitAPI/Tests/WebKitCocoa/WKAttachmentTests.mm (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2018-12-21  Wenson Hsieh  <wenson_hsieh@apple.com>
+
+        Setting the file wrapper and content type of an attachment to a PDF should update its image
+        https://bugs.webkit.org/show_bug.cgi?id=192984
+        <rdar://problem/46798028>
+
+        Reviewed by Tim Horton.
+
+        Allow PDF data to be used to update enclosing image elements when setting the file wrapper for an attachment.
+        Covered by a new API test: WKAttachmentTests.SetFileWrapperForPDFImageAttachment.
+
+        * html/HTMLAttachmentElement.cpp:
+        (WebCore::mimeTypeIsSuitableForInlineImageAttachment):
+        (WebCore::HTMLAttachmentElement::updateEnclosingImageWithData):
+
 2018-12-21  Justin Michaud  <justin_michaud@apple.com>
 

trunk/Source/WebCore/html/HTMLAttachmentElement.cpp

@@ -227 +227 @@
 }
 
+static bool mimeTypeIsSuitableForInlineImageAttachment(const String& mimeType)
+{
+    return MIMETypeRegistry::isSupportedImageMIMEType(mimeType) || MIMETypeRegistry::isPDFMIMEType(mimeType);
+}
+
 void HTMLAttachmentElement::updateEnclosingImageWithData(const String& contentType, Ref<SharedBuffer>&& data)
 {
@@ -239 +244 @@
 #endif
 
-    if (!MIMETypeRegistry::isSupportedImageMIMEType(mimeType))
+    if (!mimeTypeIsSuitableForInlineImageAttachment(mimeType))
         return;
 

trunk/Tools/ChangeLog

@@ +1 @@
+2018-12-21  Wenson Hsieh  <wenson_hsieh@apple.com>
+
+        Setting the file wrapper and content type of an attachment to a PDF should update its image
+        https://bugs.webkit.org/show_bug.cgi?id=192984
+        <rdar://problem/46798028>
+
+        Reviewed by Tim Horton.
+
+        Add an API test to verify that setting the file wrapper for a _WKAttachment with an enclosing image element with
+        PDF data correctly updates the image element.
+
+        * TestWebKitAPI/Tests/WebKitCocoa/WKAttachmentTests.mm:
+
 2018-12-21  Michael Catanzaro  <mcatanzaro@igalia.com>
 

trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/WKAttachmentTests.mm

@@ -1506 +1506 @@
 }
 
+TEST(WKAttachmentTests, SetFileWrapperForPDFImageAttachment)
+{
+    auto webView = webViewForTestingAttachments();
+    [webView evaluateJavaScript:@"document.body.appendChild()" completionHandler:nil];
+    NSString *identifier = [webView stringByEvaluatingJavaScript:@"const i = document.createElement('img'); document.body.appendChild(i); HTMLAttachmentElement.getAttachmentIdentifier(i)"];
+    _WKAttachment *attachment = [webView _attachmentForIdentifier:identifier];
+
+    auto pdfFile = adoptNS([[NSFileWrapper alloc] initRegularFileWithContents:testPDFData()]);
+    [attachment setFileWrapper:pdfFile.get() contentType:(__bridge NSString *)kUTTypePDF completion:nil];
+    [webView waitForImageElementSizeToBecome:CGSizeMake(130, 29)];
+}
+
 #pragma mark - Platform-specific tests