diff options
| -rw-r--r-- | webkit/glue/plugins/pepper_private.cc | 7 | ||||
| -rw-r--r-- | webkit/glue/plugins/ppb_private.h | 5 |
2 files changed, 7 insertions, 5 deletions
diff --git a/webkit/glue/plugins/pepper_private.cc b/webkit/glue/plugins/pepper_private.cc index 1346ce3..199dea7 100644 --- a/webkit/glue/plugins/pepper_private.cc +++ b/webkit/glue/plugins/pepper_private.cc @@ -175,11 +175,14 @@ bool GetFontTableForPrivateFontFile(PP_Resource font_file, } void SearchString(PP_Module module, - const char16* string, - const char16* term, + const unsigned short* input_string, + const unsigned short* input_term, bool case_sensitive, PP_PrivateFindResult** results, int* count) { + const char16* string = reinterpret_cast<const char16*>(input_string); + const char16* term = reinterpret_cast<const char16*>(input_term); + UErrorCode status = U_ZERO_ERROR; UStringSearch* searcher = usearch_open( term, -1, string, -1, webkit_glue::GetWebKitLocale().c_str(), 0, diff --git a/webkit/glue/plugins/ppb_private.h b/webkit/glue/plugins/ppb_private.h index 1615288..6a30dcf 100644 --- a/webkit/glue/plugins/ppb_private.h +++ b/webkit/glue/plugins/ppb_private.h @@ -5,7 +5,6 @@ #ifndef WEBKIT_GLUE_PLUGINS_PPB_PRIVATE_H_ #define WEBKIT_GLUE_PLUGINS_PPB_PRIVATE_H_ -#include "base/string16.h" #include "third_party/ppapi/c/dev/ppb_font_dev.h" #include "third_party/ppapi/c/pp_module.h" #include "third_party/ppapi/c/pp_var.h" @@ -106,8 +105,8 @@ struct PPB_Private { // done. void (*SearchString)( PP_Module module, - const char16* string, - const char16* term, + const unsigned short* string, + const unsigned short* term, bool case_sensitive, PP_PrivateFindResult** results, int* count); |