<!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>[198250] branches/safari-601.1.46-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/198250">198250</a></dd>
<dt>Author</dt> <dd>matthew_hanson@apple.com</dd>
<dt>Date</dt> <dd>2016-03-15 17:22:14 -0700 (Tue, 15 Mar 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/195982">r195982</a>. rdar://problem/24560759</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari601146branchSourceWebKit2ChangeLog">branches/safari-601.1.46-branch/Source/WebKit2/ChangeLog</a></li>
<li><a href="#branchessafari601146branchSourceWebKit2UIProcessiosWKPDFViewmm">branches/safari-601.1.46-branch/Source/WebKit2/UIProcess/ios/WKPDFView.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari601146branchSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/Source/WebKit2/ChangeLog (198249 => 198250)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/Source/WebKit2/ChangeLog 2016-03-16 00:22:12 UTC (rev 198249)
+++ branches/safari-601.1.46-branch/Source/WebKit2/ChangeLog 2016-03-16 00:22:14 UTC (rev 198250)
</span><span class="lines">@@ -1,5 +1,29 @@
</span><span class="cx"> 2016-03-15 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><ins>+ Merge r195982. rdar://problem/24560759
+
+ 2016-02-01 Tim Horton <timothy_horton@apple.com>
+
+ Crash using WKPDFView, in -[UIPDFPageView showContent]
+ https://bugs.webkit.org/show_bug.cgi?id=153770
+ <rdar://problem/20157864>
+
+ Reviewed by Anders Carlsson.
+
+ When scrolling, we throw away UIPDFPageViews, but forget to unhook their delegates.
+ In some cases (also because their delegate is a raw pointer, not weak), they can call
+ back into a deleted WKPDFView, causing a crash.
+
+ * UIProcess/ios/WKPDFView.mm:
+ (detachViewForPage):
+ Add a helper to detach a page view, and unhook its delegates.
+
+ (-[WKPDFView _clearPages]):
+ (-[WKPDFView _revalidateViews]):
+ Make use of the new helper.
+
+2016-03-15 Matthew Hanson <matthew_hanson@apple.com>
+
</ins><span class="cx"> Merge r194060. rdar://problem/24560757
</span><span class="cx">
</span><span class="cx"> 2015-12-14 Tim Horton <timothy_horton@apple.com>
</span></span></pre></div>
<a id="branchessafari601146branchSourceWebKit2UIProcessiosWKPDFViewmm"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/Source/WebKit2/UIProcess/ios/WKPDFView.mm (198249 => 198250)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/Source/WebKit2/UIProcess/ios/WKPDFView.mm 2016-03-16 00:22:12 UTC (rev 198249)
+++ branches/safari-601.1.46-branch/Source/WebKit2/UIProcess/ios/WKPDFView.mm 2016-03-16 00:22:14 UTC (rev 198250)
</span><span class="lines">@@ -153,13 +153,18 @@
</span><span class="cx"> return [_pdfDocument CGDocument];
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+static void detachViewForPage(PDFPageInfo& page)
+{
+ [page.view removeFromSuperview];
+ [page.view setDelegate:nil];
+ [[page.view annotationController] setDelegate:nil];
+ page.view = nil;
+}
+
</ins><span class="cx"> - (void)_clearPages
</span><span class="cx"> {
</span><del>- for (auto& page : _pages) {
- [page.view removeFromSuperview];
- [page.view setDelegate:nil];
- [[page.view annotationController] setDelegate:nil];
- }
</del><ins>+ for (auto& page : _pages)
+ detachViewForPage(page);
</ins><span class="cx">
</span><span class="cx"> _pages.clear();
</span><span class="cx"> }
</span><span class="lines">@@ -265,8 +270,7 @@
</span><span class="cx">
</span><span class="cx"> for (auto& pageInfo : _pages) {
</span><span class="cx"> if (!CGRectIntersectsRect(pageInfo.frame, targetRectWithOverdraw) && pageInfo.index != _currentFindPageIndex) {
</span><del>- [pageInfo.view removeFromSuperview];
- pageInfo.view = nullptr;
</del><ins>+ detachViewForPage(pageInfo);
</ins><span class="cx"> continue;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>