Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1404)

Unified Diff: content/public/common/webkit_param_traits.cc

Issue 8741005: Shim calls to NPN_MemAlloc/MemFree through PluginHost (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/common/npobject_stub.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/public/common/webkit_param_traits.cc
diff --git a/content/public/common/webkit_param_traits.cc b/content/public/common/webkit_param_traits.cc
index 0a7539617c4cae49af6ef193962eb126ef83c8ef..96a0ba4fcad2170f45f2f012dbf76b3c13295324 100644
--- a/content/public/common/webkit_param_traits.cc
+++ b/content/public/common/webkit_param_traits.cc
@@ -13,6 +13,7 @@
#include "third_party/WebKit/Source/WebKit/chromium/public/WebBindings.h"
#include "webkit/glue/password_form.h"
#include "webkit/glue/resource_loader_bridge.h"
+#include "webkit/plugins/npapi/plugin_host.h"
NPIdentifier_Param::NPIdentifier_Param()
: identifier() {
@@ -234,7 +235,7 @@ void ParamTraits<NPIdentifier_Param>::Log(const param_type& p, std::string* l) {
if (WebKit::WebBindings::identifierIsString(p.identifier)) {
NPUTF8* str = WebKit::WebBindings::utf8FromIdentifier(p.identifier);
l->append(str);
- NPN_MemFree(str);
+ webkit::npapi::PluginHost::Singleton()->host_functions()->memfree(str);
} else {
l->append(base::IntToString(
WebKit::WebBindings::intFromIdentifier(p.identifier)));
« no previous file with comments | « content/common/npobject_stub.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698