Switch to standard integer types in skia/.

skia/ext/image_operations_bench.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // This small program is used to measure the performance of the various
 // resize algorithms offered by the ImageOperations::Resize function.
 // It will generate an empty source bitmap, and rescale it to specified
 // dimensions. It will repeat this operation multiple time to get more accurate
 // average throughput. Because it uses elapsed time to do its math, it is only
 // accurate on an idle system (but that approach was deemed more accurate
 // than the use of the times() call.
 // To present a single number in MB/s, it calculates the 'speed' by taking
 // source surface + destination surface and dividing by the elapsed time.
 // This number is somewhat reasonable way to measure this, given our current
 // implementation which somewhat scales this way.
 
+#include <stddef.h>
+#include <stdint.h>
 #include <stdio.h>
 
-#include "base/basictypes.h"
 #include "base/command_line.h"
 #include "base/format_macros.h"
+#include "base/macros.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_split.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/time/time.h"
+#include "build/build_config.h"
 #include "skia/ext/image_operations.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "third_party/skia/include/core/SkRect.h"
 
 namespace {
 
 struct StringMethodPair {
   const char* name;
   skia::ImageOperations::ResizeMethod method;
 };
@@ skipping 196 matching lines @@
   SkBitmap dest;
 
   const base::TimeTicks start = base::TimeTicks::Now();
 
   for (int i = 0; i < num_iterations_; ++i) {
     dest = skia::ImageOperations::Resize(source,
                                          method_,
                                          dest_.width(), dest_.height());
   }
 
-  const int64 elapsed_us = (base::TimeTicks::Now() - start).InMicroseconds();
+  const int64_t elapsed_us = (base::TimeTicks::Now() - start).InMicroseconds();
 
-  const uint64 num_bytes = static_cast<uint64>(num_iterations_) *
-      (GetBitmapSize(&source) + GetBitmapSize(&dest));
+  const uint64_t num_bytes = static_cast<uint64_t>(num_iterations_) *
+                             (GetBitmapSize(&source) + GetBitmapSize(&dest));
 
   printf("%" PRIu64 " MB/s,\telapsed = %" PRIu64 " source=%d dest=%d\n",
-         static_cast<uint64>(elapsed_us == 0 ? 0 : num_bytes / elapsed_us),
-         static_cast<uint64>(elapsed_us),
-         GetBitmapSize(&source), GetBitmapSize(&dest));
+         static_cast<uint64_t>(elapsed_us == 0 ? 0 : num_bytes / elapsed_us),
+         static_cast<uint64_t>(elapsed_us), GetBitmapSize(&source),
+         GetBitmapSize(&dest));
 
   return true;
 }
 
 // A small class to automatically call Reset on the global command line to
 // avoid nasty valgrind complaints for the leak of the global command line.
 class CommandLineAutoReset {
  public:
   CommandLineAutoReset(int argc, char** argv) {
     base::CommandLine::Init(argc, argv);
@@ skipping 18 matching lines @@
     return 1;
   }
 
   if (!bench.Run()) {
     printf("Failed to run benchmark\n");
     return 1;
   }
 
   return 0;
 }