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

barraclough at apple.com barraclough at apple.com
Wed Dec 22 11:29:01 UTC 2010


The following commit has been merged in the debian/experimental branch:
commit 3405a1ff7a4f5a2436287dc74b33e62fcc5cdd00
Author: barraclough at apple.com <barraclough at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Jul 27 02:37:53 2010 +0000

    Speculative !debug build fix.
    
    * wtf/PageAllocation.h:
    (WTF::PageAllocation::PageAllocation):
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@64099 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index 1b1640d..38718c9 100644
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -1,5 +1,12 @@
 2010-07-26  Gavin Barraclough  <barraclough at apple.com>
 
+        Speculative !debug build fix.
+
+        * wtf/PageAllocation.h:
+        (WTF::PageAllocation::PageAllocation):
+
+2010-07-26  Gavin Barraclough  <barraclough at apple.com>
+
         Reviewed by Oliver Hunt.
 
         Bug 43009 - Abstract out page allocation from executable allocators
diff --git a/JavaScriptCore/wtf/PageAllocation.h b/JavaScriptCore/wtf/PageAllocation.h
index e79cc47..258379c 100644
--- a/JavaScriptCore/wtf/PageAllocation.h
+++ b/JavaScriptCore/wtf/PageAllocation.h
@@ -69,6 +69,9 @@ public:
         , m_chunk(parent.chunk)
 #endif
     {
+#if defined(NDEBUG) && !OS(SYMBIAN)
+        UNUSED_PARAM(parent);
+#endif
         ASSERT(base >= parent.m_base);
         ASSERT(size <= parent.m_size);
         ASSERT(static_cast<char*>(base) + size <= static_cast<char*>(parent.m_base) + parent.m_size);

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list