Title: [121282] trunk/Source/_javascript_Core
Revision
121282
Author
[email protected]
Date
2012-06-26 12:55:32 -0700 (Tue, 26 Jun 2012)

Log Message

[BlackBerry] Add JSC statistics into about:memory
https://bugs.webkit.org/show_bug.cgi?id=89779

Patch by Yong Li <[email protected]> on 2012-06-26
Reviewed by Rob Buis.

Fix non-JIT build on BlackBerry broken by r121196.

* runtime/MemoryStatistics.cpp:
(JSC::globalMemoryStatistics):

Modified Paths

Diff

Modified: trunk/Source/_javascript_Core/ChangeLog (121281 => 121282)


--- trunk/Source/_javascript_Core/ChangeLog	2012-06-26 19:52:14 UTC (rev 121281)
+++ trunk/Source/_javascript_Core/ChangeLog	2012-06-26 19:55:32 UTC (rev 121282)
@@ -1,3 +1,15 @@
+2012-06-26  Yong Li  <[email protected]>
+
+        [BlackBerry] Add JSC statistics into about:memory
+        https://bugs.webkit.org/show_bug.cgi?id=89779
+
+        Reviewed by Rob Buis.
+
+        Fix non-JIT build on BlackBerry broken by r121196.
+
+        * runtime/MemoryStatistics.cpp:
+        (JSC::globalMemoryStatistics):
+
 2012-06-25  Filip Pizlo  <[email protected]>
 
         DFG::operationNewArray is unnecessarily slow, and may use the wrong array

Modified: trunk/Source/_javascript_Core/runtime/MemoryStatistics.cpp (121281 => 121282)


--- trunk/Source/_javascript_Core/runtime/MemoryStatistics.cpp	2012-06-26 19:52:14 UTC (rev 121281)
+++ trunk/Source/_javascript_Core/runtime/MemoryStatistics.cpp	2012-06-26 19:55:32 UTC (rev 121282)
@@ -37,7 +37,7 @@
     GlobalMemoryStatistics stats;
 
     stats.stackBytes = RegisterFile::committedByteCount();
-#if ENABLE(EXECUTABLE_ALLOCATOR_FIXED) || PLATFORM(BLACKBERRY)
+#if ENABLE(EXECUTABLE_ALLOCATOR_FIXED) || (PLATFORM(BLACKBERRY) && ENABLE(JIT))
     stats.JITBytes = ExecutableAllocator::committedByteCount();
 #else
     stats.JITBytes = 0;
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes

Reply via email to