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

hausmann at webkit.org hausmann at webkit.org
Wed Dec 22 12:28:18 UTC 2010


The following commit has been merged in the debian/experimental branch:
commit 93b26c34c0640b2eb47195e2fcce13359e6bd68e
Author: hausmann at webkit.org <hausmann at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Aug 24 10:38:35 2010 +0000

    [Symbian] Fix commit/decommit of system memory using RChunk
    
    Patch by Yael Aharon <yael.aharon at nokia.com> on 2010-08-24
    Reviewed by Simon Hausmann.
    
    Swap accidentially reversed start and m_base values for determining the
    offset within the RChunk.
    
    * wtf/PageReservation.h:
    (WTF::PageReservation::systemCommit):
    (WTF::PageReservation::systemDecommit):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@65886 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index 548c924..e6fce41 100644
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -1,3 +1,16 @@
+2010-08-24  Yael Aharon  <yael.aharon at nokia.com>
+
+        Reviewed by Simon Hausmann.
+
+        [Symbian] Fix commit/decommit of system memory using RChunk
+
+        Swap accidentially reversed start and m_base values for determining the
+        offset within the RChunk.
+
+        * wtf/PageReservation.h:
+        (WTF::PageReservation::systemCommit):
+        (WTF::PageReservation::systemDecommit):
+
 2010-08-23  Patrick Gansterer  <paroga at paroga.com>
 
         Rubber-stamped by Gabor Loki.
diff --git a/JavaScriptCore/wtf/PageReservation.h b/JavaScriptCore/wtf/PageReservation.h
index 906b5a4..cfc7cd9 100644
--- a/JavaScriptCore/wtf/PageReservation.h
+++ b/JavaScriptCore/wtf/PageReservation.h
@@ -226,14 +226,14 @@ inline PageReservation PageReservation::systemReserve(size_t size, Usage usage,
 
 inline bool PageReservation::systemCommit(void* start, size_t size)
 {
-    intptr_t offset = reinterpret_cast<intptr_t>(m_base) - reinterpret_cast<intptr_t>(start);
+    intptr_t offset = reinterpret_cast<intptr_t>(start) - reinterpret_cast<intptr_t>(m_base);
     m_chunk->Commit(offset, size);
     return true;
 }
 
 inline void PageReservation::systemDecommit(void* start, size_t size)
 {
-    intptr_t offset = reinterpret_cast<intptr_t>(m_base) - reinterpret_cast<intptr_t>(start);
+    intptr_t offset = reinterpret_cast<intptr_t>(start) - reinterpret_cast<intptr_t>(m_base);
     m_chunk->Decommit(offset, size);
 }
 

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list