[SCM] WebKit Debian packaging branch, debian/experimental, updated. debian/1.3.8-1-1049-g2e11a8e

[commit-queue at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit aa497881ab0fd9b3cff8176db83a6e9a2896cd5c
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Jan 4 22:47:47 2011 +0000

    2011-01-04  James Robinson  <jamesr at chromium.org>
    
            Reviewed by Darin Adler.
    
            StackBounds initialization in WTFThreadData should be guarded by #if USE(JSC)
            https://bugs.webkit.org/show_bug.cgi?id=51881
    
            The StackBounds class is only used by JavaScriptCore.
    
            * wtf/WTFThreadData.cpp:
            (WTF::WTFThreadData::WTFThreadData):
            * wtf/WTFThreadData.h:
            (WTF::WTFThreadData::resetCurrentIdentifierTable):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@75011 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/JavaScriptCore/ChangeLog b/Source/JavaScriptCore/ChangeLog
index 73084ff..f04bf50 100644
--- a/Source/JavaScriptCore/ChangeLog
+++ b/Source/JavaScriptCore/ChangeLog
@@ -1,3 +1,17 @@
+2011-01-04  James Robinson  <jamesr at chromium.org>
+
+        Reviewed by Darin Adler.
+
+        StackBounds initialization in WTFThreadData should be guarded by #if USE(JSC)
+        https://bugs.webkit.org/show_bug.cgi?id=51881
+
+        The StackBounds class is only used by JavaScriptCore.
+
+        * wtf/WTFThreadData.cpp:
+        (WTF::WTFThreadData::WTFThreadData):
+        * wtf/WTFThreadData.h:
+        (WTF::WTFThreadData::resetCurrentIdentifierTable):
+
 2011-01-03  Martin Robinson  <mrobinson at igalia.com>
 
         Reviewed by Darin Adler.
diff --git a/Source/JavaScriptCore/wtf/WTFThreadData.cpp b/Source/JavaScriptCore/wtf/WTFThreadData.cpp
index 05be8d1..84e1856 100644
--- a/Source/JavaScriptCore/wtf/WTFThreadData.cpp
+++ b/Source/JavaScriptCore/wtf/WTFThreadData.cpp
@@ -41,8 +41,8 @@ WTFThreadData::WTFThreadData()
 #if USE(JSC)
     , m_defaultIdentifierTable(new JSC::IdentifierTable())
     , m_currentIdentifierTable(m_defaultIdentifierTable)
-#endif
     , m_stackBounds(StackBounds::currentThreadStackBounds())
+#endif
 {
 }
 
diff --git a/Source/JavaScriptCore/wtf/WTFThreadData.h b/Source/JavaScriptCore/wtf/WTFThreadData.h
index da1b6eb..52c267a 100644
--- a/Source/JavaScriptCore/wtf/WTFThreadData.h
+++ b/Source/JavaScriptCore/wtf/WTFThreadData.h
@@ -112,12 +112,12 @@ public:
     {
         m_currentIdentifierTable = m_defaultIdentifierTable;
     }
-#endif
 
     const StackBounds& stack() const
     {
         return m_stackBounds;
     }
+#endif
 
 private:
     AtomicStringTable* m_atomicStringTable;
@@ -126,6 +126,7 @@ private:
 #if USE(JSC)
     JSC::IdentifierTable* m_defaultIdentifierTable;
     JSC::IdentifierTable* m_currentIdentifierTable;
+    StackBounds m_stackBounds;
 #endif
 
 #if WTFTHREADDATA_MULTITHREADED
@@ -135,8 +136,6 @@ private:
 #endif
     friend WTFThreadData& wtfThreadData();
     friend class AtomicStringTable;
-
-    StackBounds m_stackBounds;
 };
 
 inline WTFThreadData& wtfThreadData()

-- 
WebKit Debian packaging