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

[xan at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit 11231ce15b7121db79987f29b7fe2e94bfcde4a1
Author: xan at webkit.org <xan at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Aug 25 17:02:20 2010 +0000

    2010-08-25  Xan Lopez  <xlopez at igalia.com>
    
            Reviewed by Alexey Proskuryakov.
    
            Remove dead code in JSGlobalObject
            https://bugs.webkit.org/show_bug.cgi?id=44615
    
            The recursion data member in the JSGlobalObject and its getter
            plus inc/dec methods seems to be unused, remove them.
    
            * runtime/JSGlobalObject.cpp:
            (JSC::JSGlobalObject::init):
            * runtime/JSGlobalObject.h:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@66019 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index 327753c..bf4e1d8 100644
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -1,3 +1,17 @@
+2010-08-25  Xan Lopez  <xlopez at igalia.com>
+
+        Reviewed by Alexey Proskuryakov.
+
+        Remove dead code in JSGlobalObject
+        https://bugs.webkit.org/show_bug.cgi?id=44615
+
+        The recursion data member in the JSGlobalObject and its getter
+        plus inc/dec methods seems to be unused, remove them.
+
+        * runtime/JSGlobalObject.cpp:
+        (JSC::JSGlobalObject::init):
+        * runtime/JSGlobalObject.h:
+
 2010-08-25  Michael Saboff  <msaboff at apple.com>
 
         Reviewed by Geoffrey Garen.
diff --git a/JavaScriptCore/runtime/JSGlobalObject.cpp b/JavaScriptCore/runtime/JSGlobalObject.cpp
index c317e13..89c042a 100644
--- a/JavaScriptCore/runtime/JSGlobalObject.cpp
+++ b/JavaScriptCore/runtime/JSGlobalObject.cpp
@@ -141,7 +141,6 @@ void JSGlobalObject::init(JSObject* thisValue)
     } else
         headObject = d()->next = d()->prev = this;
 
-    d()->recursion = 0;
     d()->debugger = 0;
 
     d()->profileGroup = 0;
diff --git a/JavaScriptCore/runtime/JSGlobalObject.h b/JavaScriptCore/runtime/JSGlobalObject.h
index 359f1d9..f5d2fb0 100644
--- a/JavaScriptCore/runtime/JSGlobalObject.h
+++ b/JavaScriptCore/runtime/JSGlobalObject.h
@@ -109,8 +109,6 @@ namespace JSC {
             ScopeChain globalScopeChain;
             Register globalCallFrame[RegisterFile::CallFrameHeaderSize];
 
-            int recursion;
-
             RegExpConstructor* regExpConstructor;
             ErrorConstructor* errorConstructor;
             NativeErrorConstructor* evalErrorConstructor;
@@ -257,10 +255,6 @@ namespace JSC {
         
         virtual bool supportsProfiling() const { return false; }
         
-        int recursion() { return d()->recursion; }
-        void incRecursion() { ++d()->recursion; }
-        void decRecursion() { --d()->recursion; }
-        
         ScopeChain& globalScopeChain() { return d()->globalScopeChain; }
 
         virtual bool isGlobalObject() const { return true; }

-- 
WebKit Debian packaging