Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(428)

Unified Diff: ui/gfx/font_render_params_linux.cc

Issue 1543183002: Switch to standard integer types in ui/gfx/. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/gfx/font_list_unittest.cc ('k') | ui/gfx/font_render_params_linux_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/gfx/font_render_params_linux.cc
diff --git a/ui/gfx/font_render_params_linux.cc b/ui/gfx/font_render_params_linux.cc
index b62c5252fee4326573695906ce888b6ef38dadbf..a9afcf344db99edb17ace0baed379abf1d3aff2d 100644
--- a/ui/gfx/font_render_params_linux.cc
+++ b/ui/gfx/font_render_params_linux.cc
@@ -5,6 +5,8 @@
#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"
@@ -16,6 +18,7 @@
#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"
@@ -49,7 +52,7 @@ struct QueryResult {
// 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
@@ -189,7 +192,7 @@ bool QueryFontconfig(const FontRenderParamsQuery& query,
// 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(),
@@ -214,7 +217,7 @@ FontRenderParams GetFontRenderParams(const FontRenderParamsQuery& query,
}
#endif
}
- const uint32 hash = HashFontRenderParamsQuery(actual_query);
+ const uint32_t hash = HashFontRenderParamsQuery(actual_query);
SynchronizedCache* synchronized_cache = g_synchronized_cache.Pointer();
{
« no previous file with comments | « ui/gfx/font_list_unittest.cc ('k') | ui/gfx/font_render_params_linux_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698