[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 85945092d9957ea9bc8c2785295ec5c4ea9aa14a
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Oct 5 03:37:39 2010 +0000

    2010-10-04  Gyuyoung Kim  <gyuyoung.kim at samsung.com>
    
            Reviewed by Antonio Gomes.
    
            [EFL] Use fast malloc for WebKit EFL
            https://bugs.webkit.org/show_bug.cgi?id=46691
    
            Use fast malloc for WebKit EFL because the fast malloc is to allocate
            memory quickly.
    
            * wtf/CMakeListsEfl.txt:
    2010-10-04  Gyuyoung Kim  <gyuyoung.kim at samsung.com>
    
            Reviewed by Antonio Gomes.
    
            [EFL] Use fast malloc for WebKit EFL
            https://bugs.webkit.org/show_bug.cgi?id=46691
    
            Use fast malloc for WebKit EFL because the fast malloc is to allocate
            memory quickly.
    
            * cmake/OptionsEfl.cmake:
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@69060 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/ChangeLog b/ChangeLog
index 05b9e9b..2311978 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2010-10-04  Gyuyoung Kim  <gyuyoung.kim at samsung.com>
+
+        Reviewed by Antonio Gomes.
+
+        [EFL] Use fast malloc for WebKit EFL
+        https://bugs.webkit.org/show_bug.cgi?id=46691
+
+        Use fast malloc for WebKit EFL because the fast malloc is to allocate
+        memory quickly.
+
+        * cmake/OptionsEfl.cmake:
+
 2010-10-03  Dimitri Glazkov  <dglazkov at chromium.org>
 
         Add Chromium depot_tools to files that git should ignore.
diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index b1bcd7c..8fcc160 100644
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -1,3 +1,15 @@
+2010-10-04  Gyuyoung Kim  <gyuyoung.kim at samsung.com>
+
+        Reviewed by Antonio Gomes.
+
+        [EFL] Use fast malloc for WebKit EFL
+        https://bugs.webkit.org/show_bug.cgi?id=46691
+
+        Use fast malloc for WebKit EFL because the fast malloc is to allocate
+        memory quickly.
+
+        * wtf/CMakeListsEfl.txt:
+
 2010-10-04  Oliver Hunt  <oliver at apple.com>
 
         Reviewed by Geoff Garen.
diff --git a/JavaScriptCore/wtf/CMakeListsEfl.txt b/JavaScriptCore/wtf/CMakeListsEfl.txt
index 6a714ae..a537d0f 100644
--- a/JavaScriptCore/wtf/CMakeListsEfl.txt
+++ b/JavaScriptCore/wtf/CMakeListsEfl.txt
@@ -1,4 +1,10 @@
-ADD_DEFINITIONS(-DUSE_SYSTEM_MALLOC=1)
+IF (ENABLE_FAST_MALLOC)
+  LIST(APPEND WTF_SOURCES
+    TCSystemAlloc.cpp
+  )
+ELSE ()
+  ADD_DEFINITIONS(-DUSE_SYSTEM_MALLOC=1)
+ENDIF()
 
 LIST(APPEND WTF_SOURCES
     efl/MainThreadEfl.cpp
diff --git a/cmake/OptionsEfl.cmake b/cmake/OptionsEfl.cmake
index 6b4c2f4..5ac192c 100644
--- a/cmake/OptionsEfl.cmake
+++ b/cmake/OptionsEfl.cmake
@@ -54,6 +54,7 @@ WEBKIT_FEATURE(ENABLE_DATAGRID "Enable datagrid" DEFAULT OFF)
 WEBKIT_FEATURE(ENABLE_DATALIST "Enable datalist" DEFAULT ON HTML)
 WEBKIT_FEATURE(ENABLE_DOM_STORAGE "Enable DOM storage" DEFAULT ON)
 WEBKIT_FEATURE(ENABLE_EVENTSOURCE "Enable event source" DEFAULT ON)
+WEBKIT_FEATURE(ENABLE_FAST_MALLOC "Enable TCmalloc instead of system's allocator" DEFAULT ON)
 WEBKIT_FEATURE(ENABLE_FAST_MOBILE_SCROLLING "Enable fast mobile scrolling" DEFAULT ON)
 WEBKIT_FEATURE(ENABLE_FILTERS "Enable SVG filters" DEFAULT ON SVG)
 WEBKIT_FEATURE(ENABLE_GEOLOCATION "Enable geolocation" DEFAULT OFF)

-- 
WebKit Debian packaging