[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.15.1-1414-gc69ee75

[hausmann at webkit.org]

The following commit has been merged in the webkit-1.1 branch:
commit 1103cc33655029808e4eb4c6d07c763c5a1cd5da
Author: hausmann at webkit.org <hausmann at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Sep 30 14:20:07 2009 +0000

    Reduce heap size on Symbian from 64MB to 8MB.
    
    Patch by Janne Koskinen <janne.p.koskinen at digia.com> on 2009-09-30
    Reviewed by Simon Hausmann.
    
    This is not a perfect fix, it requires more fine tuning.
    But this makes it possible again to debug in the emulator,
    which is more important in order to be able to fix other
    run-time issues.
    
    * runtime/Collector.h:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@48928 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index ece33cd..2aeedc6 100644
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -2,6 +2,19 @@
 
         Reviewed by Simon Hausmann.
 
+        Reduce heap size on Symbian from 64MB to 8MB.
+
+        This is not a perfect fix, it requires more fine tuning.
+        But this makes it possible again to debug in the emulator,
+        which is more important in order to be able to fix other
+        run-time issues.
+
+        * runtime/Collector.h:
+
+2009-09-30  Janne Koskinen  <janne.p.koskinen at digia.com> 
+
+        Reviewed by Simon Hausmann.
+
         Fix CRASH() macro for Symbian build.
 
         * wtf/Assertions.h: Added missing }
diff --git a/JavaScriptCore/runtime/Collector.h b/JavaScriptCore/runtime/Collector.h
index 1a55bb5..0ecff19 100644
--- a/JavaScriptCore/runtime/Collector.h
+++ b/JavaScriptCore/runtime/Collector.h
@@ -181,7 +181,7 @@ namespace JSC {
 #endif
     template<> struct CellSize<sizeof(uint64_t)> { static const size_t m_value = 64; };
 
-#if PLATFORM(WINCE)
+#if PLATFORM(WINCE) || PLATFORM(SYMBIAN)
     const size_t BLOCK_SIZE = 64 * 1024; // 64k
 #else
     const size_t BLOCK_SIZE = 64 * 4096; // 256k

-- 
WebKit Debian packaging