summaryrefslogtreecommitdiff
path: root/Source/JavaScriptCore/runtime/GCActivityCallbackBlackBerry.cpp
diff options
context:
space:
mode:
authorSimon Hausmann <simon.hausmann@nokia.com>2012-08-12 09:27:39 +0200
committerSimon Hausmann <simon.hausmann@nokia.com>2012-08-12 09:27:39 +0200
commit3749d61e1f7a59f5ec5067e560af1eb610c82015 (patch)
tree73dc228333948738bbe02976cacca8cd382bc978 /Source/JavaScriptCore/runtime/GCActivityCallbackBlackBerry.cpp
parentb32b4dcd9a51ab8de6afc53d9e17f8707e1f7a5e (diff)
downloadqtwebkit-3749d61e1f7a59f5ec5067e560af1eb610c82015.tar.gz
Imported WebKit commit a77350243e054f3460d1137301d8b3faee3d2052 (http://svn.webkit.org/repository/webkit/trunk@125365)
New snapshot with build fixes for latest API changes in Qt and all WK1 Win MSVC fixes upstream
Diffstat (limited to 'Source/JavaScriptCore/runtime/GCActivityCallbackBlackBerry.cpp')
-rw-r--r--Source/JavaScriptCore/runtime/GCActivityCallbackBlackBerry.cpp4
1 files changed, 1 insertions, 3 deletions
diff --git a/Source/JavaScriptCore/runtime/GCActivityCallbackBlackBerry.cpp b/Source/JavaScriptCore/runtime/GCActivityCallbackBlackBerry.cpp
index c052c61ba..35b992567 100644
--- a/Source/JavaScriptCore/runtime/GCActivityCallbackBlackBerry.cpp
+++ b/Source/JavaScriptCore/runtime/GCActivityCallbackBlackBerry.cpp
@@ -25,8 +25,6 @@
namespace JSC {
-static const size_t bytesWorthGC = 4 * 1024 * 1024;
-
DefaultGCActivityCallback::DefaultGCActivityCallback(Heap* heap)
: GCActivityCallback(heap->globalData())
{
@@ -40,7 +38,7 @@ void DefaultGCActivityCallback::doWork()
void DefaultGCActivityCallback::didAllocate(size_t bytesAllocated)
{
- if (bytesAllocated < bytesWorthGC || m_timer.started())
+ if (m_timer.started())
return;
// Try using ~5% CPU time.