summaryrefslogtreecommitdiffstats
path: root/ppapi/proxy/ppb_char_set_proxy.cc
diff options
context:
space:
mode:
authormball@google.com <mball@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2011-07-14 16:24:29 +0000
committermball@google.com <mball@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2011-07-14 16:24:29 +0000
commit33983ac29092a3cc5d3390c6d54719483d6a6d4d (patch)
tree95c7c95f2bfd1a9615002cc554458d612152d0ce /ppapi/proxy/ppb_char_set_proxy.cc
parent15309df8c0c130de8f09ab8a1a2d6eef6245ae55 (diff)
downloadchromium_src-33983ac29092a3cc5d3390c6d54719483d6a6d4d.zip
chromium_src-33983ac29092a3cc5d3390c6d54719483d6a6d4d.tar.gz
chromium_src-33983ac29092a3cc5d3390c6d54719483d6a6d4d.tar.bz2
Removed MemAlloc and MemFree from PPB_Core
BUG=81610 TEST=Trybots Review URL: http://codereview.chromium.org/7349016 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@92554 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ppapi/proxy/ppb_char_set_proxy.cc')
-rw-r--r--ppapi/proxy/ppb_char_set_proxy.cc12
1 files changed, 6 insertions, 6 deletions
diff --git a/ppapi/proxy/ppb_char_set_proxy.cc b/ppapi/proxy/ppb_char_set_proxy.cc
index 1887549..4701ded 100644
--- a/ppapi/proxy/ppb_char_set_proxy.cc
+++ b/ppapi/proxy/ppb_char_set_proxy.cc
@@ -6,7 +6,7 @@
#include "base/basictypes.h"
#include "ppapi/c/dev/ppb_char_set_dev.h"
-#include "ppapi/c/ppb_core.h"
+#include "ppapi/c/dev/ppb_memory_dev.h"
#include "ppapi/proxy/plugin_dispatcher.h"
#include "ppapi/proxy/ppapi_messages.h"
#include "ppapi/proxy/serialized_var.h"
@@ -19,9 +19,9 @@ namespace proxy {
namespace {
-const PPB_Core* GetCoreInterface() {
- return static_cast<const PPB_Core*>(
- PluginDispatcher::GetInterfaceFromDispatcher(PPB_CORE_INTERFACE));
+const PPB_Memory_Dev* GetMemoryDevInterface() {
+ return static_cast<const PPB_Memory_Dev*>(
+ PluginDispatcher::GetInterfaceFromDispatcher(PPB_MEMORY_DEV_INTERFACE));
}
InterfaceProxy* CreateCharSetProxy(Dispatcher* dispatcher,
@@ -63,7 +63,7 @@ char* PPB_CharSet_Proxy::UTF16ToCharSet(
PP_CharSet_ConversionError on_error,
uint32_t* output_length) {
return ppapi::CharSetImpl::UTF16ToCharSet(
- GetCoreInterface(), utf16, utf16_len, output_char_set, on_error,
+ GetMemoryDevInterface(), utf16, utf16_len, output_char_set, on_error,
output_length);
}
@@ -74,7 +74,7 @@ uint16_t* PPB_CharSet_Proxy::CharSetToUTF16(
PP_CharSet_ConversionError on_error,
uint32_t* output_length) {
return ppapi::CharSetImpl::CharSetToUTF16(
- GetCoreInterface(), input, input_len, input_char_set, on_error,
+ GetMemoryDevInterface(), input, input_len, input_char_set, on_error,
output_length);
}