Merge revision 1361 changes:

- Windows: Fix 64-bit compile errors (issue #394).

git-svn-id: https://chromiumembedded.googlecode.com/svn/branches/1453@1363 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
This commit is contained in:
Marshall Greenblatt
2013-08-14 21:47:22 +00:00
parent e53e604831
commit 185e56cc2c
11 changed files with 26 additions and 25 deletions

View File

@ -14,9 +14,9 @@ namespace performance_test {
// Use more interations for a Release build.
#ifdef NDEBUG
const size_t kDefaultIterations = 100000;
const int kDefaultIterations = 100000;
#else
const size_t kDefaultIterations = 10000;
const int kDefaultIterations = 10000;
#endif
namespace {
@ -40,7 +40,7 @@ class V8Handler : public CefV8Handler {
bool found = false;
std::string test = arguments[0]->GetStringValue();
for (size_t i = 0; i < kPerfTestsCount; ++i) {
for (int i = 0; i < kPerfTestsCount; ++i) {
if (test == kPerfTests[i].name) {
// Execute the test.
int64 delta = kPerfTests[i].test(kPerfTests[i].iterations);
@ -62,7 +62,7 @@ class V8Handler : public CefV8Handler {
} else if (name == kGetPerfTests) {
// Retrieve the list of perf tests.
retval = CefV8Value::CreateArray(kPerfTestsCount);
for (size_t i = 0; i < kPerfTestsCount; ++i) {
for (int i = 0; i < kPerfTestsCount; ++i) {
CefRefPtr<CefV8Value> val = CefV8Value::CreateArray(2);
val->SetValue(0, CefV8Value::CreateString(kPerfTests[i].name));
val->SetValue(1, CefV8Value::CreateUInt(kPerfTests[i].iterations));