<!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>[202863] trunk/Source/WebCore</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/202863">202863</a></dd>
<dt>Author</dt> <dd>timothy_horton@apple.com</dd>
<dt>Date</dt> <dd>2016-07-06 10:34:19 -0700 (Wed, 06 Jul 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Long spin editing text at top of message containing Reader version of web page with many GIFs
https://bugs.webkit.org/show_bug.cgi?id=159444
<rdar://problem/26790386>
Reviewed by Sam Weinig.
* editing/cocoa/HTMLConverter.mm:
(fileWrapperForElement):
Instead of looking up the image's data in the cache by URL, just use the
CachedImage on the HTMLImageElement. There are situations (which seem to involve
cloning the DOM then having the cloned DOM get garbage collected) where the image
can be removed from the cache, but still be live in the document.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreeditingcocoaHTMLConvertermm">trunk/Source/WebCore/editing/cocoa/HTMLConverter.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (202862 => 202863)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-07-06 17:19:20 UTC (rev 202862)
+++ trunk/Source/WebCore/ChangeLog 2016-07-06 17:34:19 UTC (rev 202863)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2016-07-06 Tim Horton <timothy_horton@apple.com>
+
+ Long spin editing text at top of message containing Reader version of web page with many GIFs
+ https://bugs.webkit.org/show_bug.cgi?id=159444
+ <rdar://problem/26790386>
+
+ Reviewed by Sam Weinig.
+
+ * editing/cocoa/HTMLConverter.mm:
+ (fileWrapperForElement):
+ Instead of looking up the image's data in the cache by URL, just use the
+ CachedImage on the HTMLImageElement. There are situations (which seem to involve
+ cloning the DOM then having the cloned DOM get garbage collected) where the image
+ can be removed from the cache, but still be live in the document.
+
</ins><span class="cx"> 2016-07-06 Brady Eidson <beidson@apple.com>
</span><span class="cx">
</span><span class="cx"> Hold RefPtr<>'s to UniqueIDBDatabases while performing user delete.
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingcocoaHTMLConvertermm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/cocoa/HTMLConverter.mm (202862 => 202863)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/cocoa/HTMLConverter.mm 2016-07-06 17:19:20 UTC (rev 202862)
+++ trunk/Source/WebCore/editing/cocoa/HTMLConverter.mm 2016-07-06 17:34:19 UTC (rev 202863)
</span><span class="lines">@@ -317,7 +317,7 @@
</span><span class="cx">
</span><span class="cx"> #else
</span><span class="cx"> static NSFileWrapper *fileWrapperForURL(DocumentLoader *, NSURL *);
</span><del>-static NSFileWrapper *fileWrapperForElement(HTMLImageElement&);
</del><ins>+static RetainPtr<NSFileWrapper> fileWrapperForElement(HTMLImageElement&);
</ins><span class="cx">
</span><span class="cx"> @interface NSTextAttachment (WebCoreNSTextAttachment)
</span><span class="cx"> - (void)setIgnoresOrientation:(BOOL)flag;
</span><span class="lines">@@ -2453,24 +2453,24 @@
</span><span class="cx"> return nil;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static NSFileWrapper *fileWrapperForElement(HTMLImageElement& element)
</del><ins>+static RetainPtr<NSFileWrapper> fileWrapperForElement(HTMLImageElement& element)
</ins><span class="cx"> {
</span><del>- // FIXME: Should this use currentSrc instead of src?
- auto src = element.src();
- NSFileWrapper *wrapper = src.isEmpty() ? nil : fileWrapperForURL(element.document().loader(), src);
</del><ins>+ if (CachedImage* cachedImage = element.cachedImage()) {
+ if (SharedBuffer* sharedBuffer = cachedImage->resourceBuffer())
+ return adoptNS([[NSFileWrapper alloc] initRegularFileWithContents:sharedBuffer->createNSData().get()]);
+ }
</ins><span class="cx">
</span><del>- if (!wrapper) {
- auto* renderer = element.renderer();
- if (is<RenderImage>(renderer)) {
- auto* image = downcast<RenderImage>(*renderer).cachedImage();
- if (image && !image->errorOccurred()) {
- wrapper = [[[NSFileWrapper alloc] initRegularFileWithContents:(NSData *)image->imageForRenderer(renderer)->getTIFFRepresentation()] autorelease];
- [wrapper setPreferredFilename:@"image.tiff"];
- }
</del><ins>+ auto* renderer = element.renderer();
+ if (is<RenderImage>(renderer)) {
+ auto* image = downcast<RenderImage>(*renderer).cachedImage();
+ if (image && !image->errorOccurred()) {
+ RetainPtr<NSFileWrapper> wrapper = adoptNS([[NSFileWrapper alloc] initRegularFileWithContents:(NSData *)image->imageForRenderer(renderer)->getTIFFRepresentation()]);
+ [wrapper setPreferredFilename:@"image.tiff"];
+ return wrapper;
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- return wrapper;
</del><ins>+ return nil;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #endif
</span><span class="lines">@@ -2505,8 +2505,8 @@
</span><span class="cx"> if (&startContainer == &endContainer && (startOffset == endOffset - 1)) {
</span><span class="cx"> Node* node = startContainer.traverseToChildAt(startOffset);
</span><span class="cx"> if (is<HTMLImageElement>(node)) {
</span><del>- auto fileWrapper = fileWrapperForElement(downcast<HTMLImageElement>(*node));
- NSTextAttachment *attachment = [[NSTextAttachment alloc] initWithFileWrapper:fileWrapper];
</del><ins>+ RetainPtr<NSFileWrapper> fileWrapper = fileWrapperForElement(downcast<HTMLImageElement>(*node));
+ NSTextAttachment *attachment = [[NSTextAttachment alloc] initWithFileWrapper:fileWrapper.get()];
</ins><span class="cx"> [string appendAttributedString:[NSAttributedString attributedStringWithAttachment:attachment]];
</span><span class="cx"> [attachment release];
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>