[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[barraclough at apple.com]

The following commit has been merged in the debian/experimental branch:
commit 923c29ba4b5f63bae87e3d887919a87da814e8d1
Author: barraclough at apple.com <barraclough at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Jul 29 23:19:31 2010 +0000

    Changed MINIMUM_CELL_SIZE to be fixed at 64 bytes.
    
    Patch by Michael Saboff <msaboff at apple.com> on 2010-07-29
    Reviewed by Darin Adler.
    
    * runtime/Collector.h:
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@64319 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index 09af266..9bd689a 100644
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -1,3 +1,11 @@
+2010-07-29  Michael Saboff  <msaboff at apple.com>
+
+        Reviewed by Darin Adler.
+
+        Changed MINIMUM_CELL_SIZE to be fixed at 64 bytes.
+
+        * runtime/Collector.h:
+
 2010-07-28  Dumitru Daniliuc  <dumi at chromium.org>
 
         Reviewed by David Levin.
diff --git a/JavaScriptCore/runtime/Collector.h b/JavaScriptCore/runtime/Collector.h
index f5bf113..1dc9445 100644
--- a/JavaScriptCore/runtime/Collector.h
+++ b/JavaScriptCore/runtime/Collector.h
@@ -185,16 +185,6 @@ namespace JSC {
     };
 
     // tunable parameters
-    template<size_t bytesPerWord> struct CellSize;
-
-    // cell size needs to be a power of two for certain optimizations in collector.cpp
-#if USE(JSVALUE32)
-    template<> struct CellSize<sizeof(uint32_t)> { static const size_t m_value = 32; };
-#else
-    template<> struct CellSize<sizeof(uint32_t)> { static const size_t m_value = 64; };
-#endif
-    template<> struct CellSize<sizeof(uint64_t)> { static const size_t m_value = 64; };
-
 #if OS(WINCE) || OS(SYMBIAN)
     const size_t BLOCK_SIZE = 64 * 1024; // 64k
 #else
@@ -204,7 +194,7 @@ namespace JSC {
     // derived constants
     const size_t BLOCK_OFFSET_MASK = BLOCK_SIZE - 1;
     const size_t BLOCK_MASK = ~BLOCK_OFFSET_MASK;
-    const size_t MINIMUM_CELL_SIZE = CellSize<sizeof(void*)>::m_value;
+    const size_t MINIMUM_CELL_SIZE = 64;
     const size_t CELL_ARRAY_LENGTH = (MINIMUM_CELL_SIZE / sizeof(double)) + (MINIMUM_CELL_SIZE % sizeof(double) != 0 ? sizeof(double) : 0);
     const size_t CELL_SIZE = CELL_ARRAY_LENGTH * sizeof(double);
     const size_t SMALL_CELL_SIZE = CELL_SIZE / 2;

-- 
WebKit Debian packaging