[SCM] WebKit Debian packaging branch, webkit-1.3, updated. upstream/1.3.7-4207-g178b198

[ggaren at apple.com]

The following commit has been merged in the webkit-1.3 branch:
commit d95a475b082285c935be1fe1e894a7326ed80272
Author: ggaren at apple.com <ggaren at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sat Jan 22 07:11:28 2011 +0000

    Reorganized MarkedSpace, making many of its functions private.
    
    Reviewed by Beth Dakin.
    
    * runtime/JSCell.h:
    (JSC::JSCell::Heap::heap):
    * runtime/MarkedSpace.h:
    (JSC::MarkedSpace::globalData):
    (JSC::MarkedSpace::heap):
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@76432 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/JavaScriptCore/ChangeLog b/Source/JavaScriptCore/ChangeLog
index b107417..cb3c861 100644
--- a/Source/JavaScriptCore/ChangeLog
+++ b/Source/JavaScriptCore/ChangeLog
@@ -1,5 +1,17 @@
 2011-01-21  Geoffrey Garen  <ggaren at apple.com>
 
+        Reviewed by Beth Dakin.
+
+        Reorganized MarkedSpace, making many of its functions private.
+
+        * runtime/JSCell.h:
+        (JSC::JSCell::Heap::heap):
+        * runtime/MarkedSpace.h:
+        (JSC::MarkedSpace::globalData):
+        (JSC::MarkedSpace::heap):
+
+2011-01-21  Geoffrey Garen  <ggaren at apple.com>
+
         Try to fix build: moved helper function out of #ifdef.
 
         * runtime/MachineStackMarker.cpp:
diff --git a/Source/JavaScriptCore/runtime/JSCell.h b/Source/JavaScriptCore/runtime/JSCell.h
index 95f4efa..f7e8810 100644
--- a/Source/JavaScriptCore/runtime/JSCell.h
+++ b/Source/JavaScriptCore/runtime/JSCell.h
@@ -363,7 +363,7 @@ namespace JSC {
 
     inline Heap* Heap::heap(JSCell* c)
     {
-        return MarkedSpace::cellBlock(c)->heap;
+        return MarkedSpace::heap(c);
     }
     
 #if ENABLE(JSC_ZOMBIES)
diff --git a/Source/JavaScriptCore/runtime/MarkedSpace.h b/Source/JavaScriptCore/runtime/MarkedSpace.h
index 1e23f19..566ac5f 100644
--- a/Source/JavaScriptCore/runtime/MarkedSpace.h
+++ b/Source/JavaScriptCore/runtime/MarkedSpace.h
@@ -64,18 +64,10 @@ namespace JSC {
     class MarkedSpace {
         WTF_MAKE_NONCOPYABLE(MarkedSpace);
     public:
-        MarkedSpace(JSGlobalData*);
-        void destroy(ProtectCountSet&);
-
-        void* allocate(size_t);
-
-        size_t objectCount() const;
         struct Statistics {
             size_t size;
             size_t free;
         };
-        Statistics statistics() const;
-        size_t size() const;
 
         static Heap* heap(JSCell*);
 
@@ -83,38 +75,46 @@ namespace JSC {
         static bool checkMarkCell(const JSCell*);
         static void markCell(JSCell*);
 
-        WeakGCHandle* addWeakGCHandle(JSCell*);
+        MarkedSpace(JSGlobalData*);
+        void destroy(ProtectCountSet&);
+
+        JSGlobalData* globalData() { return m_globalData; }
+
+        void* allocate(size_t);
+
+        void clearMarkBits();
+        void markRoots();
+        void reset();
+        void sweep();
+
+        size_t size() const;
+        size_t objectCount() const;
+        Statistics statistics() const;
 
         bool contains(void*);
-        bool containsSlowCase(void*);
-        bool isCellAligned(void*);
-        bool isPossibleCell(void*);
 
         LiveObjectIterator primaryHeapBegin();
         LiveObjectIterator primaryHeapEnd();
 
-        JSGlobalData* globalData() { return m_globalData; }
+    private:
+        bool isCellAligned(void*);
+        bool isPossibleCell(void*);
+        bool containsSlowCase(void*);
 
         static CollectorBlock* cellBlock(const JSCell*);
         static size_t cellOffset(const JSCell*);
 
-        void reset();
-        void sweep();
-
         NEVER_INLINE CollectorBlock* allocateBlock();
         NEVER_INLINE void freeBlock(size_t);
         void resizeBlocks();
         void growBlocks(size_t neededBlocks);
         void shrinkBlocks(size_t neededBlocks);
-        void clearMarkBits();
+
         void clearMarkBits(CollectorBlock*);
         size_t markedCells(size_t startBlock = 0, size_t startCell = 0) const;
 
         void addToStatistics(Statistics&) const;
 
-        void markRoots();
-
-    private:
         CollectorHeap m_heap;
         JSGlobalData* m_globalData;
     };
@@ -203,6 +203,11 @@ namespace JSC {
         return (reinterpret_cast<uintptr_t>(cell) & BLOCK_OFFSET_MASK) / CELL_SIZE;
     }
 
+    inline Heap* MarkedSpace::heap(JSCell* cell)
+    {
+        return cellBlock(cell)->heap;
+    }
+
     inline bool MarkedSpace::isCellMarked(const JSCell* cell)
     {
         return cellBlock(cell)->marked.get(cellOffset(cell));

-- 
WebKit Debian packaging