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

ggaren at apple.com ggaren at apple.com
Wed Dec 22 18:47:08 UTC 2010


The following commit has been merged in the debian/experimental branch:
commit 4e1b079f72fb1258df6f9709184c8bf7e92dcea6
Author: ggaren at apple.com <ggaren at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Dec 17 22:48:40 2010 +0000

    2010-12-17  Geoffrey Garen  <ggaren at apple.com>
    
            Reviewed by Oliver Hunt.
    
            Removed RChunk from PageAllocation/PageReservation, since it's now unused.
            https://bugs.webkit.org/show_bug.cgi?id=51276
    
            * wtf/PageAllocation.h:
            (WTF::PageAllocation::PageAllocation):
            * wtf/PageReservation.h:
            (WTF::PageReservation::PageReservation):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@74297 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index e2f6767..9d9758a 100644
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -1,3 +1,15 @@
+2010-12-17  Geoffrey Garen  <ggaren at apple.com>
+
+        Reviewed by Oliver Hunt.
+
+        Removed RChunk from PageAllocation/PageReservation, since it's now unused.
+        https://bugs.webkit.org/show_bug.cgi?id=51276
+
+        * wtf/PageAllocation.h:
+        (WTF::PageAllocation::PageAllocation):
+        * wtf/PageReservation.h:
+        (WTF::PageReservation::PageReservation):
+
 2010-12-17  Oliver Hunt  <oliver at apple.com>
 
         Reviewed by Gavin Barraclough.
diff --git a/JavaScriptCore/wtf/PageAllocation.h b/JavaScriptCore/wtf/PageAllocation.h
index 3585b33..ef21a73 100644
--- a/JavaScriptCore/wtf/PageAllocation.h
+++ b/JavaScriptCore/wtf/PageAllocation.h
@@ -86,9 +86,6 @@ public:
     PageAllocation()
         : m_base(0)
         , m_size(0)
-#if OS(SYMBIAN)
-        , m_chunk(0)
-#endif
     {
     }
 
@@ -134,20 +131,11 @@ public:
 #endif
 
 protected:
-#if OS(SYMBIAN)
-    PageAllocation(void* base, size_t size, RChunk* chunk)
-        : m_base(base)
-        , m_size(size)
-        , m_chunk(chunk)
-    {
-    }
-#else
     PageAllocation(void* base, size_t size)
         : m_base(base)
         , m_size(size)
     {
     }
-#endif
 
 #if HAVE(PAGE_ALLOCATE_ALIGNED)
     static PageAllocation systemAllocateAligned(size_t, OSAllocator::Usage);
@@ -156,9 +144,6 @@ protected:
 
     void* m_base;
     size_t m_size;
-#if OS(SYMBIAN)
-    RChunk* m_chunk;
-#endif
 
     static JS_EXPORTDATA size_t s_pageSize;
 };
diff --git a/JavaScriptCore/wtf/PageReservation.h b/JavaScriptCore/wtf/PageReservation.h
index ae06efc..310b9a2 100644
--- a/JavaScriptCore/wtf/PageReservation.h
+++ b/JavaScriptCore/wtf/PageReservation.h
@@ -100,13 +100,8 @@ public:
     }
 
 private:
-#if OS(SYMBIAN)
-    PageReservation(void* base, size_t size, RChunk* chunk)
-        : PageAllocation(base, size, chunk)
-#else
     PageReservation(void* base, size_t size, bool writable, bool executable)
         : PageAllocation(base, size)
-#endif
 #ifndef NDEBUG
         , m_committed(0)
 #endif

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list