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

[commit-queue at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit 554dbf66b03fd02692a66c462dc14e1b3b04b710
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Aug 2 12:21:11 2010 +0000

    2010-08-02  Mahesh Kulkarni  <mahesh.kulkarni at nokia.com>
    
            Reviewed by Simon Hausmann.
    
            [QT] build fix for symbian
            https://bugs.webkit.org/show_bug.cgi?id=43234
    
            1) wrong order of passing param's
            2) static_cast complains on symbian so using reinterpret_cast
    
            No new tests added. Just a build fix for qt symbian
    
            * wtf/PageAllocation.cpp:
            (WTF::PageAllocation::commit):
            (WTF::PageAllocation::decommit):
            (WTF::PageAllocation::reserve):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@64456 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index 2244432..aafb0aa 100644
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -1,3 +1,20 @@
+2010-08-02  Mahesh Kulkarni  <mahesh.kulkarni at nokia.com>
+
+        Reviewed by Simon Hausmann.
+
+        [QT] build fix for symbian
+        https://bugs.webkit.org/show_bug.cgi?id=43234
+
+        1) wrong order of passing param's
+        2) static_cast complains on symbian so using reinterpret_cast
+
+        No new tests added. Just a build fix for qt symbian
+
+        * wtf/PageAllocation.cpp:
+        (WTF::PageAllocation::commit):
+        (WTF::PageAllocation::decommit):
+        (WTF::PageAllocation::reserve):
+
 2010-07-30  Luiz Agostini  <luiz.agostini at openbossa.org>
 
         Reviewed by Simon Fraser.
diff --git a/JavaScriptCore/wtf/PageAllocation.cpp b/JavaScriptCore/wtf/PageAllocation.cpp
index 58a10f6..4cf2ea9 100644
--- a/JavaScriptCore/wtf/PageAllocation.cpp
+++ b/JavaScriptCore/wtf/PageAllocation.cpp
@@ -176,7 +176,7 @@ size_t PageAllocation::pagesize()
 bool PageAllocation::commit(void* start, size_t size, bool writable, bool executable) const
 {
     if (m_chunk) {
-        intptr_t offset = static_cast<intptr_t>(base()) - static_cast<intptr_t>(start);
+        intptr_t offset = reinterpret_cast<intptr_t>(base()) - reinterpret_cast<intptr_t>(start);
         m_chunk->Commit(offset, size);
     }
     return true;
@@ -185,7 +185,7 @@ bool PageAllocation::commit(void* start, size_t size, bool writable, bool execut
 void PageAllocation::decommit(void* start, size_t size) const
 {
     if (m_chunk) {
-        intptr_t offset = static_cast<intptr_t>(base()) - static_cast<intptr_t>(start);
+        intptr_t offset = reinterpret_cast<intptr_t>(base()) - reinterpret_cast<intptr_t>(start);
         m_chunk->Decommit(offset, size);
     }
 }
@@ -205,7 +205,7 @@ PageAllocation PageAllocation::reserve(size_t size, Usage usage, bool writable,
         return PageAllocation(fastMalloc(size), size, 0);
     RChunk* rchunk = new RChunk();
     TInt errorCode = rchunk->CreateLocalCode(0, size);
-    return PageAllocation(rchunk, rchunk->Base(), size);
+    return PageAllocation(rchunk->Base(), size, rchunk);
 }
 
 void PageAllocation::deallocate()

-- 
WebKit Debian packaging