Author: [email protected]
Date: Wed Jul 8 00:35:14 2009
New Revision: 2386
Modified:
branches/bleeding_edge/benchmarks/README.txt
branches/bleeding_edge/benchmarks/deltablue.js
branches/bleeding_edge/benchmarks/revisions.html
Log:
Change 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.
See http://crbug.com/11797.
Review URL: http://codereview.chromium.org/155205
Modified: branches/bleeding_edge/benchmarks/README.txt
==============================================================================
--- branches/bleeding_edge/benchmarks/README.txt (original)
+++ branches/bleeding_edge/benchmarks/README.txt Wed Jul 8 00:35:14 2009
@@ -57,4 +57,7 @@
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.
Modified: branches/bleeding_edge/benchmarks/deltablue.js
==============================================================================
--- branches/bleeding_edge/benchmarks/deltablue.js (original)
+++ branches/bleeding_edge/benchmarks/deltablue.js Wed Jul 8 00:35:14 2009
@@ -46,7 +46,7 @@
/* --- 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 @@
this.addConstraint();
}
-UnaryConstraint.inherits(Constraint);
+UnaryConstraint.inheritsFrom(Constraint);
/**
* Adds this constraint to the constraint graph
@@ -294,7 +294,7 @@
StayConstraint.superConstructor.call(this, v, str);
}
-StayConstraint.inherits(UnaryConstraint);
+StayConstraint.inheritsFrom(UnaryConstraint);
StayConstraint.prototype.execute = function () {
// Stay constraints do nothing
@@ -312,7 +312,7 @@
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 @@
this.addConstraint();
}
-BinaryConstraint.inherits(Constraint);
+BinaryConstraint.inheritsFrom(Constraint);
/**
* Decides if this constratint can be satisfied and which way it
@@ -459,7 +459,7 @@
ScaleConstraint.superConstructor.call(this, src, dest, strength);
}
-ScaleConstraint.inherits(BinaryConstraint);
+ScaleConstraint.inheritsFrom(BinaryConstraint);
/**
* Adds this constraint to the constraint graph.
@@ -515,7 +515,7 @@
EqualityConstraint.superConstructor.call(this, var1, var2, strength);
}
-EqualityConstraint.inherits(BinaryConstraint);
+EqualityConstraint.inheritsFrom(BinaryConstraint);
/**
* Enforce this constraint. Assume that it is satisfied.
Modified: branches/bleeding_edge/benchmarks/revisions.html
==============================================================================
--- branches/bleeding_edge/benchmarks/revisions.html (original)
+++ branches/bleeding_edge/benchmarks/revisions.html Wed Jul 8 00:35:14
2009
@@ -22,7 +22,10 @@
<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>
--~--~---------~--~----~------------~-------~--~----~
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev
-~----------~----~----~----~------~----~------~--~---
