diff options
| author | Feng Qian <fqian@google.com> | 2009-07-13 16:30:18 -0700 |
|---|---|---|
| committer | Feng Qian <fqian@google.com> | 2009-07-13 16:30:18 -0700 |
| commit | 5a9288abcf660ba3499c9e650b415d81872837fc (patch) | |
| tree | e39df4bee097d4d92fb27e1b4b1aa6c06380e3c1 /V8Binding/v8/benchmarks | |
| parent | 2350931596370d4cc9fc26d72039369d9fe72c9c (diff) | |
| download | external_webkit-5a9288abcf660ba3499c9e650b415d81872837fc.zip external_webkit-5a9288abcf660ba3499c9e650b415d81872837fc.tar.gz external_webkit-5a9288abcf660ba3499c9e650b415d81872837fc.tar.bz2 | |
Update V8 to bleeding_edge@2450 to pick up a few important fixes.
API stays the same, and the same revision is pushed to Chromium.
Diffstat (limited to 'V8Binding/v8/benchmarks')
| -rw-r--r-- | V8Binding/v8/benchmarks/README.txt | 5 | ||||
| -rw-r--r-- | V8Binding/v8/benchmarks/deltablue.js | 14 | ||||
| -rw-r--r-- | V8Binding/v8/benchmarks/revisions.html | 5 |
3 files changed, 15 insertions, 9 deletions
diff --git a/V8Binding/v8/benchmarks/README.txt b/V8Binding/v8/benchmarks/README.txt index 561e88b..eb759cc 100644 --- a/V8Binding/v8/benchmarks/README.txt +++ b/V8Binding/v8/benchmarks/README.txt @@ -57,4 +57,7 @@ of the benchmark. Changes from Version 4 to Version 5 =================================== -Removed duplicate line in random seed code. +Removed duplicate line in random seed code, and changed the name of +the Object.prototype.inherits function in the DeltaBlue benchmark to +inheritsFrom to avoid name clashes when running in Chromium with +extensions enabled. diff --git a/V8Binding/v8/benchmarks/deltablue.js b/V8Binding/v8/benchmarks/deltablue.js index 253046f..7e25d2e 100644 --- a/V8Binding/v8/benchmarks/deltablue.js +++ b/V8Binding/v8/benchmarks/deltablue.js @@ -46,7 +46,7 @@ var DeltaBlue = new BenchmarkSuite('DeltaBlue', 71104, [ /* --- O b j e c t M o d e l --- */ -Object.prototype.inherits = function (shuper) { +Object.prototype.inheritsFrom = function (shuper) { function Inheriter() { } Inheriter.prototype = shuper.prototype; this.prototype = new Inheriter(); @@ -216,7 +216,7 @@ function UnaryConstraint(v, strength) { this.addConstraint(); } -UnaryConstraint.inherits(Constraint); +UnaryConstraint.inheritsFrom(Constraint); /** * Adds this constraint to the constraint graph @@ -294,7 +294,7 @@ function StayConstraint(v, str) { StayConstraint.superConstructor.call(this, v, str); } -StayConstraint.inherits(UnaryConstraint); +StayConstraint.inheritsFrom(UnaryConstraint); StayConstraint.prototype.execute = function () { // Stay constraints do nothing @@ -312,7 +312,7 @@ function EditConstraint(v, str) { EditConstraint.superConstructor.call(this, v, str); } -EditConstraint.inherits(UnaryConstraint); +EditConstraint.inheritsFrom(UnaryConstraint); /** * Edits indicate that a variable is to be changed by imperative code. @@ -346,7 +346,7 @@ function BinaryConstraint(var1, var2, strength) { this.addConstraint(); } -BinaryConstraint.inherits(Constraint); +BinaryConstraint.inheritsFrom(Constraint); /** * Decides if this constratint can be satisfied and which way it @@ -459,7 +459,7 @@ function ScaleConstraint(src, scale, offset, dest, strength) { ScaleConstraint.superConstructor.call(this, src, dest, strength); } -ScaleConstraint.inherits(BinaryConstraint); +ScaleConstraint.inheritsFrom(BinaryConstraint); /** * Adds this constraint to the constraint graph. @@ -515,7 +515,7 @@ function EqualityConstraint(var1, var2, strength) { EqualityConstraint.superConstructor.call(this, var1, var2, strength); } -EqualityConstraint.inherits(BinaryConstraint); +EqualityConstraint.inheritsFrom(BinaryConstraint); /** * Enforce this constraint. Assume that it is satisfied. diff --git a/V8Binding/v8/benchmarks/revisions.html b/V8Binding/v8/benchmarks/revisions.html index b86c876..99d7be4 100644 --- a/V8Binding/v8/benchmarks/revisions.html +++ b/V8Binding/v8/benchmarks/revisions.html @@ -22,7 +22,10 @@ the benchmark suite. <div class="subtitle"><h3>Version 5 (<a href="http://v8.googlecode.com/svn/data/benchmarks/v5/run.html">link</a>)</h3></div> -<p>Removed a duplicate line in the base random seed code. +<p>Removed duplicate line in random seed code, and changed the name of +the Object.prototype.inherits function in the DeltaBlue benchmark to +inheritsFrom to avoid name clashes when running in Chromium with +extensions enabled. </p> <div class="subtitle"><h3>Version 4 (<a href="http://v8.googlecode.com/svn/data/benchmarks/v4/run.html">link</a>)</h3></div> |