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

[yael.aharon at nokia.com]

The following commit has been merged in the webkit-1.3 branch:
commit 00464b6038a4cabbd74fe26259eaf6215ae6d800
Author: yael.aharon at nokia.com <yael.aharon at nokia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Jan 26 21:59:22 2011 +0000

    2011-01-26  Yael Aharon  <yael.aharon at nokia.com>
    
            Reviewed by Laszlo Gombos.
    
            [Qt][Symbian] Fix --minimal build
            https://bugs.webkit.org/show_bug.cgi?id=52839
    
            Move definition of USE_SYSTEM_MALLOC out of pri file.
            Put it in platform.h instead.
    
            * Source/WebKit.pri:
    2011-01-26  Yael Aharon  <yael.aharon at nokia.com>
    
            Reviewed by Laszlo Gombos.
    
            [Qt][Symbian] Fix --minimal build
            https://bugs.webkit.org/show_bug.cgi?id=52839
    
            Move definition of USE_SYSTEM_MALLOC out of pri file.
            Put it in platform.h instead.
    
            * wtf/Platform.h:
            * wtf/TCSystemAlloc.cpp:
            * wtf/wtf.pri:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@76716 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/ChangeLog b/ChangeLog
index b7185b1..f7a2115 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2011-01-26  Yael Aharon  <yael.aharon at nokia.com>
+
+        Reviewed by Laszlo Gombos.
+
+        [Qt][Symbian] Fix --minimal build
+        https://bugs.webkit.org/show_bug.cgi?id=52839
+
+        Move definition of USE_SYSTEM_MALLOC out of pri file.
+        Put it in platform.h instead.
+
+        * Source/WebKit.pri:
+
 2011-01-26  Csaba Osztrogonác  <ossy at webkit.org>
 
         Reviewed by Andreas Kling.
diff --git a/Source/JavaScriptCore/ChangeLog b/Source/JavaScriptCore/ChangeLog
index 4c73143..2075202 100644
--- a/Source/JavaScriptCore/ChangeLog
+++ b/Source/JavaScriptCore/ChangeLog
@@ -1,3 +1,17 @@
+2011-01-26  Yael Aharon  <yael.aharon at nokia.com>
+
+        Reviewed by Laszlo Gombos.
+
+        [Qt][Symbian] Fix --minimal build
+        https://bugs.webkit.org/show_bug.cgi?id=52839
+
+        Move definition of USE_SYSTEM_MALLOC out of pri file.
+        Put it in platform.h instead.
+
+        * wtf/Platform.h:
+        * wtf/TCSystemAlloc.cpp:
+        * wtf/wtf.pri:
+
 2011-01-26  Patrick Gansterer  <paroga at webkit.org>
 
         Reviewed by Andreas Kling.
diff --git a/Source/JavaScriptCore/wtf/Platform.h b/Source/JavaScriptCore/wtf/Platform.h
index 34b6cde..e4428c5 100644
--- a/Source/JavaScriptCore/wtf/Platform.h
+++ b/Source/JavaScriptCore/wtf/Platform.h
@@ -831,6 +831,9 @@
 #if PLATFORM(QT)
 /* We must not customize the global operator new and delete for the Qt port. */
 #define ENABLE_GLOBAL_FASTMALLOC_NEW 0
+#if !PLATFORM(UNIX) || OS(SYMBIAN)
+#define USE_SYSTEM_MALLOC 1
+#endif
 #endif
 
 /* fastMalloc match validation allows for runtime verification that
diff --git a/Source/JavaScriptCore/wtf/TCSystemAlloc.cpp b/Source/JavaScriptCore/wtf/TCSystemAlloc.cpp
index 0b7ecc9..3cb59e8 100644
--- a/Source/JavaScriptCore/wtf/TCSystemAlloc.cpp
+++ b/Source/JavaScriptCore/wtf/TCSystemAlloc.cpp
@@ -31,6 +31,7 @@
 // Author: Sanjay Ghemawat
 
 #include "config.h"
+#if !(defined(USE_SYSTEM_MALLOC) && USE_SYSTEM_MALLOC)
 #include "TCSystemAlloc.h"
 
 #include <algorithm>
@@ -519,3 +520,6 @@ void TCMalloc_SystemCommit(void* start, size_t length)
 // declared in TCSystemAlloc.h
 
 #endif
+
+#endif // #if !(defined(USE_SYSTEM_MALLOC) && USE_SYSTEM_MALLOC)
+
diff --git a/Source/JavaScriptCore/wtf/wtf.pri b/Source/JavaScriptCore/wtf/wtf.pri
index 8535ef3..88d695f 100644
--- a/Source/JavaScriptCore/wtf/wtf.pri
+++ b/Source/JavaScriptCore/wtf/wtf.pri
@@ -22,6 +22,7 @@ SOURCES += \
     wtf/RandomNumber.cpp \
     wtf/RefCountedLeakCounter.cpp \
     wtf/StackBounds.cpp \
+    wtf/TCSystemAlloc.cpp \
     wtf/ThreadingNone.cpp \
     wtf/Threading.cpp \
     wtf/TypeTraits.cpp \
@@ -42,10 +43,6 @@ contains(DEFINES, USE_GSTREAMER=1) {
     CONFIG += link_pkgconfig
 }
 
-!contains(DEFINES, USE_SYSTEM_MALLOC=1) {
-    SOURCES += wtf/TCSystemAlloc.cpp
-}
-
 unix:!symbian: SOURCES += wtf/OSAllocatorPosix.cpp
 symbian: SOURCES += wtf/OSAllocatorSymbian.cpp
 win*|wince*: SOURCES += wtf/OSAllocatorWin.cpp
diff --git a/Source/WebKit.pri b/Source/WebKit.pri
index e779020..74df78d 100644
--- a/Source/WebKit.pri
+++ b/Source/WebKit.pri
@@ -47,10 +47,6 @@ building-libs {
     DEPENDPATH += $$PWD/WebKit/qt/Api
 }
 
-!mac:!unix|symbian {
-    DEFINES += USE_SYSTEM_MALLOC=1
-}
-
 CONFIG(release, debug|release) {
     DEFINES += NDEBUG
 }

-- 
WebKit Debian packaging