[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373

[eric at webkit.org]

The following commit has been merged in the webkit-1.2 branch:
commit 778b57a66eb23e67fd83820c92f9f195c285a41d
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Oct 27 21:04:20 2009 +0000

    2009-10-27  Carol Szabo  <carol.szabo at nokia.com>
    
            Reviewed by Darin Adler.
    
            Give an ability to WebKit to free statically allocated pointers
            before quit.
            https://bugs.webkit.org/show_bug.cgi?id=27980
    
            No new tests for this as the change does not affect WebKit
            functionality, but only memory usage.
    
            * JavaScriptCore/wtf/StdLibExtras.h:
            Allowed for the override of DEFINE_STATIC_LOCAL via compiler
            commandline options or elsewhere in the code. Useful for
            implementing custom builds that free resources allocated via
            DEFINE_STATIC_LOCAL.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@50171 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/JavaScriptCore/wtf/StdLibExtras.h b/JavaScriptCore/wtf/StdLibExtras.h
index d21d1ff..c9b5742 100644
--- a/JavaScriptCore/wtf/StdLibExtras.h
+++ b/JavaScriptCore/wtf/StdLibExtras.h
@@ -32,6 +32,7 @@
 // Use these to declare and define a static local variable (static T;) so that
 //  it is leaked so that its destructors are not called at exit. Using this
 //  macro also allows workarounds a compiler bug present in Apple's version of GCC 4.0.1.
+#ifndef DEFINE_STATIC_LOCAL
 #if COMPILER(GCC) && defined(__APPLE_CC__) && __GNUC__ == 4 && __GNUC_MINOR__ == 0 && __GNUC_PATCHLEVEL__ == 1
 #define DEFINE_STATIC_LOCAL(type, name, arguments) \
     static type* name##Ptr = new type arguments; \
@@ -40,6 +41,7 @@
 #define DEFINE_STATIC_LOCAL(type, name, arguments) \
     static type& name = *new type arguments
 #endif
+#endif
 
 // OBJECT_OFFSETOF: Like the C++ offsetof macro, but you can use it with classes.
 // The magic number 0x4000 is insignificant. We use it to avoid using NULL, since
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 9e18d5d..d2b9660 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,20 @@
+2009-10-27  Carol Szabo  <carol.szabo at nokia.com>
+
+        Reviewed by Darin Adler.
+
+        Give an ability to WebKit to free statically allocated pointers
+        before quit.
+        https://bugs.webkit.org/show_bug.cgi?id=27980
+
+        No new tests for this as the change does not affect WebKit
+        functionality, but only memory usage.
+
+        * JavaScriptCore/wtf/StdLibExtras.h:
+        Allowed for the override of DEFINE_STATIC_LOCAL via compiler 
+        commandline options or elsewhere in the code. Useful for 
+        implementing custom builds that free resources allocated via
+        DEFINE_STATIC_LOCAL.
+
 2009-10-27  Dumitru Daniliuc  <dumi at chromium.org>
 
         Build fix, no review needed.

-- 
WebKit Debian packaging