Changeset 201226 in webkit

Timestamp:

May 20, 2016 2:47:18 PM (8 years ago)

Author:

commit-queue@webkit.org

Message:

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 <Joseph Pecoraro> 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.

Location:

trunk/Source/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• runtime/JSArrayBuffer.cpp (modified) (1 diff)
• runtime/JSArrayBuffer.h (modified) (1 diff)
• tests/heapProfiler/typed-array-sizes.js (added)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+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.
+
 2016-05-20  Geoffrey Garen  <ggaren@apple.com>
 

trunk/Source/JavaScriptCore/runtime/JSArrayBuffer.cpp

@@ -67 +67 @@
 }
 
+size_t JSArrayBuffer::estimatedSize(JSCell* cell)
+{
+    JSArrayBuffer* thisObject = jsCast<JSArrayBuffer*>(cell);
+    size_t bufferEstimatedSize = thisObject->impl()->gcSizeEstimateInBytes();
+    return Base::estimatedSize(cell) + bufferEstimatedSize;
+}
+
 bool JSArrayBuffer::getOwnPropertySlot(
     JSObject* object, ExecState* exec, PropertyName propertyName, PropertySlot& slot)

trunk/Source/JavaScriptCore/runtime/JSArrayBuffer.h

@@ -52 +52 @@
     
 protected:
+
+    static size_t estimatedSize(JSCell*);
     static bool getOwnPropertySlot(JSObject*, ExecState*, PropertyName, PropertySlot&);
     static bool put(JSCell*, ExecState*, PropertyName, JSValue, PutPropertySlot&);