Switch to standard integer types in ui/gfx/.

ui/gfx/font_render_params_linux.cc

 // Copyright (c) 2012 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.
 
 #include "ui/gfx/font_render_params.h"
 
 #include <fontconfig/fontconfig.h>
+#include <stddef.h>
+#include <stdint.h>
 
 #include "base/command_line.h"
 #include "base/containers/mru_cache.h"
 #include "base/hash.h"
 #include "base/lazy_instance.h"
 #include "base/logging.h"
 #include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
 #include "base/synchronization/lock.h"
+#include "build/build_config.h"
 #include "ui/gfx/display.h"
 #include "ui/gfx/font.h"
 #include "ui/gfx/linux_font_delegate.h"
 #include "ui/gfx/screen.h"
 #include "ui/gfx/switches.h"
 
 namespace gfx {
 
 namespace {
 
@@ skipping 13 matching lines @@
         family(family) {
   }
   ~QueryResult() {}
 
   FontRenderParams params;
   std::string family;
 };
 
 // Keyed by hashes of FontRenderParamQuery structs from
 // HashFontRenderParamsQuery().
-typedef base::MRUCache<uint32, QueryResult> Cache;
+typedef base::MRUCache<uint32_t, QueryResult> Cache;
 
 // A cache and the lock that must be held while accessing it.
 // GetFontRenderParams() is called by both the UI thread and the sandbox IPC
 // thread.
 struct SynchronizedCache {
   SynchronizedCache() : cache(kCacheSize) {}
 
   base::Lock lock;
   Cache cache;
 };
@@ skipping 119 matching lines @@
     if (FcPatternGetInteger(result_pattern.get(), FC_RGBA, 0, &fc_rgba) ==
         FcResultMatch)
       params_out->subpixel_rendering = ConvertFontconfigRgba(fc_rgba);
   }
 
   return true;
 }
 
 // Serialize |query| into a string and hash it to a value suitable for use as a
 // cache key.
-uint32 HashFontRenderParamsQuery(const FontRenderParamsQuery& query) {
+uint32_t HashFontRenderParamsQuery(const FontRenderParamsQuery& query) {
   return base::Hash(base::StringPrintf(
       "%d|%d|%d|%s|%f", query.pixel_size, query.point_size, query.style,
       base::JoinString(query.families, ",").c_str(),
       query.device_scale_factor));
 }
 
 }  // namespace
 
 FontRenderParams GetFontRenderParams(const FontRenderParamsQuery& query,
                                      std::string* family_out) {
   FontRenderParamsQuery actual_query(query);
   if (actual_query.device_scale_factor == 0) {
 #if defined(OS_CHROMEOS)
     actual_query.device_scale_factor = device_scale_factor_for_internal_display;
 #else
     // Linux does not support per-display DPI, so we use a slightly simpler
     // code path than on Chrome OS to figure out the device scale factor.
     gfx::Screen* screen = gfx::Screen::GetScreenByType(gfx::SCREEN_TYPE_NATIVE);
     if (screen) {
       gfx::Display display = screen->GetPrimaryDisplay();
       actual_query.device_scale_factor = display.device_scale_factor();
     }
 #endif
   }
-  const uint32 hash = HashFontRenderParamsQuery(actual_query);
+  const uint32_t hash = HashFontRenderParamsQuery(actual_query);
   SynchronizedCache* synchronized_cache = g_synchronized_cache.Pointer();
 
   {
     // Try to find a cached result so Fontconfig doesn't need to be queried.
     base::AutoLock lock(synchronized_cache->lock);
     Cache::const_iterator it = synchronized_cache->cache.Get(hash);
     if (it != synchronized_cache->cache.end()) {
       DVLOG(1) << "Returning cached params for " << hash;
       const QueryResult& result = it->second;
       if (family_out)
@@ skipping 52 matching lines @@
 float GetFontRenderParamsDeviceScaleFactor() {
   return device_scale_factor_for_internal_display;
 }
 
 void SetFontRenderParamsDeviceScaleFactor(float device_scale_factor) {
   device_scale_factor_for_internal_display = device_scale_factor;
 }
 #endif
 
 }  // namespace gfx