<!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>[210688] 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/210688">210688</a></dd>
<dt>Author</dt> <dd>akling@apple.com</dd>
<dt>Date</dt> <dd>2017-01-12 16:47:37 -0800 (Thu, 12 Jan 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>[iOS] Purge GraphicsServices font cache on memory warning.
<https://webkit.org/b/154343>
Reviewed by Antti Koivisto.
Source/WebCore:
The GS font cache was retaining CSS fonts after we stopped using them.
Call SPI to release them on memory pressure. This is one of multiple
steps necessary to actually free the fonts.
* Configurations/WebCore.xcconfig:
* page/cocoa/MemoryReleaseCocoa.mm:
(WebCore::platformReleaseMemory):
* platform/cocoa/MemoryPressureHandlerCocoa.mm:
* platform/spi/ios/GraphicsServicesSPI.h:
WebKitLibraries:
* WebKitPrivateFrameworkStubs/iOS/10/GraphicsServices.framework/GraphicsServices.tbd: Add SPI.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreConfigurationsWebCorexcconfig">trunk/Source/WebCore/Configurations/WebCore.xcconfig</a></li>
<li><a href="#trunkSourceWebCorepagecocoaMemoryReleaseCocoamm">trunk/Source/WebCore/page/cocoa/MemoryReleaseCocoa.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformcocoaMemoryPressureHandlerCocoamm">trunk/Source/WebCore/platform/cocoa/MemoryPressureHandlerCocoa.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformspiiosGraphicsServicesSPIh">trunk/Source/WebCore/platform/spi/ios/GraphicsServicesSPI.h</a></li>
<li><a href="#trunkWebKitLibrariesChangeLog">trunk/WebKitLibraries/ChangeLog</a></li>
<li><a href="#trunkWebKitLibrariesWebKitPrivateFrameworkStubsiOS10GraphicsServicesframeworkGraphicsServicestbd">trunk/WebKitLibraries/WebKitPrivateFrameworkStubs/iOS/10/GraphicsServices.framework/GraphicsServices.tbd</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (210687 => 210688)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2017-01-13 00:36:58 UTC (rev 210687)
+++ trunk/Source/WebCore/ChangeLog 2017-01-13 00:47:37 UTC (rev 210688)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2017-01-12 Andreas Kling <akling@apple.com>
+
+ [iOS] Purge GraphicsServices font cache on memory warning.
+ <https://webkit.org/b/154343>
+
+ Reviewed by Antti Koivisto.
+
+ The GS font cache was retaining CSS fonts after we stopped using them.
+ Call SPI to release them on memory pressure. This is one of multiple
+ steps necessary to actually free the fonts.
+
+ * Configurations/WebCore.xcconfig:
+ * page/cocoa/MemoryReleaseCocoa.mm:
+ (WebCore::platformReleaseMemory):
+ * platform/cocoa/MemoryPressureHandlerCocoa.mm:
+ * platform/spi/ios/GraphicsServicesSPI.h:
+
</ins><span class="cx"> 2017-01-12 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> Unreviewed EFL/GTK build fix after r210684.
</span></span></pre></div>
<a id="trunkSourceWebCoreConfigurationsWebCorexcconfig"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Configurations/WebCore.xcconfig (210687 => 210688)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Configurations/WebCore.xcconfig 2017-01-13 00:36:58 UTC (rev 210687)
+++ trunk/Source/WebCore/Configurations/WebCore.xcconfig 2017-01-13 00:47:37 UTC (rev 210688)
</span><span class="lines">@@ -69,7 +69,7 @@
</span><span class="cx"> OTHER_LDFLAGS = $(inherited) $(OTHER_LDFLAGS_PLATFORM)
</span><span class="cx"> OTHER_LDFLAGS_BASE = -lsqlite3 -lobjc -lANGLE;
</span><span class="cx"> OTHER_LDFLAGS_BASE_ios = $(OTHER_LDFLAGS_BASE) -framework CFNetwork -framework CoreGraphics -framework CoreText -framework Foundation -framework ImageIO -framework MobileCoreServices -framework OpenGLES -lMobileGestalt $(WK_IOS_BINCOMPAT_LDFLAGS);
</span><del>-OTHER_LDFLAGS_PLATFORM[sdk=iphoneos*] = $(OTHER_LDFLAGS_BASE_ios) -framework IOSurface;
</del><ins>+OTHER_LDFLAGS_PLATFORM[sdk=iphoneos*] = $(OTHER_LDFLAGS_BASE_ios) -framework IOSurface -framework GraphicsServices;
</ins><span class="cx"> OTHER_LDFLAGS_PLATFORM[sdk=iphonesimulator*] = $(OTHER_LDFLAGS_BASE_ios);
</span><span class="cx"> OTHER_LDFLAGS_PLATFORM[sdk=macosx*] = $(OTHER_LDFLAGS_BASE) -sub_library libobjc -umbrella WebKit -allowable_client WebCoreTestSupport -allowable_client WebKit2 -allowable_client WebKitLegacy -framework ApplicationServices -framework AudioUnit -framework Carbon -framework Cocoa -framework CoreAudio -framework DataDetectorsCore -framework IOSurface -framework OpenGL -framework SystemConfiguration;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorepagecocoaMemoryReleaseCocoamm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/cocoa/MemoryReleaseCocoa.mm (210687 => 210688)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/cocoa/MemoryReleaseCocoa.mm 2017-01-13 00:36:58 UTC (rev 210687)
+++ trunk/Source/WebCore/page/cocoa/MemoryReleaseCocoa.mm 2017-01-13 00:47:37 UTC (rev 210688)
</span><span class="lines">@@ -27,6 +27,7 @@
</span><span class="cx"> #include "MemoryRelease.h"
</span><span class="cx">
</span><span class="cx"> #import "GCController.h"
</span><ins>+#import "GraphicsServicesSPI.h"
</ins><span class="cx"> #import "IOSurfacePool.h"
</span><span class="cx"> #import "LayerPool.h"
</span><span class="cx"> #import <notify.h>
</span><span class="lines">@@ -37,6 +38,10 @@
</span><span class="cx">
</span><span class="cx"> void platformReleaseMemory(Critical)
</span><span class="cx"> {
</span><ins>+#if PLATFORM(IOS) && !PLATFORM(IOS_SIMULATOR)
+ GSFontPurgeFontCache();
+#endif
+
</ins><span class="cx"> _sqlite3_purgeEligiblePagerCacheMemory();
</span><span class="cx">
</span><span class="cx"> for (auto& pool : LayerPool::allLayerPools())
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformcocoaMemoryPressureHandlerCocoamm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/cocoa/MemoryPressureHandlerCocoa.mm (210687 => 210688)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/cocoa/MemoryPressureHandlerCocoa.mm 2017-01-13 00:36:58 UTC (rev 210687)
+++ trunk/Source/WebCore/platform/cocoa/MemoryPressureHandlerCocoa.mm 2017-01-13 00:47:37 UTC (rev 210688)
</span><span class="lines">@@ -34,6 +34,7 @@
</span><span class="cx"> #import <wtf/CurrentTime.h>
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(IOS)
</span><ins>+#import "GraphicsServicesSPI.h"
</ins><span class="cx"> #import "SystemMemory.h"
</span><span class="cx"> #import "WebCoreThread.h"
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformspiiosGraphicsServicesSPIh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/spi/ios/GraphicsServicesSPI.h (210687 => 210688)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/spi/ios/GraphicsServicesSPI.h 2017-01-13 00:36:58 UTC (rev 210687)
+++ trunk/Source/WebCore/platform/spi/ios/GraphicsServicesSPI.h 2017-01-13 00:47:37 UTC (rev 210688)
</span><span class="lines">@@ -41,6 +41,7 @@
</span><span class="cx"> void GSInitialize(void);
</span><span class="cx"> uint64_t GSCurrentEventTimestamp(void);
</span><span class="cx"> CFStringRef GSSystemRootDirectory(void);
</span><ins>+void GSFontPurgeFontCache(void);
</ins><span class="cx">
</span><span class="cx"> WTF_EXTERN_C_END
</span><span class="cx">
</span></span></pre></div>
<a id="trunkWebKitLibrariesChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/WebKitLibraries/ChangeLog (210687 => 210688)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebKitLibraries/ChangeLog 2017-01-13 00:36:58 UTC (rev 210687)
+++ trunk/WebKitLibraries/ChangeLog 2017-01-13 00:47:37 UTC (rev 210688)
</span><span class="lines">@@ -1,3 +1,12 @@
</span><ins>+2017-01-12 Andreas Kling <akling@apple.com>
+
+ [iOS] Purge GraphicsServices font cache on memory warning.
+ <https://webkit.org/b/154343>
+
+ Reviewed by Antti Koivisto.
+
+ * WebKitPrivateFrameworkStubs/iOS/10/GraphicsServices.framework/GraphicsServices.tbd: Add SPI.
+
</ins><span class="cx"> 2017-01-01 Jeff Miller <jeffm@apple.com>
</span><span class="cx">
</span><span class="cx"> Update user-visible copyright strings to include 2017
</span></span></pre></div>
<a id="trunkWebKitLibrariesWebKitPrivateFrameworkStubsiOS10GraphicsServicesframeworkGraphicsServicestbd"></a>
<div class="modfile"><h4>Modified: trunk/WebKitLibraries/WebKitPrivateFrameworkStubs/iOS/10/GraphicsServices.framework/GraphicsServices.tbd (210687 => 210688)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebKitLibraries/WebKitPrivateFrameworkStubs/iOS/10/GraphicsServices.framework/GraphicsServices.tbd 2017-01-13 00:36:58 UTC (rev 210687)
+++ trunk/WebKitLibraries/WebKitPrivateFrameworkStubs/iOS/10/GraphicsServices.framework/GraphicsServices.tbd 2017-01-13 00:47:37 UTC (rev 210688)
</span><span class="lines">@@ -11,6 +11,7 @@
</span><span class="cx"> - arm64
</span><span class="cx"> symbols:
</span><span class="cx"> - _GSCurrentEventTimestamp
</span><ins>+ - _GSFontPurgeFontCache
</ins><span class="cx"> - _GSInitialize
</span><span class="cx"> - _GSSystemRootDirectory
</span><span class="cx"> install-name: /System/Library/PrivateFrameworks/GraphicsServices.framework/GraphicsServices
</span></span></pre>
</div>
</div>
</body>
</html>