<!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>[186054] 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/186054">186054</a></dd>
<dt>Author</dt> <dd>akling@apple.com</dd>
<dt>Date</dt> <dd>2015-06-28 15:16:04 -0700 (Sun, 28 Jun 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>[iOS] Drop buffered data in paused media elements on memory pressure.
<https://webkit.org/b/146369>
<rdar://problem/20366883>
Reviewed by Eric Carlson.
To avoid getting crushed under mediaserverd memory growth when viewing
a page with multiple media elements, add a step to the memory pressure
handler that drops buffered data from all media elements that are
not currently playing.
On a test page with a bunch of embedded YouTube videos, this pass frees
up ~4MB per paused video when the system memory pressure hits.
* html/HTMLMediaElement.cpp:
(WebCore::HTMLMediaElement::allMediaElements):
(WebCore::HTMLMediaElement::HTMLMediaElement):
(WebCore::HTMLMediaElement::~HTMLMediaElement):
(WebCore::HTMLMediaElement::purgeBufferedDataIfPossible):
* html/HTMLMediaElement.h:
* platform/MemoryPressureHandler.cpp:
(WebCore::MemoryPressureHandler::releaseCriticalMemory):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLMediaElementcpp">trunk/Source/WebCore/html/HTMLMediaElement.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLMediaElementh">trunk/Source/WebCore/html/HTMLMediaElement.h</a></li>
<li><a href="#trunkSourceWebCoreplatformMemoryPressureHandlercpp">trunk/Source/WebCore/platform/MemoryPressureHandler.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (186053 => 186054)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-06-28 20:36:40 UTC (rev 186053)
+++ trunk/Source/WebCore/ChangeLog 2015-06-28 22:16:04 UTC (rev 186054)
</span><span class="lines">@@ -1,3 +1,28 @@
</span><ins>+2015-06-28 Andreas Kling <akling@apple.com>
+
+ [iOS] Drop buffered data in paused media elements on memory pressure.
+ <https://webkit.org/b/146369>
+ <rdar://problem/20366883>
+
+ Reviewed by Eric Carlson.
+
+ To avoid getting crushed under mediaserverd memory growth when viewing
+ a page with multiple media elements, add a step to the memory pressure
+ handler that drops buffered data from all media elements that are
+ not currently playing.
+
+ On a test page with a bunch of embedded YouTube videos, this pass frees
+ up ~4MB per paused video when the system memory pressure hits.
+
+ * html/HTMLMediaElement.cpp:
+ (WebCore::HTMLMediaElement::allMediaElements):
+ (WebCore::HTMLMediaElement::HTMLMediaElement):
+ (WebCore::HTMLMediaElement::~HTMLMediaElement):
+ (WebCore::HTMLMediaElement::purgeBufferedDataIfPossible):
+ * html/HTMLMediaElement.h:
+ * platform/MemoryPressureHandler.cpp:
+ (WebCore::MemoryPressureHandler::releaseCriticalMemory):
+
</ins><span class="cx"> 2015-06-28 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> Crash: com.apple.WebKit.WebContent at com.apple.WebCore: WebCore::CachedFrameBase::restore + 333
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLMediaElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLMediaElement.cpp (186053 => 186054)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLMediaElement.cpp 2015-06-28 20:36:40 UTC (rev 186053)
+++ trunk/Source/WebCore/html/HTMLMediaElement.cpp 2015-06-28 22:16:04 UTC (rev 186054)
</span><span class="lines">@@ -276,6 +276,12 @@
</span><span class="cx"> bool hasSrcLang;
</span><span class="cx"> };
</span><span class="cx">
</span><ins>+HashSet<HTMLMediaElement*>& HTMLMediaElement::allMediaElements()
+{
+ static NeverDestroyed<HashSet<HTMLMediaElement*>> elements;
+ return elements;
+}
+
</ins><span class="cx"> HTMLMediaElement::HTMLMediaElement(const QualifiedName& tagName, Document& document, bool createdByParser)
</span><span class="cx"> : HTMLElement(tagName, document)
</span><span class="cx"> , ActiveDOMObject(&document)
</span><span class="lines">@@ -362,6 +368,8 @@
</span><span class="cx"> , m_mediaStreamSrcObject(nullptr)
</span><span class="cx"> #endif
</span><span class="cx"> {
</span><ins>+ allMediaElements().add(this);
+
</ins><span class="cx"> LOG(Media, "HTMLMediaElement::HTMLMediaElement(%p)", this);
</span><span class="cx"> setHasCustomStyleResolveCallbacks();
</span><span class="cx">
</span><span class="lines">@@ -408,6 +416,8 @@
</span><span class="cx"> {
</span><span class="cx"> LOG(Media, "HTMLMediaElement::~HTMLMediaElement(%p)", this);
</span><span class="cx">
</span><ins>+ allMediaElements().remove(this);
+
</ins><span class="cx"> m_asyncEventQueue.close();
</span><span class="cx">
</span><span class="cx"> setShouldDelayLoadEvent(false);
</span><span class="lines">@@ -6395,6 +6405,17 @@
</span><span class="cx"> m_player->setShouldBufferData(shouldBuffer);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void HTMLMediaElement::purgeBufferedDataIfPossible()
+{
+#if PLATFORM(IOS)
+ // This is called to relieve memory pressure. Turning off buffering causes the media playback
+ // daemon to release memory associated with queued-up video frames.
+ // We turn it back on right away, but new frames won't get loaded unless playback is resumed.
+ setShouldBufferData(false);
+ setShouldBufferData(true);
+#endif
+}
+
</ins><span class="cx"> bool HTMLMediaElement::canSaveMediaData() const
</span><span class="cx"> {
</span><span class="cx"> if (m_player)
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLMediaElementh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLMediaElement.h (186053 => 186054)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLMediaElement.h 2015-06-28 20:36:40 UTC (rev 186053)
+++ trunk/Source/WebCore/html/HTMLMediaElement.h 2015-06-28 22:16:04 UTC (rev 186054)
</span><span class="lines">@@ -117,6 +117,8 @@
</span><span class="cx"> virtual bool hasVideo() const override { return false; }
</span><span class="cx"> virtual bool hasAudio() const override;
</span><span class="cx">
</span><ins>+ static HashSet<HTMLMediaElement*>& allMediaElements();
+
</ins><span class="cx"> void rewind(double timeDelta);
</span><span class="cx"> WEBCORE_EXPORT virtual void returnToRealtime() override;
</span><span class="cx">
</span><span class="lines">@@ -208,6 +210,8 @@
</span><span class="cx"> double minFastReverseRate() const;
</span><span class="cx"> double maxFastForwardRate() const;
</span><span class="cx">
</span><ins>+ void purgeBufferedDataIfPossible();
+
</ins><span class="cx"> // captions
</span><span class="cx"> bool webkitHasClosedCaptions() const;
</span><span class="cx"> bool webkitClosedCaptionsVisible() const;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformMemoryPressureHandlercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/MemoryPressureHandler.cpp (186053 => 186054)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/MemoryPressureHandler.cpp 2015-06-28 20:36:40 UTC (rev 186053)
+++ trunk/Source/WebCore/platform/MemoryPressureHandler.cpp 2015-06-28 22:16:04 UTC (rev 186054)
</span><span class="lines">@@ -31,6 +31,7 @@
</span><span class="cx"> #include "FontCache.h"
</span><span class="cx"> #include "FontCascade.h"
</span><span class="cx"> #include "GCController.h"
</span><ins>+#include "HTMLMediaElement.h"
</ins><span class="cx"> #include "JSDOMWindow.h"
</span><span class="cx"> #include "MemoryCache.h"
</span><span class="cx"> #include "Page.h"
</span><span class="lines">@@ -142,6 +143,14 @@
</span><span class="cx"> FontCache::singleton().invalidate();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ {
+ ReliefLogger log("Dropping buffered data from paused media elements");
+ for (auto* mediaElement: HTMLMediaElement::allMediaElements()) {
+ if (mediaElement->paused())
+ mediaElement->purgeBufferedDataIfPossible();
+ }
+ }
+
</ins><span class="cx"> if (synchronous == Synchronous::Yes) {
</span><span class="cx"> ReliefLogger log("Collecting JavaScript garbage");
</span><span class="cx"> GCController::singleton().garbageCollectNow();
</span></span></pre>
</div>
</div>
</body>
</html>