<!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>[181534] releases/WebKitGTK/webkit-2.8/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/181534">181534</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2015-03-16 03:19:42 -0700 (Mon, 16 Mar 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/181411">r181411</a> - Many users of Heap::reportExtraMemory* are wrong, causing lots of memory growth
https://bugs.webkit.org/show_bug.cgi?id=142593
Reviewed by Andreas Kling.
Adopt deprecatedReportExtraMemory as a short-term fix for runaway
memory growth in these cases where we have not adopted
reportExtraMemoryVisited.
Long-term, we should use reportExtraMemoryAllocated+reportExtraMemoryVisited.
That's tracked by https://bugs.webkit.org/show_bug.cgi?id=142595.
Source/JavaScriptCore:
* API/JSBase.cpp:
(JSReportExtraMemoryCost):
* runtime/SparseArrayValueMap.cpp:
(JSC::SparseArrayValueMap::add):
Source/WebCore:
Using IOSDebug, I can see that the canvas stress test @ http://jsfiddle.net/fvyw4ba0/,
which used to keep > 1000 1MB NonVolatile GPU allocations live, now keeps about 10 live.
* Modules/mediasource/SourceBuffer.cpp:
(WebCore::SourceBuffer::reportExtraMemoryAllocated):
* bindings/js/JSDocumentCustom.cpp:
(WebCore::toJS):
* bindings/js/JSImageDataCustom.cpp:
(WebCore::toJS):
* bindings/js/JSNodeListCustom.cpp:
(WebCore::createWrapper):
* dom/CollectionIndexCache.cpp:
(WebCore::reportExtraMemoryAllocatedForCollectionIndexCache):
* html/HTMLCanvasElement.cpp:
(WebCore::HTMLCanvasElement::createImageBuffer):
* html/HTMLImageLoader.cpp:
(WebCore::HTMLImageLoader::imageChanged):
* html/HTMLMediaElement.cpp:
(WebCore::HTMLMediaElement::parseAttribute):
* xml/XMLHttpRequest.cpp:
(WebCore::XMLHttpRequest::dropProtection):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit28SourceJavaScriptCoreAPIJSBasecpp">releases/WebKitGTK/webkit-2.8/Source/JavaScriptCore/API/JSBase.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit28SourceJavaScriptCoreChangeLog">releases/WebKitGTK/webkit-2.8/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit28SourceJavaScriptCoreruntimeSparseArrayValueMapcpp">releases/WebKitGTK/webkit-2.8/Source/JavaScriptCore/runtime/SparseArrayValueMap.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit28SourceWebCoreChangeLog">releases/WebKitGTK/webkit-2.8/Source/WebCore/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit28SourceWebCoreModulesmediasourceSourceBuffercpp">releases/WebKitGTK/webkit-2.8/Source/WebCore/Modules/mediasource/SourceBuffer.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit28SourceWebCorebindingsjsJSDocumentCustomcpp">releases/WebKitGTK/webkit-2.8/Source/WebCore/bindings/js/JSDocumentCustom.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit28SourceWebCorebindingsjsJSImageDataCustomcpp">releases/WebKitGTK/webkit-2.8/Source/WebCore/bindings/js/JSImageDataCustom.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit28SourceWebCorebindingsjsJSNodeListCustomcpp">releases/WebKitGTK/webkit-2.8/Source/WebCore/bindings/js/JSNodeListCustom.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit28SourceWebCoredomCollectionIndexCachecpp">releases/WebKitGTK/webkit-2.8/Source/WebCore/dom/CollectionIndexCache.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit28SourceWebCorehtmlHTMLCanvasElementcpp">releases/WebKitGTK/webkit-2.8/Source/WebCore/html/HTMLCanvasElement.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit28SourceWebCorehtmlHTMLImageLoadercpp">releases/WebKitGTK/webkit-2.8/Source/WebCore/html/HTMLImageLoader.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit28SourceWebCorehtmlHTMLMediaElementcpp">releases/WebKitGTK/webkit-2.8/Source/WebCore/html/HTMLMediaElement.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit28SourceWebCorexmlXMLHttpRequestcpp">releases/WebKitGTK/webkit-2.8/Source/WebCore/xml/XMLHttpRequest.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="releasesWebKitGTKwebkit28SourceJavaScriptCoreAPIJSBasecpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.8/Source/JavaScriptCore/API/JSBase.cpp (181533 => 181534)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.8/Source/JavaScriptCore/API/JSBase.cpp 2015-03-16 10:13:35 UTC (rev 181533)
+++ releases/WebKitGTK/webkit-2.8/Source/JavaScriptCore/API/JSBase.cpp 2015-03-16 10:19:42 UTC (rev 181534)
</span><span class="lines">@@ -139,9 +139,7 @@
</span><span class="cx"> ExecState* exec = toJS(ctx);
</span><span class="cx"> JSLockHolder locker(exec);
</span><span class="cx">
</span><del>- // FIXME: switch to deprecatedReportExtraMemory.
- // https://bugs.webkit.org/show_bug.cgi?id=142593
- exec->vm().heap.reportExtraMemoryAllocated(size);
</del><ins>+ exec->vm().heap.deprecatedReportExtraMemory(size);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> extern "C" JS_EXPORT void JSSynchronousGarbageCollectForDebugging(JSContextRef);
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit28SourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.8/Source/JavaScriptCore/ChangeLog (181533 => 181534)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.8/Source/JavaScriptCore/ChangeLog 2015-03-16 10:13:35 UTC (rev 181533)
+++ releases/WebKitGTK/webkit-2.8/Source/JavaScriptCore/ChangeLog 2015-03-16 10:19:42 UTC (rev 181534)
</span><span class="lines">@@ -1,5 +1,24 @@
</span><span class="cx"> 2015-03-11 Geoffrey Garen <ggaren@apple.com>
</span><span class="cx">
</span><ins>+ Many users of Heap::reportExtraMemory* are wrong, causing lots of memory growth
+ https://bugs.webkit.org/show_bug.cgi?id=142593
+
+ Reviewed by Andreas Kling.
+
+ Adopt deprecatedReportExtraMemory as a short-term fix for runaway
+ memory growth in these cases where we have not adopted
+ reportExtraMemoryVisited.
+
+ Long-term, we should use reportExtraMemoryAllocated+reportExtraMemoryVisited.
+ That's tracked by https://bugs.webkit.org/show_bug.cgi?id=142595.
+
+ * API/JSBase.cpp:
+ (JSReportExtraMemoryCost):
+ * runtime/SparseArrayValueMap.cpp:
+ (JSC::SparseArrayValueMap::add):
+
+2015-03-11 Geoffrey Garen <ggaren@apple.com>
+
</ins><span class="cx"> Refactored the JSC::Heap extra cost API for clarity and to make some known bugs more obvious
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=142589
</span><span class="cx">
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit28SourceJavaScriptCoreruntimeSparseArrayValueMapcpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.8/Source/JavaScriptCore/runtime/SparseArrayValueMap.cpp (181533 => 181534)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.8/Source/JavaScriptCore/runtime/SparseArrayValueMap.cpp 2015-03-16 10:13:35 UTC (rev 181533)
+++ releases/WebKitGTK/webkit-2.8/Source/JavaScriptCore/runtime/SparseArrayValueMap.cpp 2015-03-16 10:19:42 UTC (rev 181534)
</span><span class="lines">@@ -80,9 +80,9 @@
</span><span class="cx"> AddResult result = m_map.add(i, entry);
</span><span class="cx"> size_t capacity = m_map.capacity();
</span><span class="cx"> if (capacity != m_reportedCapacity) {
</span><del>- // FIXME: Switch to deprecatedReportExtraMemory, or adopt reportExtraMemoryVisited.
- // https://bugs.webkit.org/show_bug.cgi?id=142593
- Heap::heap(array)->reportExtraMemoryAllocated((capacity - m_reportedCapacity) * (sizeof(unsigned) + sizeof(WriteBarrier<Unknown>)));
</del><ins>+ // FIXME: Adopt reportExtraMemoryVisited, and switch to reportExtraMemoryAllocated.
+ // https://bugs.webkit.org/show_bug.cgi?id=142595
+ Heap::heap(array)->deprecatedReportExtraMemory((capacity - m_reportedCapacity) * (sizeof(unsigned) + sizeof(WriteBarrier<Unknown>)));
</ins><span class="cx"> m_reportedCapacity = capacity;
</span><span class="cx"> }
</span><span class="cx"> return result;
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit28SourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.8/Source/WebCore/ChangeLog (181533 => 181534)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.8/Source/WebCore/ChangeLog 2015-03-16 10:13:35 UTC (rev 181533)
+++ releases/WebKitGTK/webkit-2.8/Source/WebCore/ChangeLog 2015-03-16 10:19:42 UTC (rev 181534)
</span><span class="lines">@@ -1,5 +1,63 @@
</span><ins>+2015-03-12 Geoffrey Garen <ggaren@apple.com>
+
+ REGRESSION: Crash under Heap::reportExtraMemoryAllocatedSlowCase for media element
+ https://bugs.webkit.org/show_bug.cgi?id=142636
+
+ Reviewed by Mark Hahnenberg.
+
+ This was a pre-existing bug that I made a lot worse in
+ <https://trac.webkit.org/changeset/181411>.
+
+ * html/HTMLMediaElement.cpp:
+ (WebCore::HTMLMediaElement::parseAttribute): Compare size before
+ subtracting rather than subtracting and then comparing to zero. The
+ latter technique is not valid for unsigned integers, which will happily
+ underflow into giant numbers.
+
+ * Modules/mediasource/SourceBuffer.cpp:
+ (WebCore::SourceBuffer::reportExtraMemoryAllocated): This code was
+ technically correct, but I took the opportunity to clean it up a bit.
+ There's no need to do two checks here, and it smells bad to check for
+ a negative unsigned integer.
+
</ins><span class="cx"> 2015-03-11 Geoffrey Garen <ggaren@apple.com>
</span><span class="cx">
</span><ins>+ Many users of Heap::reportExtraMemory* are wrong, causing lots of memory growth
+ https://bugs.webkit.org/show_bug.cgi?id=142593
+
+ Reviewed by Andreas Kling.
+
+ Adopt deprecatedReportExtraMemory as a short-term fix for runaway
+ memory growth in these cases where we have not adopted
+ reportExtraMemoryVisited.
+
+ Long-term, we should use reportExtraMemoryAllocated+reportExtraMemoryVisited.
+ That's tracked by https://bugs.webkit.org/show_bug.cgi?id=142595.
+
+ Using IOSDebug, I can see that the canvas stress test @ http://jsfiddle.net/fvyw4ba0/,
+ which used to keep > 1000 1MB NonVolatile GPU allocations live, now keeps about 10 live.
+
+ * Modules/mediasource/SourceBuffer.cpp:
+ (WebCore::SourceBuffer::reportExtraMemoryAllocated):
+ * bindings/js/JSDocumentCustom.cpp:
+ (WebCore::toJS):
+ * bindings/js/JSImageDataCustom.cpp:
+ (WebCore::toJS):
+ * bindings/js/JSNodeListCustom.cpp:
+ (WebCore::createWrapper):
+ * dom/CollectionIndexCache.cpp:
+ (WebCore::reportExtraMemoryAllocatedForCollectionIndexCache):
+ * html/HTMLCanvasElement.cpp:
+ (WebCore::HTMLCanvasElement::createImageBuffer):
+ * html/HTMLImageLoader.cpp:
+ (WebCore::HTMLImageLoader::imageChanged):
+ * html/HTMLMediaElement.cpp:
+ (WebCore::HTMLMediaElement::parseAttribute):
+ * xml/XMLHttpRequest.cpp:
+ (WebCore::XMLHttpRequest::dropProtection):
+
+2015-03-11 Geoffrey Garen <ggaren@apple.com>
+
</ins><span class="cx"> Refactored the JSC::Heap extra cost API for clarity and to make some known bugs more obvious
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=142589
</span><span class="cx">
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit28SourceWebCoreModulesmediasourceSourceBuffercpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.8/Source/WebCore/Modules/mediasource/SourceBuffer.cpp (181533 => 181534)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.8/Source/WebCore/Modules/mediasource/SourceBuffer.cpp 2015-03-16 10:13:35 UTC (rev 181533)
+++ releases/WebKitGTK/webkit-2.8/Source/WebCore/Modules/mediasource/SourceBuffer.cpp 2015-03-16 10:19:42 UTC (rev 181534)
</span><span class="lines">@@ -1981,18 +1981,16 @@
</span><span class="cx"> void SourceBuffer::reportExtraMemoryAllocated()
</span><span class="cx"> {
</span><span class="cx"> size_t extraMemoryCost = this->extraMemoryCost();
</span><del>- if (extraMemoryCost < m_reportedExtraMemoryCost)
</del><ins>+ if (extraMemoryCost <= m_reportedExtraMemoryCost)
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> size_t extraMemoryCostDelta = extraMemoryCost - m_reportedExtraMemoryCost;
</span><span class="cx"> m_reportedExtraMemoryCost = extraMemoryCost;
</span><span class="cx">
</span><span class="cx"> JSC::JSLockHolder lock(scriptExecutionContext()->vm());
</span><del>- if (extraMemoryCostDelta > 0) {
- // FIXME: Switch to deprecatedReportExtraMemory, or adopt reportExtraMemoryVisited.
- // https://bugs.webkit.org/show_bug.cgi?id=142593
- scriptExecutionContext()->vm().heap.reportExtraMemoryAllocated(extraMemoryCostDelta);
- }
</del><ins>+ // FIXME: Adopt reportExtraMemoryVisited, and switch to reportExtraMemoryAllocated.
+ // https://bugs.webkit.org/show_bug.cgi?id=142595
+ scriptExecutionContext()->vm().heap.deprecatedReportExtraMemory(extraMemoryCostDelta);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> Vector<String> SourceBuffer::bufferedSamplesForTrackID(const AtomicString& trackID)
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit28SourceWebCorebindingsjsJSDocumentCustomcpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.8/Source/WebCore/bindings/js/JSDocumentCustom.cpp (181533 => 181534)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.8/Source/WebCore/bindings/js/JSDocumentCustom.cpp 2015-03-16 10:13:35 UTC (rev 181533)
+++ releases/WebKitGTK/webkit-2.8/Source/WebCore/bindings/js/JSDocumentCustom.cpp 2015-03-16 10:19:42 UTC (rev 181534)
</span><span class="lines">@@ -109,9 +109,9 @@
</span><span class="cx"> for (Node* n = document; n; n = NodeTraversal::next(*n))
</span><span class="cx"> nodeCount++;
</span><span class="cx">
</span><del>- // FIXME: Switch to deprecatedReportExtraMemory, or adopt reportExtraMemoryVisited.
- // https://bugs.webkit.org/show_bug.cgi?id=142593
- exec->heap()->reportExtraMemoryAllocated(nodeCount * sizeof(Node));
</del><ins>+ // FIXME: Adopt reportExtraMemoryVisited, and switch to reportExtraMemoryAllocated.
+ // https://bugs.webkit.org/show_bug.cgi?id=142595
+ exec->heap()->deprecatedReportExtraMemory(nodeCount * sizeof(Node));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> return wrapper;
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit28SourceWebCorebindingsjsJSImageDataCustomcpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.8/Source/WebCore/bindings/js/JSImageDataCustom.cpp (181533 => 181534)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.8/Source/WebCore/bindings/js/JSImageDataCustom.cpp 2015-03-16 10:13:35 UTC (rev 181533)
+++ releases/WebKitGTK/webkit-2.8/Source/WebCore/bindings/js/JSImageDataCustom.cpp 2015-03-16 10:19:42 UTC (rev 181534)
</span><span class="lines">@@ -47,9 +47,9 @@
</span><span class="cx"> wrapper = CREATE_DOM_WRAPPER(globalObject, ImageData, imageData);
</span><span class="cx"> Identifier dataName(exec, "data");
</span><span class="cx"> wrapper->putDirect(exec->vm(), dataName, toJS(exec, globalObject, imageData->data()), DontDelete | ReadOnly);
</span><del>- // FIXME: Switch to deprecatedReportExtraMemory, or adopt reportExtraMemoryVisited.
- // https://bugs.webkit.org/show_bug.cgi?id=142593
- exec->heap()->reportExtraMemoryAllocated(imageData->data()->length());
</del><ins>+ // FIXME: Adopt reportExtraMemoryVisited, and switch to reportExtraMemoryAllocated.
+ // https://bugs.webkit.org/show_bug.cgi?id=142595
+ exec->heap()->deprecatedReportExtraMemory(imageData->data()->length());
</ins><span class="cx">
</span><span class="cx"> return wrapper;
</span><span class="cx"> }
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit28SourceWebCorebindingsjsJSNodeListCustomcpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.8/Source/WebCore/bindings/js/JSNodeListCustom.cpp (181533 => 181534)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.8/Source/WebCore/bindings/js/JSNodeListCustom.cpp 2015-03-16 10:13:35 UTC (rev 181533)
+++ releases/WebKitGTK/webkit-2.8/Source/WebCore/bindings/js/JSNodeListCustom.cpp 2015-03-16 10:19:42 UTC (rev 181534)
</span><span class="lines">@@ -62,9 +62,9 @@
</span><span class="cx">
</span><span class="cx"> JSC::JSValue createWrapper(JSDOMGlobalObject& globalObject, NodeList& nodeList)
</span><span class="cx"> {
</span><del>- // FIXME: Switch to deprecatedReportExtraMemory, or adopt reportExtraMemoryVisited.
- // https://bugs.webkit.org/show_bug.cgi?id=142593
- globalObject.vm().heap.reportExtraMemoryAllocated(nodeList.memoryCost());
</del><ins>+ // FIXME: Adopt reportExtraMemoryVisited, and switch to reportExtraMemoryAllocated.
+ // https://bugs.webkit.org/show_bug.cgi?id=142595
+ globalObject.vm().heap.deprecatedReportExtraMemory(nodeList.memoryCost());
</ins><span class="cx"> return createNewWrapper<JSNodeList>(&globalObject, &nodeList);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit28SourceWebCoredomCollectionIndexCachecpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.8/Source/WebCore/dom/CollectionIndexCache.cpp (181533 => 181534)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.8/Source/WebCore/dom/CollectionIndexCache.cpp 2015-03-16 10:13:35 UTC (rev 181533)
+++ releases/WebKitGTK/webkit-2.8/Source/WebCore/dom/CollectionIndexCache.cpp 2015-03-16 10:19:42 UTC (rev 181534)
</span><span class="lines">@@ -34,9 +34,9 @@
</span><span class="cx"> {
</span><span class="cx"> JSC::VM& vm = JSDOMWindowBase::commonVM();
</span><span class="cx"> JSC::JSLockHolder lock(vm);
</span><del>- // FIXME: Switch to deprecatedReportExtraMemory, or adopt reportExtraMemoryVisited.
- // https://bugs.webkit.org/show_bug.cgi?id=142593
- vm.heap.reportExtraMemoryAllocated(cost);
</del><ins>+ // FIXME: Adopt reportExtraMemoryVisited, and switch to reportExtraMemoryAllocated.
+ // https://bugs.webkit.org/show_bug.cgi?id=142595
+ vm.heap.deprecatedReportExtraMemory(cost);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> }
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit28SourceWebCorehtmlHTMLCanvasElementcpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.8/Source/WebCore/html/HTMLCanvasElement.cpp (181533 => 181534)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.8/Source/WebCore/html/HTMLCanvasElement.cpp 2015-03-16 10:13:35 UTC (rev 181533)
+++ releases/WebKitGTK/webkit-2.8/Source/WebCore/html/HTMLCanvasElement.cpp 2015-03-16 10:19:42 UTC (rev 181534)
</span><span class="lines">@@ -580,9 +580,9 @@
</span><span class="cx">
</span><span class="cx"> JSC::JSLockHolder lock(scriptExecutionContext()->vm());
</span><span class="cx"> size_t numBytes = 4 * m_imageBuffer->internalSize().width() * m_imageBuffer->internalSize().height();
</span><del>- // FIXME: Switch to deprecatedReportExtraMemory, or adopt reportExtraMemoryVisited.
- // https://bugs.webkit.org/show_bug.cgi?id=142593
- scriptExecutionContext()->vm().heap.reportExtraMemoryAllocated(numBytes);
</del><ins>+ // FIXME: Adopt reportExtraMemoryVisited, and switch to reportExtraMemoryAllocated.
+ // https://bugs.webkit.org/show_bug.cgi?id=142595
+ scriptExecutionContext()->vm().heap.deprecatedReportExtraMemory(numBytes);
</ins><span class="cx">
</span><span class="cx"> #if USE(IOSURFACE_CANVAS_BACKING_STORE) || ENABLE(ACCELERATED_2D_CANVAS)
</span><span class="cx"> if (m_context && m_context->is2d())
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit28SourceWebCorehtmlHTMLImageLoadercpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.8/Source/WebCore/html/HTMLImageLoader.cpp (181533 => 181534)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.8/Source/WebCore/html/HTMLImageLoader.cpp 2015-03-16 10:13:35 UTC (rev 181533)
+++ releases/WebKitGTK/webkit-2.8/Source/WebCore/html/HTMLImageLoader.cpp 2015-03-16 10:19:42 UTC (rev 181534)
</span><span class="lines">@@ -87,9 +87,9 @@
</span><span class="cx"> if (!element().inDocument()) {
</span><span class="cx"> JSC::VM& vm = JSDOMWindowBase::commonVM();
</span><span class="cx"> JSC::JSLockHolder lock(vm);
</span><del>- // FIXME: Switch to deprecatedReportExtraMemory, or adopt reportExtraMemoryVisited.
- // https://bugs.webkit.org/show_bug.cgi?id=142593
- vm.heap.reportExtraMemoryAllocated(cachedImage->encodedSize());
</del><ins>+ // FIXME: Adopt reportExtraMemoryVisited, and switch to reportExtraMemoryAllocated.
+ // https://bugs.webkit.org/show_bug.cgi?id=142595
+ vm.heap.deprecatedReportExtraMemory(cachedImage->encodedSize());
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit28SourceWebCorehtmlHTMLMediaElementcpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.8/Source/WebCore/html/HTMLMediaElement.cpp (181533 => 181534)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.8/Source/WebCore/html/HTMLMediaElement.cpp 2015-03-16 10:13:35 UTC (rev 181533)
+++ releases/WebKitGTK/webkit-2.8/Source/WebCore/html/HTMLMediaElement.cpp 2015-03-16 10:19:42 UTC (rev 181534)
</span><span class="lines">@@ -685,17 +685,16 @@
</span><span class="cx"> exitFullscreen();
</span><span class="cx">
</span><span class="cx"> if (m_player) {
</span><del>- JSC::VM& vm = JSDOMWindowBase::commonVM();
- JSC::JSLockHolder lock(vm);
-
</del><span class="cx"> size_t extraMemoryCost = m_player->extraMemoryCost();
</span><del>- size_t extraMemoryCostDelta = extraMemoryCost - m_reportedExtraMemoryCost;
- m_reportedExtraMemoryCost = extraMemoryCost;
</del><ins>+ if (extraMemoryCost > m_reportedExtraMemoryCost) {
+ JSC::VM& vm = JSDOMWindowBase::commonVM();
+ JSC::JSLockHolder lock(vm);
</ins><span class="cx">
</span><del>- if (extraMemoryCostDelta > 0) {
- // FIXME: Switch to deprecatedReportExtraMemory, or adopt reportExtraMemoryVisited.
- // https://bugs.webkit.org/show_bug.cgi?id=142593
- vm.heap.reportExtraMemoryAllocated(extraMemoryCostDelta);
</del><ins>+ size_t extraMemoryCostDelta = extraMemoryCost - m_reportedExtraMemoryCost;
+ m_reportedExtraMemoryCost = extraMemoryCost;
+ // FIXME: Adopt reportExtraMemoryVisited, and switch to reportExtraMemoryAllocated.
+ // https://bugs.webkit.org/show_bug.cgi?id=142595
+ vm.heap.deprecatedReportExtraMemory(extraMemoryCostDelta);
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit28SourceWebCorexmlXMLHttpRequestcpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.8/Source/WebCore/xml/XMLHttpRequest.cpp (181533 => 181534)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.8/Source/WebCore/xml/XMLHttpRequest.cpp 2015-03-16 10:13:35 UTC (rev 181533)
+++ releases/WebKitGTK/webkit-2.8/Source/WebCore/xml/XMLHttpRequest.cpp 2015-03-16 10:19:42 UTC (rev 181534)
</span><span class="lines">@@ -913,9 +913,9 @@
</span><span class="cx"> // report the extra cost at that point.
</span><span class="cx"> JSC::VM& vm = scriptExecutionContext()->vm();
</span><span class="cx"> JSC::JSLockHolder lock(vm);
</span><del>- // FIXME: Switch to deprecatedReportExtraMemory, or adopt reportExtraMemoryVisited.
- // https://bugs.webkit.org/show_bug.cgi?id=142593
- vm.heap.reportExtraMemoryAllocated(m_responseBuilder.length() * 2);
</del><ins>+ // FIXME: Adopt reportExtraMemoryVisited, and switch to reportExtraMemoryAllocated.
+ // https://bugs.webkit.org/show_bug.cgi?id=142595
+ vm.heap.deprecatedReportExtraMemory(m_responseBuilder.length() * 2);
</ins><span class="cx">
</span><span class="cx"> unsetPendingActivity(this);
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>