diff options
Diffstat (limited to 'webkit/glue/plugins/webplugin_delegate_impl_mac.mm')
| -rw-r--r-- | webkit/glue/plugins/webplugin_delegate_impl_mac.mm | 21 |
1 files changed, 6 insertions, 15 deletions
diff --git a/webkit/glue/plugins/webplugin_delegate_impl_mac.mm b/webkit/glue/plugins/webplugin_delegate_impl_mac.mm index 62ea2de..485c6af 100644 --- a/webkit/glue/plugins/webplugin_delegate_impl_mac.mm +++ b/webkit/glue/plugins/webplugin_delegate_impl_mac.mm @@ -202,8 +202,10 @@ NPObject* WebPluginDelegateImpl::GetPluginScriptableObject() { return instance_->GetPluginScriptableObject(); } -void WebPluginDelegateImpl::DidFinishLoadWithReason(NPReason reason) { - instance()->DidFinishLoadWithReason(reason); +void WebPluginDelegateImpl::DidFinishLoadWithReason( + const GURL& url, NPReason reason, intptr_t notify_data) { + instance()->DidFinishLoadWithReason( + url, reason, reinterpret_cast<void*>(notify_data)); } int WebPluginDelegateImpl::GetProcessId() { @@ -211,8 +213,8 @@ int WebPluginDelegateImpl::GetProcessId() { return getpid(); } -void WebPluginDelegateImpl::SendJavaScriptStream(const std::string& url, - const std::wstring& result, +void WebPluginDelegateImpl::SendJavaScriptStream(const GURL& url, + const std::string& result, bool success, bool notify_needed, intptr_t notify_data) { @@ -532,9 +534,6 @@ WebPluginResourceClient* WebPluginDelegateImpl::CreateResourceClient( return plugin_stream->AsResourceClient(); } - if (notify_needed) { - instance()->SetURLLoadData(url, notify_data); - } std::string mime_type; NPAPI::PluginStreamUrl *stream = instance()->CreateStream( resource_id, url, mime_type, notify_needed, @@ -542,14 +541,6 @@ WebPluginResourceClient* WebPluginDelegateImpl::CreateResourceClient( return stream; } -void WebPluginDelegateImpl::URLRequestRouted(const std::string&url, - bool notify_needed, - intptr_t notify_data) { - if (notify_needed) { - instance()->SetURLLoadData(GURL(url.c_str()), notify_data); - } -} - void WebPluginDelegateImpl::OnNullEvent() { NPEvent np_event = {0}; np_event.what = nullEvent; |