[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 da44d847985b6d431d6e242fda53cf3d22e23726
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sat Aug 28 07:58:54 2010 +0000

    2010-08-28  Pratik Solanki  <psolanki at apple.com>
    
            Reviewed by Dan Bernstein.
    
            Add an ENABLE define for purgeable memory support
            https://bugs.webkit.org/show_bug.cgi?id=44777
    
            * wtf/Platform.h:
    2010-08-28  Pratik Solanki  <psolanki at apple.com>
    
            Reviewed by Dan Bernstein.
    
            Add an ENABLE define for purgeable memory support
            https://bugs.webkit.org/show_bug.cgi?id=44777
    
            * platform/PurgeableBuffer.h:
            * platform/mac/PurgeableBufferMac.cpp:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@66301 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index ee580e0..4a3bd4e 100644
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -1,3 +1,12 @@
+2010-08-28  Pratik Solanki  <psolanki at apple.com>
+
+        Reviewed by Dan Bernstein.
+
+        Add an ENABLE define for purgeable memory support
+        https://bugs.webkit.org/show_bug.cgi?id=44777
+
+        * wtf/Platform.h:
+
 2010-08-27  Kimmo Kinnunen  <kimmo.t.kinnunen at nokia.com>
 
         Reviewed by Kenneth Rohde Christiansen.
diff --git a/JavaScriptCore/wtf/Platform.h b/JavaScriptCore/wtf/Platform.h
index 9d27163..d114085 100644
--- a/JavaScriptCore/wtf/Platform.h
+++ b/JavaScriptCore/wtf/Platform.h
@@ -617,6 +617,10 @@
 #define WTF_PLATFORM_CF 1
 #endif
 
+#if OS(DARWIN) && !defined(BUILDING_ON_TIGER) && !PLATFORM(GTK) && !PLATFORM(QT)
+#define ENABLE_PURGEABLE_MEMORY 1
+#endif
+
 #if PLATFORM(IOS)
 #define ENABLE_CONTEXT_MENUS 0
 #define ENABLE_DRAG_SUPPORT 0
@@ -861,6 +865,10 @@
 #define ENABLE_NETSCAPE_PLUGIN_METADATA_CACHE 0
 #endif
 
+#if !defined(ENABLE_PURGEABLE_MEMORY)
+#define ENABLE_PURGEABLE_MEMORY 0
+#endif
+
 #if !defined(WTF_USE_PLUGIN_HOST_PROCESS)
 #define WTF_USE_PLUGIN_HOST_PROCESS 0
 #endif
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 6da8f2f..4ea5303 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,13 @@
+2010-08-28  Pratik Solanki  <psolanki at apple.com>
+
+        Reviewed by Dan Bernstein.
+
+        Add an ENABLE define for purgeable memory support
+        https://bugs.webkit.org/show_bug.cgi?id=44777
+
+        * platform/PurgeableBuffer.h:
+        * platform/mac/PurgeableBufferMac.cpp:
+
 2010-08-28  Lucas De Marchi  <lucas.demarchi at profusion.mobi>
 
         Reviewed by Kenneth Rohde Christiansen.
diff --git a/WebCore/platform/PurgeableBuffer.h b/WebCore/platform/PurgeableBuffer.h
index 3caf482..32341c2 100644
--- a/WebCore/platform/PurgeableBuffer.h
+++ b/WebCore/platform/PurgeableBuffer.h
@@ -63,7 +63,7 @@ namespace WebCore {
         mutable State m_state;
     };
 
-#if !OS(DARWIN) || defined(BUILDING_ON_TIGER) || PLATFORM(QT) || PLATFORM(GTK)
+#if !ENABLE(PURGEABLE_MEMORY)
     inline PassOwnPtr<PurgeableBuffer> PurgeableBuffer::create(const char*, size_t) { return PassOwnPtr<PurgeableBuffer>(); }
     inline PurgeableBuffer::~PurgeableBuffer() { }
     inline const char* PurgeableBuffer::data() const { return 0; }
diff --git a/WebCore/platform/mac/PurgeableBufferMac.cpp b/WebCore/platform/mac/PurgeableBufferMac.cpp
index ce00494..54de4ed 100644
--- a/WebCore/platform/mac/PurgeableBufferMac.cpp
+++ b/WebCore/platform/mac/PurgeableBufferMac.cpp
@@ -25,7 +25,7 @@
 
 #include "config.h"
 
-#ifndef BUILDING_ON_TIGER
+#if ENABLE(PURGEABLE_MEMORY)
 
 #include "PurgeableBuffer.h"
 

-- 
WebKit Debian packaging