summaryrefslogtreecommitdiffstats
path: root/webkit/glue/plugins/plugin_instance.cc
diff options
context:
space:
mode:
authorjam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-04-01 01:48:52 +0000
committerjam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-04-01 01:48:52 +0000
commit829c2841a0e30b9f08453566ffc52d2c386a9045 (patch)
treeb916ff2699e97a13f027d3e2cb60be781c0e18c8 /webkit/glue/plugins/plugin_instance.cc
parent5c0b8e45fa1260f311d71073c8a9b89db199d992 (diff)
downloadchromium_src-829c2841a0e30b9f08453566ffc52d2c386a9045.zip
chromium_src-829c2841a0e30b9f08453566ffc52d2c386a9045.tar.gz
chromium_src-829c2841a0e30b9f08453566ffc52d2c386a9045.tar.bz2
Port plugin messages.
Review URL: http://codereview.chromium.org/49050 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@12928 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/glue/plugins/plugin_instance.cc')
-rw-r--r--webkit/glue/plugins/plugin_instance.cc11
1 files changed, 6 insertions, 5 deletions
diff --git a/webkit/glue/plugins/plugin_instance.cc b/webkit/glue/plugins/plugin_instance.cc
index 6738435..f8c1814 100644
--- a/webkit/glue/plugins/plugin_instance.cc
+++ b/webkit/glue/plugins/plugin_instance.cc
@@ -167,7 +167,7 @@ NPObject *PluginInstance::GetPluginScriptableObject() {
}
void PluginInstance::SetURLLoadData(const GURL& url,
- void* notify_data) {
+ intptr_t notify_data) {
get_url_ = url;
get_notify_data_ = notify_data;
}
@@ -175,7 +175,8 @@ void PluginInstance::SetURLLoadData(const GURL& url,
// WebPluginLoadDelegate methods
void PluginInstance::DidFinishLoadWithReason(NPReason reason) {
if (!get_url_.is_empty()) {
- NPP_URLNotify(get_url_.spec().c_str(), reason, get_notify_data_);
+ NPP_URLNotify(get_url_.spec().c_str(), reason,
+ reinterpret_cast<void*>(get_notify_data_));
}
get_url_ = GURL();
@@ -351,7 +352,7 @@ void PluginInstance::SendJavaScriptStream(const std::string& url,
const std::wstring& result,
bool success,
bool notify_needed,
- int notify_data) {
+ intptr_t notify_data) {
if (success) {
PluginStringStream *stream =
new PluginStringStream(this, url, notify_needed,
@@ -505,9 +506,9 @@ void PluginInstance::RequestRead(NPStream* stream, NPByteRange* range_list) {
webplugin_->InitiateHTTPRangeRequest(
stream->url, range_info.c_str(),
- plugin_stream,
+ reinterpret_cast<intptr_t>(plugin_stream),
plugin_stream->notify_needed(),
- plugin_stream->notify_data());
+ reinterpret_cast<intptr_t>(plugin_stream->notify_data()));
break;
}
}