<!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>[167338] 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/167338">167338</a></dd>
<dt>Author</dt> <dd>akling@apple.com</dd>
<dt>Date</dt> <dd>2014-04-15 17:01:33 -0700 (Tue, 15 Apr 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[iOS WebKit2] Listen for system memory pressure notifications.
<https://webkit.org/b/131653>
<rdar://problem/16208123>
Reviewed by Antti Koivisto.
* platform/cocoa/MemoryPressureHandlerCocoa.mm:
(WebCore::MemoryPressureHandler::install):
Use the right invocation to summon the memory pressure handler.
(WebCore::MemoryPressureHandler::install):
(WebCore::MemoryPressureHandler::uninstall):
(WebCore::MemoryPressureHandler::holdOff):
(WebCore::MemoryPressureHandler::respondToMemoryPressure):
Make stubbed out functions !PLATFORM(COCOA)</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformMemoryPressureHandlercpp">trunk/Source/WebCore/platform/MemoryPressureHandler.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformcocoaMemoryPressureHandlerCocoamm">trunk/Source/WebCore/platform/cocoa/MemoryPressureHandlerCocoa.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (167337 => 167338)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-04-16 00:01:06 UTC (rev 167337)
+++ trunk/Source/WebCore/ChangeLog 2014-04-16 00:01:33 UTC (rev 167338)
</span><span class="lines">@@ -1,3 +1,23 @@
</span><ins>+2014-04-15 Andreas Kling <akling@apple.com>
+
+ [iOS WebKit2] Listen for system memory pressure notifications.
+ <https://webkit.org/b/131653>
+ <rdar://problem/16208123>
+
+ Reviewed by Antti Koivisto.
+
+ * platform/cocoa/MemoryPressureHandlerCocoa.mm:
+ (WebCore::MemoryPressureHandler::install):
+
+ Use the right invocation to summon the memory pressure handler.
+
+ (WebCore::MemoryPressureHandler::install):
+ (WebCore::MemoryPressureHandler::uninstall):
+ (WebCore::MemoryPressureHandler::holdOff):
+ (WebCore::MemoryPressureHandler::respondToMemoryPressure):
+
+ Make stubbed out functions !PLATFORM(COCOA)
+
</ins><span class="cx"> 2014-04-14 Morten Stenshorne <mstensho@opera.com>
</span><span class="cx">
</span><span class="cx"> [New Multicolumn] Add support for column-span:all
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformMemoryPressureHandlercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/MemoryPressureHandler.cpp (167337 => 167338)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/MemoryPressureHandler.cpp 2014-04-16 00:01:06 UTC (rev 167337)
+++ trunk/Source/WebCore/platform/MemoryPressureHandler.cpp 2014-04-16 00:01:33 UTC (rev 167338)
</span><span class="lines">@@ -95,14 +95,11 @@
</span><span class="cx"> WTF::releaseFastMallocFreeMemory();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if !PLATFORM(MAC)
</del><ins>+#if !PLATFORM(COCOA)
</ins><span class="cx"> void MemoryPressureHandler::install() { }
</span><span class="cx"> void MemoryPressureHandler::uninstall() { }
</span><span class="cx"> void MemoryPressureHandler::holdOff(unsigned) { }
</span><span class="cx"> void MemoryPressureHandler::respondToMemoryPressure() { }
</span><del>-#endif
-
-#if !PLATFORM(COCOA)
</del><span class="cx"> void MemoryPressureHandler::platformReleaseMemory(bool) { }
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformcocoaMemoryPressureHandlerCocoamm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/cocoa/MemoryPressureHandlerCocoa.mm (167337 => 167338)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/cocoa/MemoryPressureHandlerCocoa.mm 2014-04-16 00:01:06 UTC (rev 167337)
+++ trunk/Source/WebCore/platform/cocoa/MemoryPressureHandlerCocoa.mm 2014-04-16 00:01:33 UTC (rev 167338)
</span><span class="lines">@@ -38,6 +38,7 @@
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> #import "SystemMemory.h"
</span><span class="cx"> #import "WebCoreThread.h"
</span><ins>+#import <dispatch/private.h>
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="lines">@@ -52,8 +53,6 @@
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
-
</del><span class="cx"> static dispatch_source_t _cache_event_source = 0;
</span><span class="cx"> static dispatch_source_t _timer_event_source = 0;
</span><span class="cx"> static int _notifyToken;
</span><span class="lines">@@ -73,14 +72,18 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> dispatch_async(dispatch_get_main_queue(), ^{
</span><del>-#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
</del><ins>+#if PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 80000
+ _cache_event_source = dispatch_source_create(DISPATCH_SOURCE_TYPE_MEMORYSTATUS, 0, DISPATCH_MEMORYSTATUS_PRESSURE_WARN, dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0));
+#elif PLATFORM(MAC) && MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
</ins><span class="cx"> _cache_event_source = wkCreateMemoryStatusPressureCriticalDispatchOnMainQueue();
</span><span class="cx"> #else
</span><span class="cx"> _cache_event_source = wkCreateVMPressureDispatchOnMainQueue();
</span><span class="cx"> #endif
</span><span class="cx"> if (_cache_event_source) {
</span><span class="cx"> dispatch_set_context(_cache_event_source, this);
</span><del>- dispatch_source_set_event_handler(_cache_event_source, ^{ memoryPressureHandler().respondToMemoryPressure();});
</del><ins>+ dispatch_source_set_event_handler(_cache_event_source, ^{
+ memoryPressureHandler().respondToMemoryPressure();
+ });
</ins><span class="cx"> dispatch_resume(_cache_event_source);
</span><span class="cx"> }
</span><span class="cx"> });
</span><span class="lines">@@ -156,8 +159,7 @@
</span><span class="cx"> holdOff(std::max(holdOffTime, s_minimumHoldOffTime));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#else // !PLATFORM(MAC)
-
</del><ins>+#if PLATFORM(IOS)
</ins><span class="cx"> static void respondToMemoryPressureCallback(CFRunLoopObserverRef observer, CFRunLoopActivity /*activity*/, void* /*info*/)
</span><span class="cx"> {
</span><span class="cx"> memoryPressureHandler().respondToMemoryPressureIfNeeded();
</span></span></pre>
</div>
</div>
</body>
</html>