Expose performance.memory in workers

Source/core/timing/MemoryInfo.cpp

 /*
  * Copyright (C) 2010 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 13 matching lines @@
  * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "config.h"
 #include "core/timing/MemoryInfo.h"
 
+#include "RuntimeEnabledFeatures.h"
 #include <limits>
 #include "core/frame/LocalFrame.h"
 #include "core/frame/Settings.h"
 #include "wtf/CurrentTime.h"
 #include "wtf/MainThread.h"
 #include "wtf/MathExtras.h"
 
 namespace WebCore {
 
 class HeapSizeCache {
@@ skipping 39 matching lines @@
 
 // We quantize the sizes to make it more difficult for an attacker to see precise
 // impact of operations on memory. The values are used for performance tuning,
 // and hence don't need to be as refined when the value is large, so we threshold
 // at a list of exponentially separated buckets.
 size_t quantizeMemorySize(size_t size)
 {
     const int numberOfBuckets = 100;
     DEFINE_STATIC_LOCAL(Vector<size_t>, bucketSizeList, ());
 
-    ASSERT(isMainThread());
     if (bucketSizeList.isEmpty()) {
         bucketSizeList.resize(numberOfBuckets);
 
         float sizeOfNextBucket = 10000000.0; // First bucket size is roughly 10M.
         const float largestBucketSize = 4000000000.0; // Roughly 4GB.
         // We scale with the Nth root of the ratio, so that we use all the bucktes.
         const float scalingFactor = exp(log(largestBucketSize / sizeOfNextBucket) / numberOfBuckets);
 
         size_t nextPowerOfTen = static_cast<size_t>(pow(10, floor(log10(sizeOfNextBucket)) + 1) + 0.5);
         size_t granularity = nextPowerOfTen / 1000; // We want 3 signficant digits.
@@ skipping 19 matching lines @@
     }
 
     for (int i = 0; i < numberOfBuckets; ++i) {
         if (size <= bucketSizeList[i])
             return bucketSizeList[i];
     }
 
     return bucketSizeList[numberOfBuckets - 1];
 }
 
-
-MemoryInfo::MemoryInfo(LocalFrame* frame)
+MemoryInfo::MemoryInfo()
 {
     ScriptWrappable::init(this);
-    if (!frame || !frame->settings())
-        return;
 
-    if (frame->settings()->preciseMemoryInfoEnabled()) {
+    if (RuntimeEnabledFeatures::preciseMemoryInfoEnabled()) {
         ScriptGCEvent::getHeapSize(m_info);
     } else {
         DEFINE_STATIC_LOCAL(HeapSizeCache, heapSizeCache, ());

[yurys, 2014/12/24 08:23:29]

HeapSizeCache should become thread-local as it now can be accessed from worker
threads as well as from the main one. I opened a bug on this: crbung.com/445007

         heapSizeCache.getCachedHeapSize(m_info);
     }
 }
 
 } // namespace WebCore