Index: content/renderer/render_view_impl.cc |
diff --git a/content/renderer/render_view_impl.cc b/content/renderer/render_view_impl.cc |
index 5553995e53dd1754229f7cff825c0bcf5b3afb3d..efdeb2658e8d44d03bcb66257fd48daa9c3cad68 100644 |
--- a/content/renderer/render_view_impl.cc |
+++ b/content/renderer/render_view_impl.cc |
@@ -30,6 +30,7 @@ |
#include "base/strings/utf_string_conversions.h" |
#include "base/time/time.h" |
#include "base/trace_event/trace_event.h" |
+#include "build/build_config.h" |
#include "content/child/appcache/appcache_dispatcher.h" |
#include "content/child/appcache/web_application_cache_host_impl.h" |
#include "content/child/child_shared_bitmap_manager.h" |
@@ -286,7 +287,7 @@ namespace content { |
typedef std::map<blink::WebView*, RenderViewImpl*> ViewMap; |
static base::LazyInstance<ViewMap> g_view_map = LAZY_INSTANCE_INITIALIZER; |
-typedef std::map<int32, RenderViewImpl*> RoutingIDViewMap; |
+typedef std::map<int32_t, RenderViewImpl*> RoutingIDViewMap; |
static base::LazyInstance<RoutingIDViewMap> g_routing_id_view_map = |
LAZY_INSTANCE_INITIALIZER; |
@@ -577,7 +578,7 @@ void ApplyFontsFromMap(const ScriptFontFamilyMap& map, |
WebSettings* settings) { |
for (ScriptFontFamilyMap::const_iterator it = map.begin(); it != map.end(); |
++it) { |
- int32 script = u_getPropertyValueEnum(UCHAR_SCRIPT, (it->first).c_str()); |
+ int32_t script = u_getPropertyValueEnum(UCHAR_SCRIPT, (it->first).c_str()); |
if (script >= 0 && script < USCRIPT_CODE_LIMIT) { |
UScriptCode code = static_cast<UScriptCode>(script); |
(*setter)(settings, it->second, GetScriptForWebSettings(code)); |
@@ -860,7 +861,7 @@ RenderView* RenderView::FromWebView(blink::WebView* webview) { |
} |
/*static*/ |
-RenderViewImpl* RenderViewImpl::FromRoutingID(int32 routing_id) { |
+RenderViewImpl* RenderViewImpl::FromRoutingID(int32_t routing_id) { |
RoutingIDViewMap* views = g_routing_id_view_map.Pointer(); |
RoutingIDViewMap::iterator it = views->find(routing_id); |
return it == views->end() ? NULL : it->second; |