diff options
Diffstat (limited to 'webkit/glue/plugins/webplugin_delegate_impl_mac.cc')
| -rw-r--r-- | webkit/glue/plugins/webplugin_delegate_impl_mac.cc | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/webkit/glue/plugins/webplugin_delegate_impl_mac.cc b/webkit/glue/plugins/webplugin_delegate_impl_mac.cc index 7c806dc..f758ce0 100644 --- a/webkit/glue/plugins/webplugin_delegate_impl_mac.cc +++ b/webkit/glue/plugins/webplugin_delegate_impl_mac.cc @@ -154,7 +154,7 @@ bool WebPluginDelegateImpl::Initialize(const GURL& url, return false; } - // plugin->SetWindow(windowed_handle_, handle_event_pump_messages_event_); + // plugin->SetWindow(windowed_handle_); plugin_url_ = url.spec(); return true; @@ -223,7 +223,7 @@ void WebPluginDelegateImpl::SendJavaScriptStream(const std::string& url, const std::wstring& result, bool success, bool notify_needed, - int notify_data) { + intptr_t notify_data) { instance()->SendJavaScriptStream(url, result, success, notify_needed, notify_data); } @@ -423,7 +423,7 @@ bool WebPluginDelegateImpl::HandleEvent(NPEvent* event, WebPluginResourceClient* WebPluginDelegateImpl::CreateResourceClient( int resource_id, const std::string &url, bool notify_needed, - void *notify_data, void* existing_stream) { + intptr_t notify_data, intptr_t existing_stream) { // Stream already exists. This typically happens for range requests // initiated via NPN_RequestRead. if (existing_stream) { @@ -439,17 +439,15 @@ WebPluginResourceClient* WebPluginDelegateImpl::CreateResourceClient( instance()->SetURLLoadData(GURL(url.c_str()), notify_data); } std::string mime_type; - NPAPI::PluginStreamUrl *stream = instance()->CreateStream(resource_id, - url, - mime_type, - notify_needed, - notify_data); + NPAPI::PluginStreamUrl *stream = instance()->CreateStream( + resource_id, url, mime_type, notify_needed, + reinterpret_cast<void*>(notify_data)); return stream; } void WebPluginDelegateImpl::URLRequestRouted(const std::string&url, bool notify_needed, - void* notify_data) { + intptr_t notify_data) { if (notify_needed) { instance()->SetURLLoadData(GURL(url.c_str()), notify_data); } |