[prev in list] [next in list] [prev in thread] [next in thread]
List: webkit-changes
Subject: [webkit-changes] [239511] trunk
From: wenson_hsieh () apple ! com
Date: 2018-12-21 19:40:41
Message-ID: 20181221194041.CDECD10051CE () svn ! webkit ! org
[Download RAW message or body]
[Attachment #2 (text/html)]
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[239511] trunk</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: \
verdana,arial,helvetica,sans-serif; font-size: 10pt; } #msg dl a { font-weight: \
bold} #msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: \
bold; } #msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: \
6px; } #logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em \
0; } #logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg \
h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; } \
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; \
} #logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: \
-1.5em; padding-left: 1.5em; } #logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em \
1em 0 1em; background: white;} #logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid \
#fa0; border-bottom: 1px solid #fa0; background: #fff; } #logmsg table th { \
text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted \
#fa0; } #logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: \
0.2em 0.5em; } #logmsg table thead th { text-align: center; border-bottom: 1px solid \
#fa0; } #logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: \
6px; } #patch { width: 100%; }
#patch h4 {font-family: \
verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, \
#patch .copfile {border:1px solid #ccc;margin:10px 0;} #patch ins \
{background:#dfd;text-decoration:none;display:block;padding:0 10px;} #patch del \
{background:#fdd;text-decoration:none;display:block;padding:0 10px;} #patch .lines, \
.info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a \
href="http://trac.webkit.org/projects/webkit/changeset/239511">239511</a></dd> \
<dt>Author</dt> <dd>wenson_hsieh@apple.com</dd> <dt>Date</dt> <dd>2018-12-21 11:40:41 \
-0800 (Fri, 21 Dec 2018)</dd> </dl>
<h3>Log Message</h3>
<pre>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:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLAttachmentElementcpp">trunk/Source/WebCore/html/HTMLAttachmentElement.cpp</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWebKitCocoaWKAttachmentTestsmm">trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/WKAttachmentTests.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (239510 => \
239511)</h4> <pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2018-12-21 19:37:40 UTC (rev \
239510)
+++ trunk/Source/WebCore/ChangeLog 2018-12-21 19:40:41 UTC (rev 239511)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+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):
+
</ins><span class="cx"> 2018-12-21 Justin Michaud <justin_michaud@apple.com>
</span><span class="cx">
</span><span class="cx"> Repeated background images with zero size should \
display the background color </span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLAttachmentElementcpp"></a>
<div class="modfile"><h4>Modified: \
trunk/Source/WebCore/html/HTMLAttachmentElement.cpp (239510 => 239511)</h4> <pre \
class="diff"><span> <span class="info">--- \
trunk/Source/WebCore/html/HTMLAttachmentElement.cpp 2018-12-21 19:37:40 UTC (rev \
239510)
+++ trunk/Source/WebCore/html/HTMLAttachmentElement.cpp 2018-12-21 19:40:41 UTC (rev \
239511) </span><span class="lines">@@ -226,6 +226,11 @@
</span><span class="cx"> renderer->invalidate();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+static bool mimeTypeIsSuitableForInlineImageAttachment(const String& \
mimeType) +{
+ return MIMETypeRegistry::isSupportedImageMIMEType(mimeType) || \
MIMETypeRegistry::isPDFMIMEType(mimeType); +}
+
</ins><span class="cx"> void \
HTMLAttachmentElement::updateEnclosingImageWithData(const String& contentType, \
Ref<SharedBuffer>&& data) </span><span class="cx"> {
</span><span class="cx"> auto* hostElement = shadowHost();
</span><span class="lines">@@ -238,7 +243,7 @@
</span><span class="cx"> mimeType = MIMETypeFromUTI(contentType);
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>- if (!MIMETypeRegistry::isSupportedImageMIMEType(mimeType))
</del><ins>+ if (!mimeTypeIsSuitableForInlineImageAttachment(mimeType))
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> \
hostElement->setAttributeWithoutSynchronization(HTMLNames::srcAttr, \
DOMURL::createObjectURL(document(), Blob::create(WTFMove(data), mimeType))); \
</span></span></pre></div> <a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (239510 => 239511)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2018-12-21 19:37:40 UTC (rev 239510)
+++ trunk/Tools/ChangeLog 2018-12-21 19:40:41 UTC (rev 239511)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+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:
+
</ins><span class="cx"> 2018-12-21 Michael Catanzaro <mcatanzaro@igalia.com>
</span><span class="cx">
</span><span class="cx"> Add JSCOnly to bot dashboard
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebKitCocoaWKAttachmentTestsmm"></a>
<div class="modfile"><h4>Modified: \
trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/WKAttachmentTests.mm (239510 => \
239511)</h4> <pre class="diff"><span>
<span class="info">--- \
trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/WKAttachmentTests.mm 2018-12-21 19:37:40 \
UTC (rev 239510)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/WKAttachmentTests.mm 2018-12-21 \
19:40:41 UTC (rev 239511) </span><span class="lines">@@ -1505,6 +1505,18 @@
</span><span class="cx"> EXPECT_WK_STREQ([attachment uniqueIdentifier], [webView \
stringByEvaluatingJavaScript:@"document.body.cloneNode(true).querySelector('attachment').uniqueIdentifier"]);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+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)];
+}
+
</ins><span class="cx"> #pragma mark - Platform-specific tests
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(MAC)
</span></span></pre>
</div>
</div>
</body>
</html>
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic