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

[ojan at chromium.org]

The following commit has been merged in the debian/experimental branch:
commit d9e2a83b57fb6d6795e8daafc192dd31af90c206
Author: ojan at chromium.org <ojan at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Aug 25 18:26:22 2010 +0000

    2010-08-25  Ojan Vafai  <ojan at chromium.org>
    
            Reviewed by Tony Chang.
    
            make perf tests work with V8
            https://bugs.webkit.org/show_bug.cgi?id=44623
    
            V8 doesn't support getJSObjectCount.
    
            * resources/magnitude-perf.js:
            (Magnitude._runIteration):
            (Magnitude):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@66029 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 7b7681a..e793b22 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,16 @@
+2010-08-25  Ojan Vafai  <ojan at chromium.org>
+
+        Reviewed by Tony Chang.
+
+        make perf tests work with V8
+        https://bugs.webkit.org/show_bug.cgi?id=44623
+
+        V8 doesn't support getJSObjectCount.
+
+        * resources/magnitude-perf.js:
+        (Magnitude._runIteration):
+        (Magnitude):
+
 2010-08-25  Simon Fraser  <simon.fraser at apple.com>
 
         Reviewed by Dan Bernstein.
diff --git a/LayoutTests/resources/magnitude-perf.js b/LayoutTests/resources/magnitude-perf.js
index 308c228..33ffde2 100644
--- a/LayoutTests/resources/magnitude-perf.js
+++ b/LayoutTests/resources/magnitude-perf.js
@@ -202,15 +202,19 @@ Magnitude._runIteration = function(setup, test, magnitude, milliseconds, runsPer
 {
     setup(magnitude);
 
-    var jsObjectCountBefore = jsObjectCountAfter = 0;
+    var debugStr = 'run iteration. magnitude ' + magnitude + " milliseconds " + milliseconds + " runsPerIteration " + runsPerIteration;
     if (window.GCController) {
-        jsObjectCountBefore = GCController.getJSObjectCount();
+        if (GCController.getJSObjectCount)
+            debugStr += " jsObjectCountBefore " + GCController.getJSObjectCount();
+
+        // Do a gc to reduce likelihood of gc during the test run.
         GCController.collect();
-        jsObjectCountAfter = GCController.getJSObjectCount();
+
+        if (GCController.getJSObjectCount)
+            debugStr += " jsObjectCountAfter " + GCController.getJSObjectCount();
     }
 
-    Magnitude._debug('run iteration. magnitude ' + magnitude + " milliseconds " + milliseconds + " runsPerIteration " + runsPerIteration +
-        " jsObjectCountBefore " + jsObjectCountBefore + " jsObjectCountAfter " + jsObjectCountAfter);
+    Magnitude._debug(debugStr);
 
     var iterations = 0;
     if (window.chromium) {

-- 
WebKit Debian packaging