Title: [203268] trunk/Source/_javascript_Core
- Revision
- 203268
- Author
- commit-qu...@webkit.org
- Date
- 2016-07-14 21:59:08 -0700 (Thu, 14 Jul 2016)
Log Message
Return the correct value from Heap::externalMemorySize
https://bugs.webkit.org/show_bug.cgi?id=159797
<rdar://problem/27362446>
Patch by Joseph Pecoraro <pecor...@apple.com> on 2016-07-14
Reviewed by Timothy Hatcher.
* heap/Heap.h:
(JSC::Heap::externalMemorySize):
We should have been returning m_externalMemorySize which is a subset
of m_extraMemorySize. In practice the difference can be small. A major
difference in "extra memory size" may be from deprecated memory size
and array buffer sizes.
Modified Paths
Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (203267 => 203268)
--- trunk/Source/_javascript_Core/ChangeLog 2016-07-15 03:56:51 UTC (rev 203267)
+++ trunk/Source/_javascript_Core/ChangeLog 2016-07-15 04:59:08 UTC (rev 203268)
@@ -1,3 +1,18 @@
+2016-07-14 Joseph Pecoraro <pecor...@apple.com>
+
+ Return the correct value from Heap::externalMemorySize
+ https://bugs.webkit.org/show_bug.cgi?id=159797
+ <rdar://problem/27362446>
+
+ Reviewed by Timothy Hatcher.
+
+ * heap/Heap.h:
+ (JSC::Heap::externalMemorySize):
+ We should have been returning m_externalMemorySize which is a subset
+ of m_extraMemorySize. In practice the difference can be small. A major
+ difference in "extra memory size" may be from deprecated memory size
+ and array buffer sizes.
+
2016-07-14 Saam Barati <sbar...@apple.com>
It should be a syntax error to have a 'use strict' directive inside a function that has a non-simple parameter list
Modified: trunk/Source/_javascript_Core/heap/Heap.h (203267 => 203268)
--- trunk/Source/_javascript_Core/heap/Heap.h 2016-07-15 03:56:51 UTC (rev 203267)
+++ trunk/Source/_javascript_Core/heap/Heap.h 2016-07-15 04:59:08 UTC (rev 203268)
@@ -182,7 +182,7 @@
#if ENABLE(RESOURCE_USAGE)
// Use this API to report the subset of extra memory that lives outside this process.
void reportExternalMemoryVisited(CellState cellStateBeforeVisiting, size_t);
- size_t externalMemorySize() { return m_extraMemorySize; }
+ size_t externalMemorySize() { return m_externalMemorySize; }
#endif
// Use this API to report non-GC memory if you can't use the better API above.
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
