<!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>[201226] trunk/Source/JavaScriptCore</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/201226">201226</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2016-05-20 14:47:18 -0700 (Fri, 20 May 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Web Inspector: retained size for typed arrays does not count native backing store
https://bugs.webkit.org/show_bug.cgi?id=157945
<rdar://problem/26392238>
Patch by Joseph Pecoraro <pecoraro@apple.com> on 2016-05-20
Reviewed by Geoffrey Garen.
* runtime/JSArrayBuffer.h:
* runtime/JSArrayBuffer.cpp:
(JSC::JSArrayBuffer::estimatedSize):
Include an estimatedSize implementation for JSArrayBuffer.
ArrayBuffer has a unique path, different from other data
stored in the Heap.
* tests/heapProfiler/typed-array-sizes.js: Added.
Test sizes of TypedArray with and without an ArrayBuffer.
When the TypedArray is a view wrapping an ArrayBuffer, the
ArrayBuffer has the size.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeJSArrayBuffercpp">trunk/Source/JavaScriptCore/runtime/JSArrayBuffer.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeJSArrayBufferh">trunk/Source/JavaScriptCore/runtime/JSArrayBuffer.h</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoretestsheapProfilertypedarraysizesjs">trunk/Source/JavaScriptCore/tests/heapProfiler/typed-array-sizes.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (201225 => 201226)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2016-05-20 21:17:58 UTC (rev 201225)
+++ trunk/Source/JavaScriptCore/ChangeLog 2016-05-20 21:47:18 UTC (rev 201226)
</span><span class="lines">@@ -1,3 +1,23 @@
</span><ins>+2016-05-20 Joseph Pecoraro <pecoraro@apple.com>
+
+ Web Inspector: retained size for typed arrays does not count native backing store
+ https://bugs.webkit.org/show_bug.cgi?id=157945
+ <rdar://problem/26392238>
+
+ Reviewed by Geoffrey Garen.
+
+ * runtime/JSArrayBuffer.h:
+ * runtime/JSArrayBuffer.cpp:
+ (JSC::JSArrayBuffer::estimatedSize):
+ Include an estimatedSize implementation for JSArrayBuffer.
+ ArrayBuffer has a unique path, different from other data
+ stored in the Heap.
+
+ * tests/heapProfiler/typed-array-sizes.js: Added.
+ Test sizes of TypedArray with and without an ArrayBuffer.
+ When the TypedArray is a view wrapping an ArrayBuffer, the
+ ArrayBuffer has the size.
+
</ins><span class="cx"> 2016-05-20 Geoffrey Garen <ggaren@apple.com>
</span><span class="cx">
</span><span class="cx"> reifyAllStaticProperties makes two copies of every string
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeJSArrayBuffercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/JSArrayBuffer.cpp (201225 => 201226)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/JSArrayBuffer.cpp 2016-05-20 21:17:58 UTC (rev 201225)
+++ trunk/Source/JavaScriptCore/runtime/JSArrayBuffer.cpp 2016-05-20 21:47:18 UTC (rev 201226)
</span><span class="lines">@@ -66,6 +66,13 @@
</span><span class="cx"> NonArray);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+size_t JSArrayBuffer::estimatedSize(JSCell* cell)
+{
+ JSArrayBuffer* thisObject = jsCast<JSArrayBuffer*>(cell);
+ size_t bufferEstimatedSize = thisObject->impl()->gcSizeEstimateInBytes();
+ return Base::estimatedSize(cell) + bufferEstimatedSize;
+}
+
</ins><span class="cx"> bool JSArrayBuffer::getOwnPropertySlot(
</span><span class="cx"> JSObject* object, ExecState* exec, PropertyName propertyName, PropertySlot& slot)
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeJSArrayBufferh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/JSArrayBuffer.h (201225 => 201226)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/JSArrayBuffer.h 2016-05-20 21:17:58 UTC (rev 201225)
+++ trunk/Source/JavaScriptCore/runtime/JSArrayBuffer.h 2016-05-20 21:47:18 UTC (rev 201226)
</span><span class="lines">@@ -51,6 +51,8 @@
</span><span class="cx"> DECLARE_EXPORT_INFO;
</span><span class="cx">
</span><span class="cx"> protected:
</span><ins>+
+ static size_t estimatedSize(JSCell*);
</ins><span class="cx"> static bool getOwnPropertySlot(JSObject*, ExecState*, PropertyName, PropertySlot&);
</span><span class="cx"> static bool put(JSCell*, ExecState*, PropertyName, JSValue, PutPropertySlot&);
</span><span class="cx"> static bool defineOwnProperty(JSObject*, ExecState*, PropertyName, const PropertyDescriptor&, bool shouldThrow);
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoretestsheapProfilertypedarraysizesjs"></a>
<div class="addfile"><h4>Added: trunk/Source/JavaScriptCore/tests/heapProfiler/typed-array-sizes.js (0 => 201226)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/tests/heapProfiler/typed-array-sizes.js (rev 0)
+++ trunk/Source/JavaScriptCore/tests/heapProfiler/typed-array-sizes.js 2016-05-20 21:47:18 UTC (rev 201226)
</span><span class="lines">@@ -0,0 +1,28 @@
</span><ins>+load("./driver/driver.js");
+
+(function() {
+ const bufferBytes = 4 * 2000;
+ const typedArraySize = 1000;
+ const typedArrayBytes = 4 * typedArraySize;
+ assert(typedArrayBytes < bufferBytes, "Sizes should be different");
+
+ let buffer = new ArrayBuffer(bufferBytes);
+ let view = new Float32Array(buffer);
+ let typedArray = new Uint32Array(typedArraySize);
+
+ let snapshot = createCheapHeapSnapshot();
+
+ let arrayBufferNodes = snapshot.nodesWithClassName("ArrayBuffer");
+ let viewNodes = snapshot.nodesWithClassName("Float32Array");
+ let typedArrayNodes = snapshot.nodesWithClassName("Uint32Array");
+ assert(arrayBufferNodes.length === 1, "Snapshot should contain 1 'ArrayBuffer' instance");
+ assert(viewNodes.length === 1, "Snapshot should contain 1 'Float32Array' instance");
+ assert(typedArrayNodes.length === 1, "Snapshot should contain 1 'Uint32Array' instance");
+
+ let arrayBufferNode = arrayBufferNodes[0];
+ let viewNode = viewNodes[0];
+ let typedArrayNode = typedArrayNodes[0];
+ assert(arrayBufferNode.size >= bufferBytes, "ArrayBuffer node should have a large size");
+ assert(viewNode.size <= 100, "Float32Array node should have a very small size, it just wraps the already large ArrayBuffer");
+ assert(typedArrayNode.size >= typedArrayBytes && typedArrayNode.size < bufferBytes, "Uint32Array node should have a large size, but not as large as the ArrayBuffer");
+})();
</ins></span></pre>
</div>
</div>
</body>
</html>