Index: chrome/test/data/v8_benchmark/deltablue.js |
diff --git a/chrome/test/data/v8_benchmark/deltablue.js b/chrome/test/data/v8_benchmark/deltablue.js |
index 253046f8040106f41e23e0ce2a16bf56a1263141..548fd96ffbdab33d8553cbbc1465b0cd2d40a174 100644 |
--- a/chrome/test/data/v8_benchmark/deltablue.js |
+++ b/chrome/test/data/v8_benchmark/deltablue.js |
@@ -23,13 +23,13 @@ |
// more like a JavaScript program. |
-var DeltaBlue = new BenchmarkSuite('DeltaBlue', 71104, [ |
+var DeltaBlue = new BenchmarkSuite('DeltaBlue', 66118, [ |
new Benchmark('DeltaBlue', deltaBlue) |
]); |
/** |
- * A JavaScript implementation of the DeltaBlue constrain-solving |
+ * A JavaScript implementation of the DeltaBlue constraint-solving |
* algorithm, as described in: |
* |
* "The DeltaBlue Algorithm: An Incremental Constraint Hierarchy Solver" |
@@ -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,16 +346,16 @@ function BinaryConstraint(var1, var2, strength) { |
this.addConstraint(); |
} |
-BinaryConstraint.inherits(Constraint); |
+BinaryConstraint.inheritsFrom(Constraint); |
/** |
- * Decides if this constratint can be satisfied and which way it |
+ * Decides if this constraint can be satisfied and which way it |
* should flow based on the relative strength of the variables related, |
* and record that decision. |
*/ |
BinaryConstraint.prototype.chooseMethod = function (mark) { |
if (this.v1.mark == mark) { |
- this.direction = (this.v1.mark != mark && Strength.stronger(this.strength, this.v2.walkStrength)) |
+ this.direction = (this.v2.mark != mark && Strength.stronger(this.strength, this.v2.walkStrength)) |
? Direction.FORWARD |
: Direction.NONE; |
} |
@@ -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. |