Linux build fix: wchar_t is different on different platforms, use the char16 that is defined and is the same on windows and unix

Review URL: http://codereview.chromium.org/6425
Patch from icefox.


git-svn-id: svn://svn.chromium.org/chrome/trunk/src@3116 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 5 insertions, 5 deletions

diff --git a/webkit/glue/SConscript b/webkit/glue/SConscript
index 18e55ac..a0a02df 100644
--- a/webkit/glue/SConscript
+++ b/webkit/glue/SConscript
@@ -20,6 +20,7 @@ if env['PLATFORM'] == 'win32':
 input_files = [
   'dom_operations.cc',
   'editor_client_impl.cc',
+  'entity_map.cc',
   'glue_util.cc',
   'image_decoder.cc',
   'npruntime_util.cc',
@@ -47,7 +48,6 @@ if env['PLATFORM'] == 'win32':
     'debugger.cc',
     'dom_serializer.cc',
     'dragclient_impl.cc',
-    'entity_map.cc',
     'event_conversion.cc',
     'feed_preview.cc',
     'glue_accessibility.cc',
diff --git a/webkit/glue/entity_map.cc b/webkit/glue/entity_map.cc
index f61dfa4..da7f200 100644
--- a/webkit/glue/entity_map.cc
+++ b/webkit/glue/entity_map.cc
@@ -7,11 +7,10 @@
 #include "HTMLEntityCodes.c"
 
 #include "base/hash_tables.h"
-#include "base/string_util.h"
 
 namespace webkit_glue {
 
-typedef base::hash_map<wchar_t, const char*> EntityMapType;
+typedef base::hash_map<char16, const char*> EntityMapType;
 
 class EntityMapData {
  public:
@@ -72,7 +71,7 @@ static EntityMapData xml_entity_map_singleton(xml_built_in_entity_codes,
                                               xml_entity_codes_length,
                                               false);
 
-const char* EntityMap::GetEntityNameByCode(wchar_t code, bool is_html) {
+const char* EntityMap::GetEntityNameByCode(char16 code, bool is_html) {
   const EntityMapType* entity_map;
   if (is_html)
     entity_map = html_entity_map_singleton.GetEntityMapData();
diff --git a/webkit/glue/entity_map.h b/webkit/glue/entity_map.h
index 49e3150..f83b829 100644
--- a/webkit/glue/entity_map.h
+++ b/webkit/glue/entity_map.h
@@ -8,6 +8,7 @@
 #include <string>
 
 #include "base/basictypes.h"
+#include "base/string_util.h"
 
 namespace webkit_glue {
 
@@ -17,7 +18,7 @@ class EntityMap {
   // entity name. If yes, return the entity notation, if not then return NULL.
   // Parameter is_html indicates check the code in html entity map or in xml
   // entity map. THIS FUNCTION IS NOT THREADSAFE.
-  static const char* GetEntityNameByCode(wchar_t code, bool is_html);
+  static const char* GetEntityNameByCode(char16 code, bool is_html);
 
  private:
   DISALLOW_IMPLICIT_CONSTRUCTORS(EntityMap);