<!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>[212525] branches/safari-603-branch/Source</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/212525">212525</a></dd>
<dt>Author</dt> <dd>matthew_hanson@apple.com</dd>
<dt>Date</dt> <dd>2017-02-16 21:28:00 -0800 (Thu, 16 Feb 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/212260">r212260</a>. rdar://problem/30481079</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari603branchSourceWebCoreChangeLog">branches/safari-603-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari603branchSourceWebCoreplatformgraphicscocoaTextTrackRepresentationCocoamm">branches/safari-603-branch/Source/WebCore/platform/graphics/cocoa/TextTrackRepresentationCocoa.mm</a></li>
<li><a href="#branchessafari603branchSourceWebCoreplatformgraphicscocoaWebActionDisablingCALayerDelegateh">branches/safari-603-branch/Source/WebCore/platform/graphics/cocoa/WebActionDisablingCALayerDelegate.h</a></li>
<li><a href="#branchessafari603branchSourceWebCoreplatformspicocoaQuartzCoreSPIh">branches/safari-603-branch/Source/WebCore/platform/spi/cocoa/QuartzCoreSPI.h</a></li>
<li><a href="#branchessafari603branchSourceWebCoreplatformspimacNSViewSPIh">branches/safari-603-branch/Source/WebCore/platform/spi/mac/NSViewSPI.h</a></li>
<li><a href="#branchessafari603branchSourceWebKit2ChangeLog">branches/safari-603-branch/Source/WebKit2/ChangeLog</a></li>
<li><a href="#branchessafari603branchSourceWebKit2WebProcessWebProcesscpp">branches/safari-603-branch/Source/WebKit2/WebProcess/WebProcess.cpp</a></li>
<li><a href="#branchessafari603branchSourceWebKit2WebProcesscocoaWebProcessCocoamm">branches/safari-603-branch/Source/WebKit2/WebProcess/cocoa/WebProcessCocoa.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari603branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Source/WebCore/ChangeLog (212524 => 212525)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Source/WebCore/ChangeLog 2017-02-17 05:13:17 UTC (rev 212524)
+++ branches/safari-603-branch/Source/WebCore/ChangeLog 2017-02-17 05:28:00 UTC (rev 212525)
</span><span class="lines">@@ -1,5 +1,25 @@
</span><span class="cx"> 2017-02-16 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><ins>+ Merge r212260. rdar://problem/30481079
+
+ 2017-02-13 Simon Fraser <simon.fraser@apple.com>
+
+ Call WKDestroyRenderingResources() on iOS when tabs are backgrounded
+ https://bugs.webkit.org/show_bug.cgi?id=168261
+ rdar://problem/30481079
+
+ Reviewed by Tim Horton.
+
+ Add CABackingStoreCollectBlocking() to QuartzCoreSPI.h, and fix files in WebCore
+ that do a framework include.
+
+ * platform/graphics/cocoa/TextTrackRepresentationCocoa.mm:
+ * platform/graphics/cocoa/WebActionDisablingCALayerDelegate.h:
+ * platform/spi/cocoa/QuartzCoreSPI.h:
+ * platform/spi/mac/NSViewSPI.h:
+
+2017-02-16 Matthew Hanson <matthew_hanson@apple.com>
+
</ins><span class="cx"> Merge r212214. rdar://problem/30451581
</span><span class="cx">
</span><span class="cx"> 2017-02-12 Ryosuke Niwa <rniwa@webkit.org>
</span></span></pre></div>
<a id="branchessafari603branchSourceWebCoreplatformgraphicscocoaTextTrackRepresentationCocoamm"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Source/WebCore/platform/graphics/cocoa/TextTrackRepresentationCocoa.mm (212524 => 212525)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Source/WebCore/platform/graphics/cocoa/TextTrackRepresentationCocoa.mm 2017-02-17 05:13:17 UTC (rev 212524)
+++ branches/safari-603-branch/Source/WebCore/platform/graphics/cocoa/TextTrackRepresentationCocoa.mm 2017-02-17 05:28:00 UTC (rev 212525)
</span><span class="lines">@@ -32,7 +32,7 @@
</span><span class="cx"> #include "GraphicsContextCG.h"
</span><span class="cx"> #include "IntRect.h"
</span><span class="cx">
</span><del>-#import <WebCore/QuartzCoreSPI.h>
</del><ins>+#import "QuartzCoreSPI.h"
</ins><span class="cx">
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> #include "WebCoreThread.h"
</span></span></pre></div>
<a id="branchessafari603branchSourceWebCoreplatformgraphicscocoaWebActionDisablingCALayerDelegateh"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Source/WebCore/platform/graphics/cocoa/WebActionDisablingCALayerDelegate.h (212524 => 212525)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Source/WebCore/platform/graphics/cocoa/WebActionDisablingCALayerDelegate.h 2017-02-17 05:13:17 UTC (rev 212524)
+++ branches/safari-603-branch/Source/WebCore/platform/graphics/cocoa/WebActionDisablingCALayerDelegate.h 2017-02-17 05:28:00 UTC (rev 212525)
</span><span class="lines">@@ -26,7 +26,7 @@
</span><span class="cx"> #ifndef WebActionDisablingCALayerDelegate_h
</span><span class="cx"> #define WebActionDisablingCALayerDelegate_h
</span><span class="cx">
</span><del>-#import <WebCore/QuartzCoreSPI.h>
</del><ins>+#import "QuartzCoreSPI.h"
</ins><span class="cx">
</span><span class="cx"> WEBCORE_EXPORT @interface WebActionDisablingCALayerDelegate : NSObject <CALayerDelegate>
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari603branchSourceWebCoreplatformspicocoaQuartzCoreSPIh"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Source/WebCore/platform/spi/cocoa/QuartzCoreSPI.h (212524 => 212525)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Source/WebCore/platform/spi/cocoa/QuartzCoreSPI.h 2017-02-17 05:13:17 UTC (rev 212524)
+++ branches/safari-603-branch/Source/WebCore/platform/spi/cocoa/QuartzCoreSPI.h 2017-02-17 05:28:00 UTC (rev 212525)
</span><span class="lines">@@ -28,6 +28,7 @@
</span><span class="cx">
</span><span class="cx"> #if USE(APPLE_INTERNAL_SDK)
</span><span class="cx">
</span><ins>+#include <QuartzCore/CABackingStore.h>
</ins><span class="cx"> #include <QuartzCore/CAColorMatrix.h>
</span><span class="cx"> #include <QuartzCore/CARenderServer.h>
</span><span class="cx">
</span><span class="lines">@@ -196,6 +197,8 @@
</span><span class="cx"> mach_port_t CAMachPortGetPort(CAMachPortRef);
</span><span class="cx"> CFTypeID CAMachPortGetTypeID(void);
</span><span class="cx">
</span><ins>+void CABackingStoreCollectBlocking(void);
+
</ins><span class="cx"> WTF_EXTERN_C_END
</span><span class="cx">
</span><span class="cx"> // FIXME: Move this into the APPLE_INTERNAL_SDK block once it's in an SDK.
</span><span class="lines">@@ -246,4 +249,5 @@
</span><span class="cx">
</span><span class="cx"> @protocol CAAnimationDelegate <NSObject>
</span><span class="cx"> @end
</span><del>-#endif
</del><ins>+
+#endif // USE(APPLE_INTERNAL_SDK)
</ins></span></pre></div>
<a id="branchessafari603branchSourceWebCoreplatformspimacNSViewSPIh"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Source/WebCore/platform/spi/mac/NSViewSPI.h (212524 => 212525)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Source/WebCore/platform/spi/mac/NSViewSPI.h 2017-02-17 05:13:17 UTC (rev 212524)
+++ branches/safari-603-branch/Source/WebCore/platform/spi/mac/NSViewSPI.h 2017-02-17 05:28:00 UTC (rev 212525)
</span><span class="lines">@@ -25,7 +25,7 @@
</span><span class="cx">
</span><span class="cx"> #if USE(APPKIT)
</span><span class="cx">
</span><del>-#import <WebCore/QuartzCoreSPI.h>
</del><ins>+#import "QuartzCoreSPI.h"
</ins><span class="cx">
</span><span class="cx"> @interface NSView () <CALayerDelegate>
</span><span class="cx"> @end
</span></span></pre></div>
<a id="branchessafari603branchSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Source/WebKit2/ChangeLog (212524 => 212525)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Source/WebKit2/ChangeLog 2017-02-17 05:13:17 UTC (rev 212524)
+++ branches/safari-603-branch/Source/WebKit2/ChangeLog 2017-02-17 05:28:00 UTC (rev 212525)
</span><span class="lines">@@ -1,5 +1,31 @@
</span><span class="cx"> 2017-02-16 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><ins>+ Merge r212260. rdar://problem/30481079
+
+ 2017-02-13 Simon Fraser <simon.fraser@apple.com>
+
+ Call WKDestroyRenderingResources() on iOS when tabs are backgrounded
+ https://bugs.webkit.org/show_bug.cgi?id=168261
+ rdar://problem/30481079
+
+ Reviewed by Tim Horton.
+
+ There's code to call CABackingStoreCollectBlocking() on a 10s timer that exists for Mac, but on iOS
+ the web processes are suspended before this timer fires. So call CABackingStoreCollectBlocking()
+ from WebProcess::actualPrepareToSuspend(), which is where we also trigger the markAllLayersVolatile()
+ code.
+
+ Also add CABackingStoreCollectBlocking() to QuartzCoreSPI.h so we can use it without using WKSI.
+
+ Release-log how long this takes, in case we get reports of bad performance. In my testing it could be up to 10ms.
+
+ * WebProcess/WebProcess.cpp:
+ (WebKit::WebProcess::actualPrepareToSuspend):
+ * WebProcess/cocoa/WebProcessCocoa.mm:
+ (WebKit::WebProcess::destroyRenderingResources):
+
+2017-02-16 Matthew Hanson <matthew_hanson@apple.com>
+
</ins><span class="cx"> Merge r212256. rdar://problem/30313696
</span><span class="cx">
</span><span class="cx"> 2017-02-13 Brady Eidson <beidson@apple.com>
</span></span></pre></div>
<a id="branchessafari603branchSourceWebKit2WebProcessWebProcesscpp"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Source/WebKit2/WebProcess/WebProcess.cpp (212524 => 212525)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Source/WebKit2/WebProcess/WebProcess.cpp 2017-02-17 05:13:17 UTC (rev 212524)
+++ branches/safari-603-branch/Source/WebKit2/WebProcess/WebProcess.cpp 2017-02-17 05:28:00 UTC (rev 212525)
</span><span class="lines">@@ -1292,6 +1292,10 @@
</span><span class="cx"> MemoryPressureHandler::singleton().releaseMemory(Critical::Yes, Synchronous::Yes);
</span><span class="cx">
</span><span class="cx"> setAllLayerTreeStatesFrozen(true);
</span><ins>+
+#if PLATFORM(COCOA)
+ destroyRenderingResources();
+#endif
</ins><span class="cx">
</span><span class="cx"> markAllLayersVolatile([this, shouldAcknowledgeWhenReadyToSuspend] {
</span><span class="cx"> RELEASE_LOG(ProcessSuspension, "%p - WebProcess::markAllLayersVolatile() Successfuly marked all layers as volatile", this);
</span></span></pre></div>
<a id="branchessafari603branchSourceWebKit2WebProcesscocoaWebProcessCocoamm"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Source/WebKit2/WebProcess/cocoa/WebProcessCocoa.mm (212524 => 212525)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Source/WebKit2/WebProcess/cocoa/WebProcessCocoa.mm 2017-02-17 05:13:17 UTC (rev 212524)
+++ branches/safari-603-branch/Source/WebKit2/WebProcess/cocoa/WebProcessCocoa.mm 2017-02-17 05:28:00 UTC (rev 212525)
</span><span class="lines">@@ -27,6 +27,7 @@
</span><span class="cx"> #import "WebProcess.h"
</span><span class="cx">
</span><span class="cx"> #import "CustomProtocolManager.h"
</span><ins>+#import "Logging.h"
</ins><span class="cx"> #import "ObjCObjectGraph.h"
</span><span class="cx"> #import "SandboxExtension.h"
</span><span class="cx"> #import "SandboxInitializationParameters.h"
</span><span class="lines">@@ -52,6 +53,7 @@
</span><span class="cx"> #import <WebCore/MemoryRelease.h>
</span><span class="cx"> #import <WebCore/NSAccessibilitySPI.h>
</span><span class="cx"> #import <WebCore/PerformanceLogging.h>
</span><ins>+#import <WebCore/QuartzCoreSPI.h>
</ins><span class="cx"> #import <WebCore/RuntimeApplicationChecks.h>
</span><span class="cx"> #import <WebCore/VNodeTracker.h>
</span><span class="cx"> #import <WebCore/WebCoreNSURLExtras.h>
</span><span class="lines">@@ -442,7 +444,14 @@
</span><span class="cx">
</span><span class="cx"> void WebProcess::destroyRenderingResources()
</span><span class="cx"> {
</span><del>- WKDestroyRenderingResources();
</del><ins>+#if !RELEASE_LOG_DISABLED
+ double startTime = monotonicallyIncreasingTime();
+#endif
+ CABackingStoreCollectBlocking();
+#if !RELEASE_LOG_DISABLED
+ double endTime = monotonicallyIncreasingTime();
+#endif
+ RELEASE_LOG(ProcessSuspension, "%p - WebProcess::destroyRenderingResources() took %.2fms", this, (endTime - startTime) * 1000.0);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WebKit
</span></span></pre>
</div>
</div>
</body>
</html>