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

[ggaren at apple.com]

The following commit has been merged in the debian/experimental branch:
commit b8c036d2b2a12379a9a6455a053420d837b54601
Author: ggaren at apple.com <ggaren at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Dec 9 01:35:13 2010 +0000

    Try to fix GTK Linux build.
    
    * jit/ExecutableAllocator.cpp:
    (JSC::ExecutablePool::systemAlloc):
    * runtime/AlignedMemoryAllocator.h:
    (JSC::::AlignedMemoryAllocator): Updated for Usage enum moving to OSAllocator.
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@73571 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index 8964fc5..09f64a1 100644
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -1,3 +1,12 @@
+2010-12-08  Geoffrey Garen  <ggaren at apple.com>
+
+        Try to fix GTK Linux build.
+
+        * jit/ExecutableAllocator.cpp:
+        (JSC::ExecutablePool::systemAlloc):
+        * runtime/AlignedMemoryAllocator.h:
+        (JSC::::AlignedMemoryAllocator): Updated for Usage enum moving to OSAllocator.
+
 2010-12-07  Geoffrey Garen  <ggaren at apple.com>
 
         Reviewed by Sam Weinig.
diff --git a/JavaScriptCore/jit/ExecutableAllocator.cpp b/JavaScriptCore/jit/ExecutableAllocator.cpp
index 8742eda..466ce6e 100644
--- a/JavaScriptCore/jit/ExecutableAllocator.cpp
+++ b/JavaScriptCore/jit/ExecutableAllocator.cpp
@@ -51,7 +51,7 @@ void ExecutableAllocator::intializePageSize()
 
 ExecutablePool::Allocation ExecutablePool::systemAlloc(size_t size)
 {
-    PageAllocation allocation = PageAllocation::allocate(size, PageAllocation::JSJITCodePages, EXECUTABLE_POOL_WRITABLE, true);
+    PageAllocation allocation = PageAllocation::allocate(size, OSAllocator::JSJITCodePages, EXECUTABLE_POOL_WRITABLE, true);
     if (!allocation)
         CRASH();
     return allocation;
diff --git a/JavaScriptCore/runtime/AlignedMemoryAllocator.h b/JavaScriptCore/runtime/AlignedMemoryAllocator.h
index c5dd4a3..8c54103 100644
--- a/JavaScriptCore/runtime/AlignedMemoryAllocator.h
+++ b/JavaScriptCore/runtime/AlignedMemoryAllocator.h
@@ -136,7 +136,7 @@ private:
 
 template<size_t blockSize>
 AlignedMemoryAllocator<blockSize>::AlignedMemoryAllocator()
-    : m_reservation(PageReservation::reserve(reservationSize + blockSize, PageAllocation::JSGCHeapPages))
+    : m_reservation(PageReservation::reserve(reservationSize + blockSize, OSAllocator::JSGCHeapPages))
     , m_nextFree(0)
 {
     // check that blockSize and reservationSize are powers of two

-- 
WebKit Debian packaging