<!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>[184758] branches/safari-601.1.32.2-branch/Source/WebKit2</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/184758">184758</a></dd>
<dt>Author</dt> <dd>bshafiei@apple.com</dd>
<dt>Date</dt> <dd>2015-05-21 23:35:57 -0700 (Thu, 21 May 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merged <a href="http://trac.webkit.org/projects/webkit/changeset/184739">r184739</a>. rdar://problem/20892362</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari6011322branchSourceWebKit2ChangeLog">branches/safari-601.1.32.2-branch/Source/WebKit2/ChangeLog</a></li>
<li><a href="#branchessafari6011322branchSourceWebKit2UIProcessAPICocoaWKWebViewmm">branches/safari-601.1.32.2-branch/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari6011322branchSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.32.2-branch/Source/WebKit2/ChangeLog (184757 => 184758)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.32.2-branch/Source/WebKit2/ChangeLog 2015-05-22 06:35:05 UTC (rev 184757)
+++ branches/safari-601.1.32.2-branch/Source/WebKit2/ChangeLog 2015-05-22 06:35:57 UTC (rev 184758)
</span><span class="lines">@@ -1,5 +1,26 @@
</span><span class="cx"> 2015-05-21 Babak Shafiei <bshafiei@apple.com>
</span><span class="cx">
</span><ins>+ Merge r184739.
+
+ 2015-05-21 Enrica Casucci <enrica@apple.com>
+
+ [iOS] Crash when taking a snapshot of a large PDF.
+ https://bugs.webkit.org/show_bug.cgi?id=145286
+ rdar://problem/20892362
+
+ Reviewed by Tim Horton.
+
+ The code for the PDF case was incorrectly computing the snapshot rect.
+ On top of that drawViewHierarchyInRect was ignoring the rect and
+ always creating an image using the view bounds causing the crash.
+ We are now always using the IOSurface if we are parented or
+ an image context when we are not.
+
+ * UIProcess/API/Cocoa/WKWebView.mm:
+ (-[WKWebView _snapshotRect:intoImageOfWidth:completionHandler:]):
+
+2015-05-21 Babak Shafiei <bshafiei@apple.com>
+
</ins><span class="cx"> Merge r184738.
</span><span class="cx">
</span><span class="cx"> 2015-05-21 Anders Carlsson <andersca@apple.com>
</span></span></pre></div>
<a id="branchessafari6011322branchSourceWebKit2UIProcessAPICocoaWKWebViewmm"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.32.2-branch/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm (184757 => 184758)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.32.2-branch/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2015-05-22 06:35:05 UTC (rev 184757)
+++ branches/safari-601.1.32.2-branch/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2015-05-22 06:35:57 UTC (rev 184758)
</span><span class="lines">@@ -2713,6 +2713,20 @@
</span><span class="cx"> CGFloat imageHeight = imageScale * snapshotRectInContentCoordinates.size.height;
</span><span class="cx"> CGSize imageSize = CGSizeMake(imageWidth, imageHeight);
</span><span class="cx">
</span><ins>+#if USE(IOSURFACE)
+ // If we are parented and thus won't incur a significant penalty from paging in tiles, snapshot the view hierarchy directly.
+ if (self.window) {
+ auto surface = WebCore::IOSurface::create(WebCore::expandedIntSize(WebCore::FloatSize(imageSize)), WebCore::ColorSpaceDeviceRGB);
+ CGFloat imageScaleInViewCoordinates = imageWidth / rectInViewCoordinates.size.width;
+ CATransform3D transform = CATransform3DMakeScale(imageScaleInViewCoordinates, imageScaleInViewCoordinates, 1);
+ transform = CATransform3DTranslate(transform, -rectInViewCoordinates.origin.x, -rectInViewCoordinates.origin.y, 0);
+ CARenderServerRenderLayerWithTransform(MACH_PORT_NULL, self.layer.context.contextId, reinterpret_cast<uint64_t>(self.layer), surface->surface(), 0, 0, &transform);
+ completionHandler(surface->createImage().get());
+
+ return;
+ }
+#endif
+
</ins><span class="cx"> if (_customContentView) {
</span><span class="cx"> UIGraphicsBeginImageContextWithOptions(imageSize, YES, 1);
</span><span class="cx">
</span><span class="lines">@@ -2720,41 +2734,18 @@
</span><span class="cx"> [customContentView.backgroundColor set];
</span><span class="cx"> UIRectFill(CGRectMake(0, 0, imageWidth, imageHeight));
</span><span class="cx">
</span><del>- CGRect destinationRect = customContentView.bounds;
- destinationRect.origin.x = -snapshotRectInContentCoordinates.origin.x * imageScale;
- destinationRect.origin.y = -snapshotRectInContentCoordinates.origin.y * imageScale;
- destinationRect.size.width *= imageScale;
- destinationRect.size.height *= imageScale;
</del><ins>+ CGContextRef context = UIGraphicsGetCurrentContext();
+ CGContextTranslateCTM(context, -snapshotRectInContentCoordinates.origin.x * imageScale, -snapshotRectInContentCoordinates.origin.y * imageScale);
+ CGContextScaleCTM(context, imageScale, imageScale);
+ [customContentView.layer renderInContext:context];
</ins><span class="cx">
</span><del>- if ([_customContentView window])
- [customContentView drawViewHierarchyInRect:destinationRect afterScreenUpdates:NO];
- else {
- CGContextRef context = UIGraphicsGetCurrentContext();
- CGContextTranslateCTM(context, destinationRect.origin.x, destinationRect.origin.y);
- CGContextScaleCTM(context, imageScale, imageScale);
- [customContentView.layer renderInContext:context];
- }
-
</del><span class="cx"> completionHandler([UIGraphicsGetImageFromCurrentImageContext() CGImage]);
</span><span class="cx">
</span><span class="cx"> UIGraphicsEndImageContext();
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if USE(IOSURFACE)
- // If we are parented and thus won't incur a significant penalty from paging in tiles, snapshot the view hierarchy directly.
- if (self.window) {
- auto surface = WebCore::IOSurface::create(WebCore::expandedIntSize(WebCore::FloatSize(imageSize)), WebCore::ColorSpaceDeviceRGB);
- CGFloat imageScaleInViewCoordinates = imageWidth / rectInViewCoordinates.size.width;
- CATransform3D transform = CATransform3DMakeScale(imageScaleInViewCoordinates, imageScaleInViewCoordinates, 1);
- transform = CATransform3DTranslate(transform, -rectInViewCoordinates.origin.x, -rectInViewCoordinates.origin.y, 0);
- CARenderServerRenderLayerWithTransform(MACH_PORT_NULL, self.layer.context.contextId, reinterpret_cast<uint64_t>(self.layer), surface->surface(), 0, 0, &transform);
- completionHandler(surface->createImage().get());
</del><span class="cx">
</span><del>- return;
- }
-#endif
-
</del><span class="cx"> void(^copiedCompletionHandler)(CGImageRef) = [completionHandler copy];
</span><span class="cx"> _page->takeSnapshot(WebCore::enclosingIntRect(snapshotRectInContentCoordinates), WebCore::expandedIntSize(WebCore::FloatSize(imageSize)), WebKit::SnapshotOptionsExcludeDeviceScaleFactor, [=](const WebKit::ShareableBitmap::Handle& imageHandle, WebKit::CallbackBase::Error) {
</span><span class="cx"> if (imageHandle.isNull()) {
</span></span></pre>
</div>
</div>
</body>
</html>