summaryrefslogtreecommitdiffstats
path: root/ppapi/cpp/var.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/cpp/var.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/cpp/var.cc')
-rw-r--r--ppapi/cpp/var.cc7
1 files changed, 5 insertions, 2 deletions
diff --git a/ppapi/cpp/var.cc b/ppapi/cpp/var.cc
index b655e98..bedd257 100644
--- a/ppapi/cpp/var.cc
+++ b/ppapi/cpp/var.cc
@@ -9,10 +9,11 @@
#include <algorithm>
-#include "ppapi/c/pp_var.h"
+#include "ppapi/c/dev/ppb_memory_dev.h"
#ifndef PPAPI_VAR_REMOVE_SCRIPTING
# include "ppapi/c/dev/ppb_var_deprecated.h"
#endif
+#include "ppapi/c/pp_var.h"
#include "ppapi/c/ppb_var.h"
#include "ppapi/cpp/instance.h"
#include "ppapi/cpp/logging.h"
@@ -274,7 +275,9 @@ void Var::GetAllPropertyNames(std::vector<Var>* properties,
Var temp(PassRef(), props[i]);
(*properties)[i] = temp;
}
- Module::Get()->core()->MemFree(props);
+ const PPB_Memory_Dev* memory_if = static_cast<const PPB_Memory_Dev*>(
+ pp::Module::Get()->GetBrowserInterface(PPB_MEMORY_DEV_INTERFACE));
+ memory_if->MemFree(props);
}
void Var::SetProperty(const Var& name, const Var& value, Var* exception) {